cnhis-design-vue 2.1.43 → 2.1.45

package/package.json

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

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

@@ -144,7 +144,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';
@@ -2001,8 +2001,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 +2074,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') {

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/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/shortcut-setter/src/utils/index.js

@@ -1,12 +1,10 @@
 import { isString } from 'xe-utils';
 
 export function isKeyboardEvent(event) {
-  return Reflect.get(event, 'view') === window && Reflect.get(event, 'shiftKey') != undefined;
+  return Reflect.get(event, 'view') === window && Reflect.get(event, 'shiftKey') !== undefined;
 }
 
-export function normalizeSignatureInfo(
-  info
-) {
+export function normalizeSignatureInfo(info) {
   let ctrl, shift, alt;
   const key = info.key?.toUpperCase() ?? '';
 
@@ -31,13 +29,13 @@ export function inKeyBlackList(key) {
 }
 
 export function isInvalidSignature(info) {
-  const { ctrl, shift, alt, key } = normalizeSignatureInfo(info);
-  if (!ctrl && !shift && !alt) return !/F\d/.test(key);
+  const { /* ctrl, shift, alt,*/ key } = normalizeSignatureInfo(info);
+  // if (!ctrl && !shift && !alt) return !/F\d/.test(key);
   return inKeyBlackList(key);
 }
 
 export function getDisplaySignature(info) {
   const { ctrl, shift, alt, key } = normalizeSignatureInfo(info);
 
-  return `${ctrl ? 'Ctrl+ ' : ''}${alt ? 'Alt + ' : ''}${shift ? 'Shift + ' : ''}${inKeyBlackList(key) ? '' : key}`;
+  return `${ctrl ? 'Ctrl + ' : ''}${alt ? 'Alt + ' : ''}${shift ? 'Shift + ' : ''}${inKeyBlackList(key) ? '' : key.replace(' ', 'SPACE')}`;
 }