cxmo 1 год назад
Родитель
Сommit
3e9fe09784

+ 4 - 2
src/lang/modules/ToolBox/calendar/ForexCalendar.js

@@ -10,8 +10,9 @@ export const ForexCalendarEn={
     edb_input:'Enter Index ID/Name',
     item_input_limit:'Max 15 chars Please re-edit',
     item_btn_text:'expand',
+    item_btn_text_pickup:'pick up',
     item_input:'Enter Item Content',
-    link_hint:'Items linked to indicators default to their names, editable, max 15 chars per item, up to 6 items shown daily; excess with ellipsis.',
+    link_hint:'Items linked to indicators default to their names, editable, max 15 chars per item.',
     font_color:'Font Color',
     fill_color:'Fill Color',
     font_bold:'Bold',
@@ -31,7 +32,8 @@ export const ForexCalendarZh={
     item_input:'请输入事项内容',
     item_input_limit:'超出15个字,请重新编辑',
     item_btn_text:'展开',
-    link_hint:'添加关联指标的事项默认以指标名称命名,可修改,每个事项最多15个字,每天最多展示6个事项,超出部分省略号表示',
+    item_btn_text_pickup:'收起',
+    link_hint:'添加关联指标的事项默认以指标名称命名,可修改,每个事项最多15个字',
     font_color:'字体颜色',
     fill_color:'填充颜色',
     font_bold:'加粗',

+ 2 - 2
src/views/toolBox_manage/components/BaseCalendar.vue

@@ -59,8 +59,8 @@ export default {
                 dayCellContent:function(arg){ //单元格日期显示为 1 2 3...
                     return arg.date.getDate()
                 },
-                dayMaxEventRows:6,//一天最多展示6条
-                moreLinkClick:(info)=>{this.handleDateClick(info)},//点击more时触发
+                /* dayMaxEventRows:6,//一天最多展示6条
+                moreLinkClick:(info)=>{this.handleDateClick(info)},//点击more时触发 */
                 events:[
                     /* {
                         id:1,

+ 3 - 1
src/views/toolBox_manage/components/addEventDialog.vue

@@ -64,7 +64,9 @@
                                 <!-- move icon -->
                                 <i class="el-icon-rank icon" style="color: #0052D9;"></i>
                                 <el-input v-model="item.title" :placeholder="$t('ToolBox.ForexCalendar.item_input')">
-                                    <el-button slot="append" type="primary" @click.stop="item.isExpand = !item.isExpand">{{$t('ToolBox.ForexCalendar.item_btn_text')}}</el-button>
+                                    <el-button slot="append" type="primary" @click.stop="item.isExpand = !item.isExpand">
+                                        {{$t(`ToolBox.ForexCalendar.item_btn_text${item.isExpand?'_pickup':''}`)}}
+                                    </el-button>
                                 </el-input>
                                 <!-- close icon -->
                                 <i class="el-icon-remove-outline icon" style="color:#D54941;" @click="removeEvent(index)"></i>