cnhis-design-vue 2.1.44 → 2.1.46

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cnhis-design-vue",
-  "version": "2.1.44",
+  "version": "2.1.46",
   "description": "前端业务UI库",
   "keyword": "cnhis-design-vue vue cnhis",
   "homepage": "http://dv.cnhis.com/",

package/packages/big-table/src/BigTable.vue

@@ -98,6 +98,7 @@
         iconOpen: 'iconfont icon-a-xitongtubiaozhediejian',
         iconClose: 'iconfont icon-a-xitongtubiaotianjia'
       }"
+      v-bind="tableAttrs"
     >
       <template v-slot:empty>
         <div v-if="isShowEmpty">
@@ -144,7 +145,7 @@ import TextOverTooltip from './components/TextOverTooltip.vue';
 import AutoLayoutButton from './components/AutoLayoutButton.vue';
 import { Icon, Tooltip, Progress, Switch, Popover, Button, Dropdown, Menu, Checkbox, Input, Popconfirm } from 'ant-design-vue';
 import format from './utils/format';
-import { parseDurationValue, parseCombinationValue, formatFieldText, imgs2imgArr } from './utils/tableParse';
+import { parseDurationValue, parseCombinationValue, formatFieldText, imgs2imgArr, parseNumberField } from './utils/tableParse';
 import passwordCom from './components/password-com.vue';
 import NoData from './components/NoData.vue';
 import VideoList from './components/player-vod/video-list';
@@ -363,6 +364,9 @@ export default create({
         tableFieldMap[v.tableField] = v;
       });
       return tableFieldMap;
+    },
+    tableAttrs(){
+      return this?.tableProps || {}
     }
   },
   watch: {
@@ -2001,8 +2005,8 @@ export default create({
       // 用rowIndex替换$rowIndex, 如果开启了虚拟滚动$rowIndex 下标会有问题
       let { row, column, rowIndex } = params;
       let own = column?._own || column?.own || col;
-      let attrType = own?.attrType || '';
-      let fieldType = own?.fieldType || '';
+
+      let {attrType, fieldType, extraField} = own || {};
       // 批量行编辑
       let formUnionItem = this.showEditForm(row, column, rowIndex);
       if (formUnionItem) {
@@ -2074,8 +2078,8 @@ export default create({
         return this.getOrCode(row, own, attrType);
       }
       let value = row[own.columnName];
-      if (attrType === 'MONEY' && fieldType == 'NUMBER' && vexutils.isNumber(value)) {
-        return value.toFixed(2);
+      if (["MONEY", "NUMBER"].includes(attrType) || extraField && fieldType === "NUMBER") {
+        return parseNumberField(value, own);
       }
 
       if (column.property === 'operatorColumn') {
@@ -2956,6 +2960,10 @@ export default create({
       }
     },
     setRowStatus(vxeTable, rowIndex, value) {
+      /**
+       * 行编辑状态切换，样式修改
+       * 目前行编辑的状态行高度为66px，普通状态的高度应取配置值（如果有）
+       */
       if (!vxeTable) return false;
 
       let tableWrap = [
@@ -2975,14 +2983,21 @@ export default create({
 
       let height = value ? `${value}px` : value;
       let lineHeight = value ? `${value - 14}px` : value;
-
+      // 如value 没有值，则是恢复默认的行高
+      if(!value){
+        let rowheight = this?.tableAttrs?.rowConfig?.height;
+        if(rowheight){
+          height = `${rowheight}px`;
+          lineHeight = '30px';
+        }
+      }
       rowWrap.forEach(wrap => {
         let rowItemWrap = [...wrap.querySelectorAll('.vxe-cell')];
         rowItemWrap.push(...[...wrap.querySelectorAll('.vxe-body--column')]);
         rowItemWrap.forEach(dom => {
-          dom.style.setProperty('height', height, 'important');
+          dom.style.setProperty('height', height, value? 'important': undefined);
           dom.style.lineHeight = lineHeight;
-          if (height) {
+          if (value) {
             dom.style.backgroundColor = '#EFF5FF';
             setTimeout(() => {
               dom.title = '';

package/packages/big-table/src/utils/bigTableProps.js

@@ -90,6 +90,10 @@ const bigTableProps = {
     default: true
   },
   listCountParams:{ type: Object, default: () => ({}) },
+  tableProps:{
+    type: Object,
+    default:()=>({})
+  }
 };
 
 export default bigTableProps;

package/packages/big-table/src/utils/tableParse.js

@@ -191,3 +191,44 @@ export function imgs2imgArr(imgs) {
     })
     .split('|');
 }
+
+const getLen = value => {
+  const len = value.toString().split('.')?.[1]?.length || 0;
+  return len;
+};
+
+const myToFixed = (num, decimals) => {
+  if (!num) return num;
+  if (typeof num !== 'number') return num;
+  return num.toLocaleString('en-US', {
+    minimumFractionDigits: decimals,
+    maximumFractionDigits: decimals
+  });
+};
+
+export function parseNumberField(val, own) {
+  let attrType = own?.attrType || '';
+  let fieldType = own?.fieldType || '';
+  let { numShowType, numScale } = own.settingObj || {};
+  if (!numShowType || (!numScale && numScale !== 0)) {
+    return val;
+  }
+  let rVal = val;
+  if (vexutils.isPlainObject(val)) {
+    rVal = val.value;
+  }
+  if (!rVal) return rVal;
+  if (isNaN(+rVal)) return rVal;
+  rVal = +rVal;
+  numScale = +numScale;
+  numScale = numScale > 6 ? 6 : numScale < 0 ? 0 : numScale;
+  if (numShowType === 'fixed') {
+    return myToFixed(rVal, numScale);
+  }
+  let len = getLen(rVal);
+  if (numShowType === 'must') {
+    rVal = parseFloat(rVal);
+  }
+  if (len <= numScale) return rVal;
+  return myToFixed(rVal, numScale);
+}

package/packages/fabric-chart/src/const/defaultVaule.js

@@ -1,59 +1,59 @@
-const data = {
-  style: {
-    evented: false,
-    selectable: false
-  },
-  rectStyle: {
-    fill: 'transparent',
-    stroke: '#999',
-    strokeWidth: 1
-  },
-  textStyle: {
-    fontFamily: '微软雅黑',
-    fontSize: 12,
-    fill: '#000',
-    lineHeight: 1
-  },
-  borderStyle: {
-    stroke: '#999',
-    strokeWidth: 1,
-    selectable: false,
-    evented: false
-  },
-  // 折线图中的点
-  pointStyle: {
-    fill: '#ffffff', // 填充色
-    stroke: '#000000', // 描边色
-    originX: 'center',
-    originY: 'center'
-  },
-  // 折线图中的线
-  lineStyle: {
-    stroke: '#000', // 描边色
-    strokeWidth: 1, // 描边宽度
-    originX: 'center',
-    originY: 'center'
-  },
-  topSpaceHeight: 10, // templateData.top.spaceHeight
-  topSpaceGridNumber: 3, // templateData.top.xScalevalue.spaceGridNumber
-  leftSpaceGridNumber: 2, // templateData.left.leftYScalevalue.spaceGridNumber
-  rightSpaceGridNumber: 2, // templateData.right.rightYScalevalue.spaceGridNumber
-  topTotal: {
-    title: '总量',
-    width: 0,
-    style: {
-      fontFamily: '微软雅黑',
-      fontSize: 12,
-      fill: '#000',
-      lineHeight: 1
-    }
-  },
-  criticalStyle: { // 危急值样式
-    stroke: 'purple', // 颜色 默认 #999
-    strokeWidth: 1, // 线宽 默认 1
-    strokeDashArray: [0, 0] // 实线设置 默认[0, 0]
-  },
-  bottomNumberLeftSpace: 10 // 底部标记的序号与标记之间的距离
-};
-
-export default data;
+const data = {
+  style: {
+    evented: false,
+    selectable: false
+  },
+  rectStyle: {
+    fill: 'transparent',
+    stroke: '#999',
+    strokeWidth: 1
+  },
+  textStyle: {
+    fontFamily: '微软雅黑',
+    fontSize: 12,
+    fill: '#000',
+    lineHeight: 1
+  },
+  borderStyle: {
+    stroke: '#999',
+    strokeWidth: 1,
+    selectable: false,
+    evented: false
+  },
+  // 折线图中的点
+  pointStyle: {
+    fill: '#ffffff', // 填充色
+    stroke: '#000000', // 描边色
+    originX: 'center',
+    originY: 'center'
+  },
+  // 折线图中的线
+  lineStyle: {
+    stroke: '#000', // 描边色
+    strokeWidth: 1, // 描边宽度
+    originX: 'center',
+    originY: 'center'
+  },
+  topSpaceHeight: 10, // templateData.top.spaceHeight
+  topSpaceGridNumber: 3, // templateData.top.xScalevalue.spaceGridNumber
+  leftSpaceGridNumber: 2, // templateData.left.leftYScalevalue.spaceGridNumber
+  rightSpaceGridNumber: 2, // templateData.right.rightYScalevalue.spaceGridNumber
+  topTotal: {
+    title: '总量',
+    width: 0,
+    style: {
+      fontFamily: '微软雅黑',
+      fontSize: 12,
+      fill: '#000',
+      lineHeight: 1
+    }
+  },
+  criticalStyle: { // 危急值样式
+    stroke: 'purple', // 颜色 默认 #999
+    strokeWidth: 1, // 线宽 默认 1
+    strokeDashArray: [0, 0] // 实线设置 默认[0, 0]
+  },
+  bottomNumberLeftSpace: 10 // 底部标记的序号与标记之间的距离
+};
+
+export default data;

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

@@ -203,23 +203,14 @@ export default {
 
       const minTime = Math.min(...xScaleList);
       const maxTime = Math.max(...xScaleList);
+
       this.polyline.forEach((item, index) => {
         item.dataList.forEach((v, i) => {
+          const point = v.list.find(k => isEffectiveNode(k) && new Date(k.time).getTime() >= minTime && new Date(k.time).getTime() <= maxTime);
+          const firstPointLeft = point ? this.cumputedX(point.time) : 0;
+          const rightLimit = point ? firstPointLeft - this.spaceWidth : '';
           // 配置是否可拖动标题图标批量增加-
-          const isAdd = v.list.length
-            ? !v.list.some(k => {
-                return isEffectiveNode(k) && new Date(k.time).getTime() >= minTime && new Date(k.time).getTime() < xScaleCellList[1].time;
-              })
-            : true;
-          let rightLimit = endX;
-          const point = v.list.find(k => isEffectiveNode(k) && new Date(k.time).getTime() >= xScaleCellList[1].time && new Date(k.time).getTime() <= maxTime);
-          const limitObj =
-            point &&
-            JSON.parse(JSON.stringify(xScaleCellList))
-              .reverse()
-              .find(k => new Date(point.time).getTime() > k.time);
-          limitObj && (rightLimit = limitObj.x);
-          point && !limitObj && new Date(point.time).getTime() === maxTime && (rightLimit = xScaleCellList[xScaleCellList.length - 1].x);
+          const isAdd = (firstPointLeft || endX) - this.spaceWidth >= originX;
           leftTitleList.push({
             title: v.title,
             type: v.type,
@@ -326,6 +317,7 @@ export default {
         });
         // 标题折线点停止拖拽后 更新
         icon.on('moved', () => {
+          this.setLeft(icon);
           icon.set({
             id: icon.id.replace('_isTitle', '')
           });
@@ -362,11 +354,26 @@ export default {
         // this.canvas.requestRenderAll();
       });
     },
+    // 限制节点新增位置与右侧节点间隔的spaceWidth格子树必须为整数
+    setLeft(icon) {
+      const { originX } = this.propItems;
+      let tempLeft = icon.rightLimit;
+
+      if (!tempLeft) return;
+      const leftLimit = icon.left + this.spaceWidth;
+      let i = 0;
+      while (tempLeft >= leftLimit) {
+        tempLeft = icon.rightLimit - i * this.spaceWidth;
+        i++;
+      }
+      icon.left = tempLeft < originX ? originX : tempLeft;
+    },
     // 点移动限制
     moveLimit(point) {
       point.setCoords();
-      const leftLimit = this.propItems.treeTableminCellWidth;
-      const rightLimit = point.rightLimit;
+      const { treeTableminCellWidth, endX } = this.propItems;
+      const leftLimit = treeTableminCellWidth;
+      const rightLimit = point.rightLimit || endX;
       if (point.top < this.propItems.originY) {
         point.set('top', this.propItems.originY);
       }

package/packages/scale-view/formitem/r-choice.vue

@@ -503,7 +503,7 @@ export default {
     },
     handleDynamic2StaticOptions(options) {
       if (!options || !options.length) return [];
-      return options.map(item => {
+      let arr =  options.map(item => {
         if ('cascadeData' in item) {
           Object.assign(item, {
             ...item.cascadeData
@@ -518,10 +518,22 @@ export default {
         }
         return item;
       });
+      
+      return this.uniqArrObj(arr, this.columnKey);
+    },
+    // 数组对象去重
+    uniqArrObj(arr, name = "value") {
+      let obj = {};
+      return arr.reduce((cur, next) => {
+        obj[next[name]] ? "" : (obj[next[name]] = true && cur.push(next));
+        return cur;
+      }, []);
     },
     // 下拉组件搜索
     async handleSearch(value) {
       try {
+        // 动态数据源转静态数据
+      if (this.cloneItem?.type == 'SELECT' && this.isDynamic2Static) return
         this.curOptions = await this.getSearchOptions(
           {
             values: this.columnKey,