cnhis-design-vue 2.1.11 → 2.1.12

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cnhis-design-vue",
-  "version": "2.1.11",
+  "version": "2.1.12",
   "description": "前端业务UI库",
   "keyword": "cnhis-design-vue vue cnhis",
   "homepage": "http://dv.cnhis.com/",
@@ -104,4 +104,4 @@
       "commit-msg": "commitlint -E HUSKY_GIT_PARAMS"
     }
   }
-}
+}

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

@@ -2746,13 +2746,21 @@ export default create({
       };
       if (this.isTree == 2) {
         const { tableId, page, pageSize, autograph, isTreeOrList } = this.tableParams;
+        const { extraParams = {} } = this.listCountParams || {};
+        let tempExtra = {};
+        if (vexutils.isJSON(extraParams)) {
+          tempExtra = JSON.parse(extraParams);
+        }
+        // 20220725 测试要求懒加载树请求时带上父级的extraParams
         const params = {
           levelLazyLoadPrimaryKeyValue: row[this.primaryKey],
           tableId,
           page,
           pageSize,
           autograph,
-          isTreeOrList
+          isTreeOrList,
+          extraParams,
+          ...tempExtra
         };
 
         return this.getAsyncTableData(params).then(({ data }) => {

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

@@ -88,7 +88,8 @@ const bigTableProps = {
   rowBtnAutoLayout:{// 行内按钮自适应布局
     type: Boolean,
     default: true
-  }
+  },
+  listCountParams:{ type: Object, default: () => ({}) },
 };
 
 export default bigTableProps;

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

@@ -371,19 +371,7 @@ export default {
                   lockMovementY: true
                 }
               : {};
-            if (this.isObject(v) && !v.value) {
-              const option = Object.assign({}, obj.iconStyle || {}, v || {}, {
-                ...common,
-                ...eventStyle
-              });
-              let ele;
-              if (v?.iconClassName) {
-                ele = await this.createImage(v.iconClassName, v);
-              }
-              const img = await this.createPoint(v?.url || v?.iconClassName ? 'img' : v.type, {
-                ele: ele || '',
-                ...option
-              });
+            const addNumber = async point => {
               // 标记增加序号
               if (v.other?.number) {
                 const circle = await this.createPoint('circle', {
@@ -396,39 +384,56 @@ export default {
                   left: 0,
                   top: 0
                 });
-                const text = new this.fabric.Text(String(v.other?.number || ''), {
+                const text = new this.fabric.Text(String(v.other?.number), {
                   ...defaultVaule.textStyle,
                   ...common,
                   ...(obj.numberStyle?.text || {}),
                   left: 0,
                   top: 0
                 });
+                const scale = typeof point.scale === 'number' ? point.scale : 1;
                 const group = new this.fabric.Group([circle, text], {
                   ...common,
                   originY: 'right',
-                  left: img.left - (img.width * img.scale) / 2 - defaultVaule.bottomNumberLeftSpace,
+                  left: point.left - (point.width * scale) / 2 - defaultVaule.bottomNumberLeftSpace,
                   selectable: false,
-                  evented: false
+                  hoverCursor: 'default',
+                  // evented: false,
+                  ...eventStyle
                 });
-                img.number = group;
+                return group;
               }
-              img.hasControls = img.hasBorders = false;
-              this.pointEvent(img);
-              this.canvas.add(img);
-              img.number && this.canvas.add(img.number);
+            };
+            const addCanvas = async point => {
+              point.number = await addNumber(point);
+              point.hasControls = point.hasBorders = false;
+              this.pointEvent(point);
+              this.canvas.add(point);
+              point.number && this.canvas.add(point.number);
               this.canvas.requestRenderAll();
-            } else {
+            };
+            if (this.isObject(v) && !v.value) {
+              const option = Object.assign({}, obj.iconStyle || {}, v || {}, {
+                ...common,
+                ...eventStyle
+              });
+              let ele;
+              if (v?.iconClassName) {
+                ele = await this.createImage(v.iconClassName, v);
+              }
+              const img = await this.createPoint(v?.url || v?.iconClassName ? 'img' : v.type, {
+                ele: ele || '',
+                ...option
+              });
+              addCanvas(img);
+            } else if (v.value) {
               const text = new this.fabric.Text(String(v.value), {
                 ...defaultVaule.textStyle,
                 ...obj.style,
                 ...common,
                 ...eventStyle
               });
-              text.hasControls = text.hasBorders = false;
-              // textList.push(text);
-              this.pointEvent(text);
-              this.canvas.add(text);
-              this.canvas.renderAll();
+              addCanvas(text);
             }
           });
         }
@@ -439,7 +444,8 @@ export default {
     updateNumber(point) {
       if (point.number) {
         point.number.setCoords();
-        point.number.set({ left: point.left - (point.width * point.scale) / 2 - defaultVaule.bottomNumberLeftSpace, top: point.top });
+        const scale = typeof point.scale === 'number' ? point.scale : 1;
+        point.number.set({ left: point.left - (point.width * scale) / 2 - defaultVaule.bottomNumberLeftSpace, top: point.top });
       }
     },
     pointEvent(point) {
@@ -449,6 +455,14 @@ export default {
       point.on('mouseout', () => {
         this.isDropVisible = false;
       });
+      if (point.number) {
+        point.number.on('mouseover', () => {
+          this.showDrapPopup(point, true);
+        });
+        point.number.on('mouseout', () => {
+          this.isDropVisible = false;
+        });
+      }
       // 移动中 实时更新相关联的线的坐标
       if (this.eventStyle.evented) {
         point.on('moving', () => {

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

@@ -121,7 +121,7 @@
       v-model="choiceValue"
       placeholder="请选择"
       show-search
-      :mode="cloneItem.setting.isMultiple ? 'multiple' : 'default'"
+      :mode="showMulti"
       :disabled="isLock"
       @search="handleSearch"
       @change="handleSelectChange"
@@ -130,7 +130,7 @@
       :notFoundContent="fetching ? undefined : '暂无数据'"
     >
       <a-spin v-if="fetching" slot="notFoundContent" size="small" />
-      <a-select-option v-for="(v, i) in curOptions" :key="i" :value="v.value">{{ v[showField] }}</a-select-option>
+      <a-select-option v-for="(v, i) in curOptions" :key="i" :value="v[columnKey]">{{ v[labelKey] }}</a-select-option>
     </a-select>
     <a-cascader
       v-else-if="cloneItem.type == 'SEARCH_CASCADE'"
@@ -238,6 +238,32 @@ export default {
       return function (o) {
         return o.prefix || o.suffix;
       };
+    },
+    isDynamic2Static() {
+      // 分享链接的量表用 optionType 1：静态，2：动态，3：动态转静态
+      let { targetSource = {}, options = [], optionType } = this.item || {};
+      if (targetSource.target_id && (options.length || optionType == 3)) return true;
+      return false;
+    },
+    isMultiple() {
+      return this.item?.setting?.isMultiple;
+    },
+    showMulti() {
+      return this.isMultiple ? 'multiple' : 'default';
+    },
+    // 取值字段
+    columnKey() {
+      let { target_id, values } = this.item?.targetSource || {};
+      if (!target_id || !values) return 'value';
+      if (this.isDynamic2Static) return values || 'value';
+      return values;
+    },
+    // 显示字段
+    labelKey() {
+      let { target_id, showField } = this.item?.targetSource || {};
+      if (!target_id || !showField) return 'label';
+      if (this.isDynamic2Static) return showField || 'label';
+      return showField;
     }
   },
   watch: {
@@ -255,8 +281,6 @@ export default {
       selectParams: { tableType: 'TABLE_LIST', pageSize: 20, page: 1 },
       cascaderParams: { tableType: 'TABLE_LIST' },
       cloneItem: {},
-      columnName: '', // 取值字段
-      showField: '', // 显示字段
       curvalue: '',
       curCheckboxValue: [],
       othersText: '',
@@ -463,11 +487,10 @@ export default {
     async initSelectOptions() {
       // 分享链接的量表用 optionType 1：静态，2：动态，3：动态转静态
       const { targetSource, type, options = [], optionType = 1 } = this.cloneItem;
-      this.showField = 'label';
       if (!targetSource?.target_id) return;
       // 动态数据源转静态数据
-      if (type == 'SELECT' && (options.length || optionType == 3)) {
-        this.curOptions = options;
+      if (type == 'SELECT' && this.isDynamic2Static) {
+        this.curOptions = this.handleDynamic2StaticOptions(options);
         return;
       }
       if (type === 'SELECT') {
@@ -477,113 +500,32 @@ export default {
       } else {
         this.curOptions = await this.getCascadeOptions(this.cloneItem);
       }
-      this.columnName = targetSource?.values;
-      this.showField = targetSource?.showField || targetSource?.values;
-      // this.findDetails(targetSource).then(obj => {
-      //   if (type == "SEARCH_CASCADE") {
-      //     this.findCascader(obj);
-      //   } else if (type == "SELECT") {
-      //     this.findTableData(obj);
-      //   }
-      // });
-    },
-    // 下拉组件查询列表数据配置
-    findDetails({ target_id, values, primaryField, relationField, showField }) {
-      const url = '/tableList/getDetail';
-      const params = {
-        tableId: target_id,
-        tableType: 'TABLE_LIST'
-      };
-      this.columnName = values;
-      this.showField = showField || values;
-      return axios.get(url, { params }).then(({ data }) => {
-        const { detailAutograph, tableId, fieldList = [], buttonList = [] } = data.map;
-        const { type } = this.cloneItem;
-        fieldList.forEach(item => {
-          item.attrType = (item.settingObj && item.settingObj.attr) || '';
-        });
-        this.fieldList = fieldList;
-        this.buttonList = buttonList;
-        if (type == 'SELECT') {
-          Object.assign(this.selectParams, {
-            autograph: detailAutograph,
-            tableId
-          });
-        } else if (type == 'SEARCH_CASCADE') {
-          Object.assign(this.cascaderParams, {
-            autograph: detailAutograph,
-            tableId,
-            primaryKey: primaryField,
-            levelKey: relationField
-          });
-        }
-        return { values, showField: this.showField };
-      });
     },
-    // 下拉组件查询列表字段值
-    findTableData({ values, keyword }) {
-      const url = '/tableReader/getTableData';
-      delete this.selectParams.keyword;
-      if (keyword) {
-        Object.assign(this.selectParams, { keyword });
-      }
-      return axios.post(url, this.$qs.stringify(this.selectParams)).then(({ data }) => {
-        const { rows } = data.map;
-        const options = rows.map(row => {
-          return Object.assign(row, {
-            // label: row[showField],
-            value: row[values]
+    handleDynamic2StaticOptions(options) {
+      if (!options || !options.length) return [];
+      return options.map(item => {
+        if ('cascadeData' in item) {
+          Object.assign(item, {
+            ...item.cascadeData
           });
-        });
-        let optionsList = this.uniqArrObj(options, 'value');
-        optionsList = this.formatData({
-          tableList: optionsList,
-          fieldList: this.fieldList,
-          btnList: this.buttonList,
-          oldtableData: optionsList,
-          showButtonTop: 0
-        });
-        this.curOptions = optionsList;
-      });
-    },
-    // 级联组件查询列表数据
-    findCascader({ values }) {
-      const url = '/tableReader/getTableData';
-      return axios.post(url, this.$qs.stringify(this.cascaderParams)).then(({ data }) => {
-        const { rows } = data.map;
-        this.curOptions = this.initTreeData(rows, values);
-      });
-    },
-    // 初始化树
-    initTreeData(rows, values) {
-      return rows.map(row => {
-        const valObj = { label: row[values], value: row[values], id: row.id };
-        if (row.parent_id) {
-          Object.assign(valObj, { parent_id: row.parent_id });
         }
-        if (row.children) {
-          Object.assign(valObj, {
-            children: this.initTreeData(row.children, values)
-          });
+        // 容错 没有配置的key 添加一个
+        if (!(this.columnKey in item)) {
+          item[this.columnKey] = item.value || item.label;
         }
-        return valObj;
+        if (!(this.labelKey in item)) {
+          item[this.labelKey] = item.label;
+        }
+        return item;
       });
     },
-    // 数组对象去重
-    uniqArrObj(arr, name) {
-      let obj = {};
-      return arr.reduce((cur, next) => {
-        obj[next[name]] ? '' : (obj[next[name]] = true && cur.push(next));
-        return cur;
-      }, []);
-    },
     // 下拉组件搜索
     async handleSearch(value) {
       try {
         this.curOptions = await this.getSearchOptions(
           {
-            values: this.columnName,
-            showField: this.showField,
+            values: this.columnKey,
+            showField: this.labelKey,
             keyword: value
           },
           this.cloneItem

package/packages/table-filter/src/base-search-com/BaseSearch.vue

@@ -55,7 +55,7 @@
           <li v-if="isShowSetting('hideSearch') && !showRelatedTreeBtn" ref="inputSearchLi" class="baseSearch-input-search">
             <template v-if="outSearchFieldList && outSearchFieldList.length">
               <a-input
-                :style="{ width: inputSearchW + 'px', margin: '0 8px 8px 0' }"
+                :style="{ width: (searchInputWidth || inputSearchW) + 'px', margin: '0 8px 8px 0' }"
                 allowClear
                 :placeholder="searchPlaceHolder"
                 :value="currentValue"
@@ -76,7 +76,7 @@
             <a-input-search
               v-else
               class="my-input-search input-search-com"
-              :style="{ width: inputSearchW + 'px' }"
+              :style="{ width: (searchInputWidth || inputSearchW) + 'px' }"
               @search="onSearch"
               allowClear
               :placeholder="searchPlaceHolder"
@@ -423,6 +423,10 @@ export default create({
     width: {
       default: '400px'
     },
+    searchInputWidth:{ // 设置检索框的宽度
+      type: Number,
+      default:0
+    },
     onSearch: Function,
     rowBtnList: {
       type: Array,

package/packages/table-filter/src/components/c-tree-select/tree-select.vue

@@ -8,7 +8,7 @@
     :maxTagPlaceholder="handleMaxTag"
     showSearch
     multiple
-    style="width: 160px"
+    :style="`width: ${item.advanceColWidth||160}px`"
     :class="[!showRemoveIcon && 'c-a-tree-select-show-hide-icon','c-a-quick-input-tree-mul']"
     :dropdown-style="{ maxHeight: '292px', overflow: 'auto' }"
     :tree-data="treeData"

package/packages/table-filter/src/components/multi-select/multi-select.vue

@@ -1,9 +1,9 @@
 <template>
   <a-select
-    mode="multiple"
+    :mode="mode"
     v-if="item.com == 'SelectMui'"
     :placeholder="`请选择${item.alias || item.title}`"
-    style="width: 160px"
+    :style="{width: `${item.advanceColWidth||160}px`}"
     :dropdownMatchSelectWidth="false"
     :maxTagCount="handleMaxTagCount(item)"
     :maxTagPlaceholder="handleMaxTag(item)"
@@ -78,7 +78,7 @@ export default {
       render: (h, ctx) => ctx.props.vnodes
     }
   },
-  props: ['item', 'maxTagPlaceholder', 'outFilterChange', 'handleWordBookSearch', 'dropdownVisibleChange', 'source', 'fetchingWordbook'],
+  props: ['item', 'maxTagPlaceholder', 'outFilterChange', 'handleWordBookSearch', 'dropdownVisibleChange', 'source', 'fetchingWordbook',],
   data() {
     return {};
   },
@@ -123,6 +123,9 @@ export default {
       }
 
       return true;
+    },
+    mode(){
+      return String(this?.item?.advanceOptionSetting) == '0'? 'default' : 'multiple'
     }
   },
   watch: {},
@@ -135,6 +138,7 @@ export default {
   // 方法
   methods: {
     createSuffixIcon() {
+      if(this.mode === 'default') return;
       let refDom = this.$refs.quickInputSelect;
       if (!refDom) return;
       let selectDom = refDom.$el;

package/packages/table-filter/src/components/out-quick-search/out-quick-search.vue

@@ -5,7 +5,7 @@
         @pressEnter="outFilterChange"
         class="CL-input"
         :style="{
-          width: '200px',
+          width: `${item.advanceColWidth || 200}px`,
           margin: '0 8px 8px 0',
           'font-family': item.PASSWORDTYPE ? 'text-security-disc' : 'inherit'
         }"

package/packages/table-filter/src/const/dataOptions.js

@@ -0,0 +1,43 @@
+export const dataOptions = {
+  dateTeam0: [
+    { con: 'TODAY', title: '1.1.4.37', name: '今天' },
+    { con: 'TOMORROW', title: '1.1.4.38', name: '明天' },
+    { con: 'YESTERDAY', title: '1.1.4.39', name: '昨天' },
+    { con: 'THIS_WEEK', title: '1.1.4.40', name: '本周' },
+    { con: 'NEXT_WEEK', title: '1.1.4.41', name: '下周' },
+    { con: 'UP_WEEK', title: '1.1.4.42', name: '上周' },
+    { con: 'THIS_MONTH', title: '1.1.4.43', name: '本月' },
+    { con: 'NEXT_MONTH', title: '1.1.4.44', name: '下月' },
+    { con: 'UP_MONTH', title: '1.1.4.45', name: '上月' },
+    { con: 'THIS_SEASON', title: '1.1.4.46', name: '本季度' },
+    { con: 'NEXT_SEASON', title: '1.1.4.47', name: '下季度' },
+    { con: 'UP_SEASON', title: '1.1.4.48', name: '上季度' },
+    { con: 'THIS_YEAR', title: '1.1.4.49', name: '本年' },
+    { con: 'NEXT_YEAR', title: '1.1.4.50', name: '下年' },
+    { con: 'UP_YEAR', title: '1.1.4.51', name: '上年' }
+  ],
+  dateTeam2: [
+    { con: 'TODAY', title: '1.1.4.37', name: '今天' },
+    { con: 'TOMORROW', title: '1.1.4.38', name: '明天' },
+    { con: 'THIS_WEEK', title: '1.1.4.40', name: '本周' },
+    { con: 'NEXT_WEEK', title: '1.1.4.41', name: '下周' },
+    { con: 'THIS_MONTH', title: '1.1.4.43', name: '本月' },
+    { con: 'NEXT_MONTH', title: '1.1.4.44', name: '下月' },
+    { con: 'THIS_SEASON', title: '1.1.4.46', name: '本季度' },
+    { con: 'NEXT_SEASON', title: '1.1.4.47', name: '下季度' },
+    { con: 'THIS_YEAR', title: '1.1.4.49', name: '本年' },
+    { con: 'NEXT_YEAR', title: '1.1.4.50', name: '下年' }
+  ],
+  dateTeam3: [
+    { con: 'TODAY', title: '1.1.4.37', name: '今天' },
+    { con: 'YESTERDAY', title: '1.1.4.39', name: '昨天' },
+    { con: 'THIS_WEEK', title: '1.1.4.40', name: '本周' },
+    { con: 'UP_WEEK', title: '1.1.4.42', name: '上周' },
+    { con: 'THIS_MONTH', title: '1.1.4.43', name: '本月' },
+    { con: 'UP_MONTH', title: '1.1.4.45', name: '上月' },
+    { con: 'THIS_SEASON', title: '1.1.4.46', name: '本季度' },
+    { con: 'UP_SEASON', title: '1.1.4.48', name: '上季度' },
+    { con: 'THIS_YEAR', title: '1.1.4.49', name: '本年' },
+    { con: 'UP_YEAR', title: '1.1.4.51', name: '上年' }
+  ]
+};

package/packages/table-filter/src/mixins/mixins.js

@@ -403,7 +403,8 @@ export const outQuickSearchFn = {
           * isPreciseSearch: 0/1
           */
         let textCon = el.fieldType == "TEXT" &&  isPreciseSearch == 1 ? 'EQ' : 'CL';
-
+        let advanceOptionSetting = el.advanceOptionSetting;
+        // let advanceColWidth = el.advanceColWidth;
         // 映射优先级最高
         if (showSetting?.length) {
           let tvalue = []
@@ -412,7 +413,11 @@ export const outQuickSearchFn = {
           if(df){
             let i = df == 'firstOption' ? 0 : showSetting.findIndex(v => v.change_text == df);
             if(i > -1){
-              tvalue.push(i)
+              if(String(advanceOptionSetting) === '0'){
+                tvalue = i
+              } else {
+                tvalue.push(i)
+              }
             }
           }
           // 存在映射 使用下拉多选框
@@ -553,7 +558,15 @@ export const outQuickSearchFn = {
           temp.value = item.value;
           conObj.push(temp);
         }
+        let advanceOptionSetting = item.advanceOptionSetting;
         if (item.com === "SelectMui" && item.value) {
+          // 单选模式
+          let single = String(advanceOptionSetting) === '0';
+          if(single){
+            if(!Array.isArray(item.value)) {
+              item.value = [item.value]
+            }
+          }
           let hasArr = Array.isArray(item.value) && item.value.length > 0
           if (item.comType == "SelectMuiWordBook" && hasArr) {
             temp.value = item.value.join("|#|");