cnhis-design-vue 2.1.15 → 2.1.18

package/packages/fabric-chart/src/FabricChart.vue

@@ -1,43 +1,22 @@
 <template>
-  <div class="c-fabric-chart" :style="{'width': canvasWidth}">
-    <component
-      ref="canvasEle"
-      :is="`FabricCanvas${templateData.type || ''}`"
-      :id="id"
-      :templateData="templateData"
-      v-if="rendercanvas"
-    >
+  <div class="c-fabric-chart" :style="{ width: canvasWidth }">
+    <component ref="canvasEle" :is="`FabricCanvas${templateData.type || ''}`" :id="id" :templateData="templateData" v-if="rendercanvas">
       <template v-if="templateData.type">
         <fabric-grid></fabric-grid>
         <fabric-top2 :templateData="templateData"></fabric-top2>
         <fabric-left2 :templateData="templateData"></fabric-left2>
         <fabric-right2 :templateData="templateData"></fabric-right2>
         <fabric-bottom2 :templateData="templateData"></fabric-bottom2>
-        <fabric-center2
-          :other="templateData.other"
-          :polyline="templateData.left.leftYScalevalue"
-          v-on="$listeners"
-          @pointOperation="pointOperation"
-         ></fabric-center2>
+        <fabric-center2 :other="templateData.other" :polyline="templateData.left.leftYScalevalue" v-on="$listeners" @pointOperation="pointOperation"></fabric-center2>
       </template>
 
       <template v-else>
-        <fabric-text-group
-          v-if="hasXScalevalue"
-          :templateData="templateData"
-          v-on="$listeners"
-        ></fabric-text-group>
+        <fabric-text-group v-if="hasXScalevalue" :templateData="templateData" v-on="$listeners"></fabric-text-group>
         <fabric-grid></fabric-grid>
         <fabric-scale-value v-if="hasTable" :templateData="templateData"></fabric-scale-value>
         <fabric-lines v-if="hasTopTable" ref="lines" :linesObj="templateData.top" v-on="$listeners"></fabric-lines>
-        <fabric-polylines ref="polylines"
-          v-if="hasTable"
-          :polyline="polylines"
-          :other="templateData.left.other || {}"
-          @pointOperation="pointOperation"
-          v-on="$listeners"></fabric-polylines>
+        <fabric-polylines ref="polylines" v-if="hasTable" :polyline="polylines" :other="templateData.left.other || {}" @pointOperation="pointOperation" v-on="$listeners"></fabric-polylines>
       </template>
-      
     </component>
   </div>
 </template>
@@ -74,7 +53,7 @@ export default create({
     templateData: {
       type: Object,
       required: true
-    },
+    }
   },
   components: {
     FabricCanvas,
@@ -109,17 +88,17 @@ export default create({
     hasTable() {
       const hasLeft = this.templateData.left?.leftYScalevalue?.list?.length > 0;
       const hasRight = this.templateData.right?.rightYScalevalue?.list?.length > 0;
-      return this.hasXScalevalue && hasLeft && hasRight;
+      return this.hasXScalevalue && (hasLeft || hasRight);
     },
     hasXScalevalue() {
       return this.templateData.top?.xScalevalue?.list?.length > 0;
-    },
+    }
   },
   data() {
     return {
       rendercanvas: true,
       canvasWidth: 0
-    }
+    };
   },
   mounted() {
     this.canvasWidth = `${this.templateData.canvasWidth}px` || '1000px';
@@ -159,21 +138,21 @@ export default create({
       // 在组件移除后，重新渲染组件
       // this.$nextTick可实现在DOM 状态更新后，执行传入的方法。
       this.$nextTick(() => {
-          this.rendercanvas = true;
-      })
+        this.rendercanvas = true;
+      });
       // this.$refs.canvasEle.renderCanvas();
     },
     removeSelectArea() {
       this.$nextTick(() => {
         this.$refs.polylines.removeSelectArea();
-      })
+      });
     }
   }
 });
 </script>
 
 <style lang="less" scoped>
-  .c-fabric-chart {
-    position: relative;
-  }
+.c-fabric-chart {
+  position: relative;
+}
 </style>

package/packages/fabric-chart/src/fabric-chart/FabricCanvas.vue

@@ -82,9 +82,10 @@ export default {
         console.warn(error);
       }
     }
-    if (!this.templateData.left || !this.templateData.right) {
+    // if (!this.templateData.left || !this.templateData.right) {
+    if (!this.templateData.left) {
       try {
-        throw new Error('缺少左/右侧数据对象, 无法生成垂直方向刻度');
+        throw new Error('缺少左侧数据对象, 无法生成垂直方向刻度');
       } catch (error) {
         console.warn(error);
       }
@@ -133,7 +134,7 @@ export default {
     endX() {
       // 网格区域水平方向最大坐标值, 也是整个画布右侧列表坐标起始值，网格右下角x轴坐标值
       if (!this.templateData.right && !this.topTotal) return this.templateData.canvasWidth;
-      return this.templateData.canvasWidth - (this.templateData.right?.width || 20) - this.topTotal.width;
+      return this.templateData.canvasWidth - (this.templateData.right?.width ?? 20) - this.topTotal.width;
     },
     endY() {
       // 画布高度 - 底部列表高度 ，网格右下角y轴坐标值

package/packages/fabric-chart/src/fabric-chart/FabricScaleValue.vue

@@ -65,7 +65,6 @@ export default {
         });
         return cur;
       }, '');
-      console.log(textList);
       const group = new this.fabric.Group([...textList], {
         evented: false,
         selectable: false
@@ -74,6 +73,7 @@ export default {
       this.canvas.sendBackwards(group);
     },
     rightScaleValue(obj) {
+      if (!obj) return;
       const spaceGridNumber = obj.rightYScalevalue.spaceGridNumber || 2;
       const marginLeft = obj.rightYScalevalue.marginLeft || 3;
       const originX = this.propItems.endX + marginLeft;
@@ -95,13 +95,15 @@ export default {
       this.canvas.sendBackwards(group);
     },
     leftScaleValue(obj) {
+      const { endY, yCellHeight } = this.propItems;
       const spaceGridNumber = obj.leftYScalevalue.spaceGridNumber || 2;
-      const marginRight = obj.leftYScalevalue.marginRight || 3;
+      const [titleMarginRight, titleMarginButton] = obj.leftYScalevalue?.titleMargin || [5, 30];
+      const listMarginRight = obj.leftYScalevalue.listMarginRight || 3;
       const style = obj.leftYScalevalue.style || {};
-      const originX = this.propItems.originX - marginRight;
+      const originX = this.propItems.originX;
       let textList = [];
       obj.leftYScalevalue.list.forEach((item, index) => {
-        textList.push(this.createText(item, originX, this.propItems.endY - index * this.propItems.yCellHeight * spaceGridNumber, 'right', style));
+        textList.push(this.createText(item, originX - listMarginRight, endY - index * yCellHeight * spaceGridNumber, 'right', style));
       });
 
       // 添加标题和单位
@@ -109,8 +111,8 @@ export default {
       txt = obj.leftYScalevalue.name || '';
       if (obj.leftYScalevalue.unit) txt += '\n' + obj.leftYScalevalue.unit;
       if (txt) {
-        const top = this.propItems.endY - obj.leftYScalevalue.list.length * this.propItems.yCellHeight * spaceGridNumber;
-        textList.push(this.createText(txt, originX, top, 'right', { ...style, textAlign: 'right', originY: 'bottom' }));
+        const top = endY - (obj.leftYScalevalue.list.length - 1) * yCellHeight * spaceGridNumber - titleMarginButton;
+        textList.push(this.createText(txt, originX - titleMarginRight, top, 'right', { ...style, textAlign: 'right', originY: 'bottom' }));
       }
       const group = new this.fabric.Group([...textList], {
         evented: false,

package/packages/multi-chat/setting/baseInfo/index.vue

@@ -14,9 +14,9 @@
             <a-row class="time-setting">
               <a-col :span="12">
                 <a-form-item :label="i18nText('1.9.403')">
-                  <a-select v-decorator="['timeLength']" :placeholder="i18nText('1.9.404')" style="width: 200px;" showSearch>
-                    <a-select-option v-for="time in timeLengths" :key="time" :value="time">{{ time }}</a-select-option>
-                  </a-select>
+                  <a-input-number v-decorator="['timeLengthHours']" :min="0" :max="99" />
+                  <span class="setting-hours-text">小时</span>
+                  <a-input-number v-decorator="['timeLengthMins']" :min="0" :max="59" />
                   {{ i18nText('2.2.6.6') }}
                 </a-form-item>
               </a-col>
@@ -395,7 +395,7 @@ export default {
       readStatus: false,
       lineUpNotice: false,
       evaluateId: '',
-      timeLengths: [5, 10, 20, 30, 40, 50, 60],
+      timeLength: '', // 会话时长，分钟计算
       functionSetting: [], // 服务端功能
       clientFunctionSetting: [], // 客户端功能
       functionList: [], // 服务端功能下拉列表
@@ -638,7 +638,7 @@ export default {
     fillToolbar(toolbar) {
       this.toolbarList = toolbar.map(item => ({
         label: item.name,
-        value: item.name + '-' + item.source,
+        value: item.name + '-' + item.source + '-' + item.key,
         source: item.source,
         isClosedAble: item.isClosedAble,
         isCloseChecked: item.isCloseChecked
@@ -646,7 +646,7 @@ export default {
       const btwList = toolbar.filter(item => item.isClosedAble == "Y" && item.isChecked == "Y");
       this.closedToolbarList = btwList.map(item => ({
         label: item.name,
-        value: item.name + '-' + item.source,
+        value: item.name + '-' + item.source + '-' + item.key,
         source: item.source,
         isClosedAble: item.isClosedAble,
         isCloseChecked: item.isCloseChecked
@@ -654,7 +654,7 @@ export default {
       this.toolbar = toolbar;
       let toolbarChecked = toolbar.reduce((result, item) => {
         if (item.isChecked === 'Y') {
-          result.push(item.name + '-' + item.source);
+          result.push(item.name + '-' + item.source + '-' + item.key);
         }
         return result;
       }, []);
@@ -663,7 +663,7 @@ export default {
       });
       let closedToolbarChecked = this.closedToolbarList.reduce((result, item) => {
         if (item.isCloseChecked === 'Y') {
-          result.push(item.label + '-' + item.source);
+          result.push(item.label + '-' + item.source + '-' + item.key);
         }
         return result;
       }, []);
@@ -710,8 +710,16 @@ export default {
     fillTimeSetting(timeSetting) {
       if (this.isStaff) return;
       let { timeLength, showMode, delayedSetting, delayed } = timeSetting;
+      this.timeLength = timeLength;
+      let timeLengthMins = ''
+      let timeLengthHours = ''
+      if (this.timeLength) {
+        timeLengthMins = parseInt(this.timeLength) % 60;
+        timeLengthHours = parseInt(parseInt(this.timeLength) / 60);
+      }
       this.form.setFieldsValue({
-        timeLength,
+        timeLengthMins,
+        timeLengthHours,
         showMode
       });
       if (delayed) {
@@ -960,12 +968,12 @@ export default {
       let { toolbar, closedToolbar } = values;
       let clone = JSON.parse(JSON.stringify(this.toolbar));
       setting.toolbar = clone.reduce((result, item) => {
-        if (toolbar.includes(item.name + '-' + item.source)) {
+        if (toolbar.includes(item.name + '-' + item.source + '-' + item.key)) {
           item.isChecked = 'Y';
         } else {
           item.isChecked = 'N';
         }
-        if (closedToolbar.includes(item.name + '-' + item.source)) {
+        if (closedToolbar.includes(item.name + '-' + item.source + '-' + item.key)) {
           item.isCloseChecked = 'Y';
         } else {
           item.isCloseChecked = 'N';
@@ -1050,8 +1058,11 @@ export default {
       setting.timingSettingSwitch = this.showTimeSetting ? '1' : '0';
       setting.timingSetting = {};
       if (this.showTimeSetting) {
-        let { timeLength, showMode } = values;
-        Object.assign(setting.timingSetting, { timeLength, showMode });
+        let { showMode, timeLengthMins, timeLengthHours } = values;
+        let settingMins = timeLengthMins ? timeLengthMins : 0;
+        let settingHours = timeLengthHours ? timeLengthHours : 0;
+        this.timeLength = settingMins + settingHours * 60;
+        Object.assign(setting.timingSetting, { timeLength: this.timeLength, showMode });
         setting.timingSetting.delayedSetting = {};
       }
       if (this.showTimeDelay && this.showTimeSetting) {
@@ -1148,6 +1159,9 @@ export default {
   .main-form {
     flex: 1;
   }
+  .setting-hours-text {
+    margin-right: 15px;
+  }
   .time-setting,
   .delayed-setting {
     padding-left: 20px;