cnhis-design-vue 2.1.45 → 2.1.47

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cnhis-design-vue",
-  "version": "2.1.45",
+  "version": "2.1.47",
   "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">
@@ -363,6 +364,9 @@ export default create({
         tableFieldMap[v.tableField] = v;
       });
       return tableFieldMap;
+    },
+    tableAttrs(){
+      return this?.tableProps || {}
     }
   },
   watch: {
@@ -780,19 +784,30 @@ export default create({
        * 一人展示名字，多人展示数量 => 方晶晶(产品)
        */
       // [{"dept_id":996,"dept_name":"高手","user_name":"我是李高手"}]
-      let str = row[item.columnName];
-      if (vexutils.isJSON(str)) {
-        let obj = JSON.parse(str);
-        if (Array.isArray(obj)) {
-          let len = obj.length;
-          let showName = obj[0]?.user_name || obj[0]?.name;
-          if (len > 1) {
-            return `已选${len}人`;
-          } else if (len === 1) {
-            return (showName) || `已选${len}人`;
-          }
-        }
+      // 2022/12/14 列表选人组件字段，产品(方晶晶)期望鼠标悬停在 已选x人 上面时，展示所有名称 xxx,xxx,xxx
+      let obj = row[item.columnName];
+      if(!obj) return '';
+      let content = ''
+      if (obj && vexutils.isJSON(obj)) {
+        obj = JSON.parse(obj);
+      }
+      if(!Array.isArray(obj) || !obj.length) return ''
+      let len = obj.length;
+      let showName = obj[0]?.user_name || obj[0]?.name;
+      if (len > 1) {
+        content =  `已选${len}人`;
+      } else if (len === 1) {
+        content =  (showName) || `已选${len}人`;
+      }
+      let tooltipTitle = obj.map(v => v.user_name || v.name).filter(Boolean).join(',')
+      let refName = `item-${item.columnName}-${item[this.handleRowId]}`
+      let isAlias = false;
+      if (tooltipTitle && tooltipTitle !== content) {
+        isAlias = !!tooltipTitle
       }
+      return [
+        <TextOverTooltip refName={refName} tooltipTitle={tooltipTitle} content={content} isAlias={isAlias}></TextOverTooltip>
+      ]
     },
 
     /** 年龄 json 解析 */
@@ -1381,6 +1396,8 @@ export default create({
     // 2022/12/1 沈培均/方晶晶要求新增 如果有自定义提示就不显示表格自带的提示
     handleShowOverflow(item) {
       if (item.columnName == "operatorColumn") return false;
+      // 选人组件 自己的tooltip
+      if (item.attrType === "CANDIDATE_COMPONENTS") return false;
       let {showSetting} = item.settingObj || {}
       if (!showSetting || !showSetting.length) return 'title';
       let hasTips = 'title';
@@ -2956,6 +2973,10 @@ export default create({
       }
     },
     setRowStatus(vxeTable, rowIndex, value) {
+      /**
+       * 行编辑状态切换，样式修改
+       * 目前行编辑的状态行高度为66px，普通状态的高度应取配置值（如果有）
+       */
       if (!vxeTable) return false;
 
       let tableWrap = [
@@ -2975,14 +2996,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/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/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,