cnhis-design-vue 2.1.158 → 2.1.160

package/package.json

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

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

@@ -354,6 +354,12 @@ export default {
           end_val: item.end_val || '', // 结束时间
           unit: item.unit || '' // 年龄
         };
+        if (item.extendKey) {
+          temp.extendKey = item.extendKey;
+        }
+        if (item.extendType) {
+          temp.extendType = item.extendType;
+        }
         conObj.push(temp);
       }
       // let dateCons = this.dateTeam.map(item => item.con);

package/packages/button/src/ButtonPrint/new.vue

@@ -1062,15 +1062,35 @@ export default create({
     },
     handleClickPrint(curPrintParamList, templateCode, templateId, formatId, printToParam=[], needContinuePrint) {
       let len = curPrintParamList.length;
-      const callLocalServicesSuccessCb = async data => {
+      const successParams = [];
+      const errorParams = [];
+      const callLocalServicesSuccessErrorCb = async data => {
         try {
+          if (data.printCbStatus) {
+            successParams.push(data);
+          } else {
+            errorParams.push(data);
+          }
           if (--len <= 0) {
-            this.callLocalServicesSuccessCb(data, 'print');
+            if (errorParams.length == curPrintParamList.length) {
+              this.callLocalServicesErrorCb(data, {
+                successList: [],
+                errorList: errorParams,
+                isMulti: true
+              });
+            } else {
+              this.callLocalServicesSuccessCb(data, 'print', {
+                successList: successParams,
+                errorList: errorParams,
+                isMulti: true
+              });
+            }
           }
         } catch (error) {
           console.log('error', error);
         }
       };
+
       if (this.getCurrentLoading() && !needContinuePrint) return;
       this.toggleExpandLoading(true, formatId);
       this.prevFn()
@@ -1111,49 +1131,47 @@ export default create({
               printdlgshow: this.printdlgshow
             };
             if (this.strategy === 'MULTI') {
-              // 循环多条
-              // for (let i = 0; i < curPrintParamList.length; i++) {
-              //   if (i > 0) queryParams.printdlgshow = '0';
-              //   const params = JSON.stringify(Object.assign({}, JSON.parse(this.getPrintParams()), this.printCustomProps, curPrintParamList[i]));
-              //   this.printInstance.printDirect(
-              //     {
-              //       ...queryParams,
-              //       params
-              //     },
-              //     callLocalServicesSuccessCb,
-              //     this.callLocalServicesErrorCb,
-              //     this.callLocalServicesCancelCb
-              //   );
-              // }
               // 循环剩余数据
               const multiOtherPrint = () => {
                 for (let i = 1; i < curPrintParamList.length; i++) {
                   queryParams.printdlgshow = '0';
                   const params = JSON.stringify(Object.assign({}, JSON.parse(this.getPrintParams()), this.printCustomProps, curPrintParamList[i]));
+                  const originParam = this.findOriginParam(curPrintParamList[i], printToParam);
                   this.printInstance.printDirect(
                     {
                       ...queryParams,
                       params
                     },
-                    callLocalServicesSuccessCb,
-                    this.callLocalServicesErrorCb,
+                    (res) => {
+                      res.originPrintParam = originParam || undefined;
+                      res.printCbStatus = true;
+                      callLocalServicesSuccessErrorCb(res);
+                    },
+                    (error) => {
+                      error.originPrintParam = originParam || undefined;
+                      callLocalServicesSuccessErrorCb(error);
+                    },
                     this.callLocalServicesCancelCb
                   );
                 }
               }
               // 先执行第一条如果取消了，则不再往下执行
               const params = JSON.stringify(Object.assign({}, JSON.parse(this.getPrintParams()), this.printCustomProps, curPrintParamList[0]));
+              const originParam = this.findOriginParam(curPrintParamList[0], printToParam);
               this.printInstance.printDirect(
                 {
                   ...queryParams,
                   params
                 },
                 (res) => {
-                  callLocalServicesSuccessCb(res);
+                  res.originPrintParam = originParam || undefined;
+                  res.printCbStatus = true;
+                  callLocalServicesSuccessErrorCb(res);
                   multiOtherPrint();
                 },
                 (error) => {
-                  this.callLocalServicesErrorCb(error);
+                  error.originPrintParam = originParam || undefined;
+                  callLocalServicesSuccessErrorCb(error);
                   multiOtherPrint();
                 },
                 (res) => {
@@ -1180,6 +1198,11 @@ export default create({
           }
         })
     },
+
+    findOriginParam(printParam, originParams) {
+      const keys = Object.keys(printParam);
+      return originParams.find(param => keys.every(key => printParam[key] == param[key]));
+    },
     getHisParams(index = 0) {
       const { templateParams, hisParams, params } = this;
       const { reportid = '280' } = hisParams;
@@ -1346,7 +1369,7 @@ export default create({
       this.visible = false;
     },
     /*  */
-    callLocalServicesSuccessCb(res, type) {
+    callLocalServicesSuccessCb(res, type, config) {
       this.toggleExpandLoading(false);
       let info = {
         type,
@@ -1354,11 +1377,11 @@ export default create({
         templateId: res?.templateId || this.getTemplateIdByFormatId(this.currentFormatId),
         templateCode: res?.templateCode || this.getTemplateCodeByFormatId(this.currentFormatId),
       };
-      this.$emit('success', res, info);
+      this.$emit('success', res, info, config);
     },
-    callLocalServicesErrorCb(res) {
+    callLocalServicesErrorCb(res, config) {
       this.toggleExpandLoading(false);
-      this.$emit('error', res);
+      this.$emit('error', res, config);
     },
     callLocalServicesCancelCb(res) {
       this.toggleExpandLoading(false);

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

@@ -1992,6 +1992,7 @@ export default create({
         };
         // paramsArray.push(utils.setParamsValue(setData[0].params, Object.assign(paramsData, { obj })));
         let resParams = utils.setParamsValue(setData[0].params, Object.assign(paramsData, { obj, table: i })) || {}
+        resParams._originRow = i;
         if(btn?.__printConfig?.number) {
           resParams.templateNumbers = [btn.__printConfig.number]
         }
@@ -1999,7 +2000,7 @@ export default create({
       });
       return paramsArray;
     },   
-    async receivePrintSuccessAboutPrint(res, info) {
+    async receivePrintSuccessAboutPrint(res, info, config) {
       const printBtn = this.printBtn;
       const templateId = info.templateId;
       const formatId = info.formatId;
@@ -2011,7 +2012,7 @@ export default create({
         const result = await this.printConfig.postStepRule(printBtn.settingObj, {
           result: res,
           print: print
-        });
+        }, config);
 
         let isSync = result?.method
         if(!isSync || isSync!=='sync')  return;
@@ -2023,15 +2024,28 @@ export default create({
         console.log('error', error);
       }
     },
-    async receivePrintSuccess(res, info) {
+    async receivePrintSuccess(res, info, config={}) {
+      const {isMulti, errorList=[]} = config
+      let useRes = res;
+      // 批量打印如果有失败就取errorList的最后一项
+      if(isMulti && errorList.length) {
+        useRes = errorList[errorList.length -1];
+      }
+      const {result, message, errinfo}  = useRes || {}
+      const messageType = isMulti ? result == 'error' ?'error' : 'success' : 'success';
+      let msg = message;
+      if(messageType === 'error' && errinfo) {
+        msg = (message + `：${errinfo}`)
+      }
       if (info.type === 'print') {
-        await this.receivePrintSuccessAboutPrint(res, info);
+        await this.receivePrintSuccessAboutPrint(useRes, info, config);
       }
       if(info.type === 'download' && this.receivePrintSuccessDownloadPdf && typeof this.receivePrintSuccessDownloadPdf === 'function') {
-        this.receivePrintSuccessDownloadPdf(res)
+        this.receivePrintSuccessDownloadPdf(useRes, config)
       }
+      
       setTimeout(() => {
-        this.$message.success(res.message);
+        this.$message[messageType](message);
       }, 3500);
     },
     receivePrintError(res) {

package/packages/table-filter/src/components/render-widget/components/SelectDynamic.vue

@@ -9,7 +9,7 @@
       :maxTagCount="maxTagCount"
       :maxTagPlaceholder="maxTagPlaceholder"
       :filterOption="false"
-      :allowClear="true"
+      :allowClear="allowClear"
       :showArrow="true"
       ref="quickInputSelect"
       class="quick-dynamic-select"
@@ -90,7 +90,8 @@ export default {
     placeholder: String,
     mode: String,
     handleWordBookSearchRender: Function,
-    dropdownVisibleChangeRender: Function
+    dropdownVisibleChangeRender: Function,
+    allowClear: Boolean
   },
   data() {
     return {};

package/packages/table-filter/src/components/render-widget/components/SelectTree.vue

@@ -0,0 +1,145 @@
+<template>
+  <div class="valueCfg-SelectDynamicTree">
+    <a-tree-select
+      v-model="valueCp"
+      showSearch
+      :multiple="isMultiple"
+      :placeholder="placeholder"
+      :dropdownMatchSelectWidth="false"
+      :maxTagCount="maxTagCount"
+      :maxTagPlaceholder="maxTagPlaceholder"
+      :tree-data="componentCfg.dataSource"
+      :allowClear="allowClear"
+      :replaceFields="replaceFields"
+      class="valueCfg-dynamic-select-tree"
+      dropdownClassName="valueCfg-dynamic-tree-drop"
+      ref="quickInputSelectTree"
+      treeNodeFilterProp="title"
+      @change="handleChange"
+      :dropdown-style="{ maxHeight: '293px', overflow: 'auto', zIndex: 2023 }"
+    >
+      <span
+        class="init-key-loading"
+        v-if="key === '_init_key_'"
+        slot="title"
+        slot-scope="{ key, value }"
+        style="color: #08c"
+      >
+        <span v-show="false">{{ value }}</span>
+        <a-spin :tip="`${$t('1.1.7.14')}...`" />
+      </span>
+    </a-tree-select>
+  </div>
+</template>
+<script>
+export default {
+  name: "SelectTree",
+  components: {},
+  props: {
+    value: { type: [Array, String, Number] },
+    componentCfg: { type: Object },
+    placeholder: String,
+    mode: String,
+    handleWordBookSearchRender: Function,
+    dropdownVisibleChangeRender: Function,
+    isQuick: Boolean,
+    allowClear: Boolean,
+  },
+  data() {
+    return {
+      open: false,
+      replaceFields: {
+        children: "children",
+        title: "_show_title",
+        key: "myName",
+        value: "myName"
+      }
+    };
+  },
+  model: {
+    prop: "value",
+    event: "update:value"
+  },
+  computed: {
+    valueCp: {
+      set(val) {
+        this.$emit("update:value", val);
+      },
+      get() {
+        return this.value;
+      }
+    },
+    isMultiple() {
+      return this.mode === "multiple";
+    },
+    showSelectTitle() {
+      let { fetchingWordbook, dataSource } = this.componentCfg || {};
+      return !fetchingWordbook && !!dataSource?.length;
+    },
+
+    showKeys() {
+      let { showKeys } = this.componentCfg?.dynamicOptionInfo || {};
+      return showKeys;
+    },
+    _showKeys_() {
+      let { _showKeys_ } = this.componentCfg || {};
+      if (_showKeys_?.length) return _showKeys_;
+      return this.showKeys;
+    },
+    getShowKeysMax() {
+      let len = this.showKeys?.length || 1;
+      let maxWidth = 100 / len;
+      return {
+        maxWidth: `${maxWidth}%`
+      };
+    },
+    selectHasTitle() {
+      const { showSelectTitle, showKeys, componentCfg } = this;
+      return (
+        showSelectTitle &&
+        Array.isArray(showKeys) &&
+        showKeys?.length > 1 &&
+        componentCfg?.dataSource?.length
+      );
+    },
+    maxTagCount() {
+      if (!Array.isArray(this.value)) return undefined;
+      const len = this.value.length || 0;
+      return len > 1 ? 0 : 1;
+    }
+  },
+  watch: {
+    // value: {
+    //   immediate: true,
+    //   handler(val) {}
+    // }
+  },
+  // 生命周期
+  created() {},
+  mounted() {
+    if(!this.isQuick) return;
+    this.handleWordBookSearchRender('', this.componentCfg, {skipFirstDef: true});
+  },
+
+  // 方法
+  methods: {
+    maxTagPlaceholder() {
+      if (!Array.isArray(this.value)) return undefined;
+      const { alias, title } = this.componentCfg;
+      const len = this.value.length || 0;
+      return this.value.length > 1 ? `已选${len}个${alias || title}` : "";
+    },
+    handleChange(value, label, extra) {
+      console.log(value, label, extra, "--value, label, extra");
+    }
+  }
+};
+</script>
+<style lang="less">
+.valueCfg-SelectDynamicTree {
+  width: 100%;
+}
+.valueCfg-dynamic-select-tree {
+  width: 100%;
+}
+</style>

package/packages/table-filter/src/components/render-widget/components/index.js

@@ -6,5 +6,6 @@ import SelectDynamic from './SelectDynamic.vue';
 import Label from './Label.vue';
 import SelectLabel from './SelectLabel.vue';
 import Text from './Text.vue';
+import SelectTree from './SelectTree.vue';
 
-export { CheckboxGroup, Select, NumberRange, DateRangeQuick, SelectDynamic, Label, SelectLabel, Text };
+export { CheckboxGroup, Select, NumberRange, DateRangeQuick, SelectDynamic, Label, SelectLabel, Text, SelectTree };

package/packages/table-filter/src/components/render-widget/enums.js

@@ -11,7 +11,8 @@ export const WidgetTypeEnums = {
   DATETIME_RANGE: 'DATETIME_RANGE',
   DATE_RANGE_QUICK: 'DATE_RANGE_QUICK',
   LABEL: 'LABEL',
-  SELECT_LABEL: 'SELECT_LABEL'
+  SELECT_LABEL: 'SELECT_LABEL',
+  SELECT_TREE: 'SELECT_TREE'
 };
 
 export const DatePresetValEnums = {

package/packages/table-filter/src/components/render-widget/index.vue

@@ -92,6 +92,9 @@ export default {
         Props.dropdownVisibleChangeRender = this.dropdownVisibleChangeRender;
         Props.handleWordBookSearchRender = this.handleWordBookSearchRender;
       }
+      if(widgetType === WidgetTypeEnums.SELECT_TREE) {
+        Props.handleWordBookSearchRender = this.handleWordBookSearchRender;
+      }
       if(widgetType === WidgetTypeEnums.LABEL || widgetType === WidgetTypeEnums.SELECT_LABEL) {
         Props.getLabelListMethodRender = this.getLabelListMethodRender;
       }

package/packages/table-filter/src/components/render-widget/mixins/dynamic-method.js

@@ -7,7 +7,7 @@ export default {
   },
   methods: {
     wordbookDataParamsRender(dynamicOptionInfo) {
-      let { dataSourceId, dataSourceType = 'WORDBOOK', filterKeys, autograph, defaultParams } = dynamicOptionInfo;
+      let { dataSourceId, dataSourceType = 'WORDBOOK', filterKeys, autograph, defaultParams, treeInfo = {} } = dynamicOptionInfo;
       if (Array.isArray(filterKeys)) {
         filterKeys = JSON.stringify(filterKeys);
       }
@@ -17,6 +17,10 @@ export default {
         fieldKeys: filterKeys,
         autograph
       };
+      if (treeInfo.enable) {
+        params.levelKey = treeInfo.levelKey;
+        params.primaryKey = treeInfo.primaryKey;
+      }
       return params;
     },
     handleRenderFirstDef(item, rows) {
@@ -50,6 +54,46 @@ export default {
           this.$set(row, 'fetchingWordbook', false);
         });
     },
+    handleWordbookRows(list, valueKey, showKeys, isTree) {
+      if (!list?.length) return [];
+      return list.map(row => {
+        let showKeysStr = [];
+        // 取值是value, 展示是change_text
+        let valueKeyN = `_${valueKey}_`;
+        for (let key in row) {
+          let showVal = vexutils.stringToValue(row[key], 'change_text');
+          if (key === valueKey) {
+            row[valueKeyN] = vexutils.stringToValue(row[key]);
+          }
+          row[key] = showVal;
+        }
+        showKeys.forEach(s => {
+          showKeysStr.push(row[s]);
+        });
+        let name = row[valueKeyN];
+        // 保存的时候值会变成字符串, 如果是数字的话回显会出问题, 这里全部处理成字符串
+        if (typeof name === 'number') {
+          name = String(name);
+        }
+        const _show_title = showKeysStr.join(' ');
+        if (isTree) {
+          row.scopedSlots = {
+            title: 'title'
+          };
+          row.title = _show_title;
+          row.key = name;
+          row.value = name;
+        }
+        if (isTree && row.children?.length) {
+          row.children = this.handleWordbookRows(row.children, valueKey, showKeys, isTree);
+        }
+        return {
+          ...row,
+          myName: name,
+          _show_title
+        };
+      });
+    },
 
     formatWordbookDataRender(item, data, params) {
       let searchPageConfig = {
@@ -62,7 +106,7 @@ export default {
         resArr = [];
       if (data && data.result === 'SUCCESS') {
         let reqParams = data?.reqParams || {};
-        let { showKeys, valueKey } = item?.widgetCfg?.dynamicOptionInfo || {};
+        let { showKeys, valueKey, treeInfo = {} } = item?.widgetCfg?.dynamicOptionInfo || {};
         showKeys = Array.isArray(showKeys) ? showKeys : [showKeys];
         let { page, hasNextPage, fieldList, rows = [] } = data.map;
 
@@ -84,32 +128,7 @@ export default {
           keyword: params?.keyword || undefined,
           asyncCount: reqParams?.asyncCount || undefined
         });
-        let rowsArr = rows.map(row => {
-          let showKeysStr = [];
-          // 取值是value, 展示是change_text
-          let valueKeyN = `_${valueKey}_`;
-          for (let key in row) {
-            let showVal = vexutils.stringToValue(row[key], 'change_text');
-            if (key === valueKey) {
-              row[valueKeyN] = vexutils.stringToValue(row[key]);
-            }
-            row[key] = showVal;
-          }
-          showKeys.forEach(s => {
-            // let str = vexutils.stringToValue(row[s]);
-            showKeysStr.push(row[s]);
-          });
-          // let name = vexutils.stringToValue(row[valueKey]);
-          let name = row[valueKeyN];
-          // 保存的时候值会变成字符串, 如果是数字的话回显会出问题, 这里全部处理成字符串
-          if (typeof name === 'number') {
-            name = String(name);
-          }
-          return Object.assign(row, {
-            myName: name,
-            _show_title: showKeysStr.join(' ')
-          });
-        });
+        let rowsArr = this.handleWordbookRows(rows, valueKey, showKeys, treeInfo?.enable);
         // 数组对象去重
         let obj = {};
         resArr = rowsArr.reduce((cur, next) => {

package/packages/table-filter/src/components/render-widget/widgetCfgMaps.js

@@ -1,6 +1,6 @@
 import { WidgetTypeEnums, DatePresetValEnums } from './enums';
 import { InputNumber, Input, DatePicker } from 'ant-design-vue';
-import { CheckboxGroup, Select, NumberRange, DateRangeQuick, SelectDynamic, Label, SelectLabel, Text } from './components';
+import { CheckboxGroup, Select, NumberRange, DateRangeQuick, SelectDynamic, Label, SelectLabel, Text, SelectTree } from './components';
 import moment from 'moment';
 import { presetValToTimestamp } from './helpers/presetValToTimestamp';
 
@@ -260,6 +260,31 @@ export const WidgetCfgMaps = new Map([
       setDefaultValue: SetDefVal
     }
   ],
+  [
+    WidgetTypeEnums.SELECT_TREE,
+    {
+      component: SelectTree,
+      props: {},
+      eventsBySearch: [
+        {
+          name: 'change',
+          handler(e, search, props) {
+            const { mode } = props;
+            if (mode !== 'multiple') {
+              search();
+            }
+          }
+        }
+      ],
+      handlerProps(props, { multiple, title, explicitRequired, isQuick } = {}) {
+        const allowClear = explicitRequired != 1;
+        const Props = { ...props, placeholder: `请选择${title}`, allowClear, isQuick };
+        Props.mode = multiple ? 'multiple' : 'default';
+        return Props;
+      },
+      setDefaultValue: SetDefVal
+    }
+  ],
   [
     WidgetTypeEnums.SELECT_DYNAMIC,
     {

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

@@ -74,6 +74,12 @@ export default {
         value: val.length > 0 ? val : null,
         unit
       };
+      if (widgetCfg.extendKey) {
+        obj.extendKey = widgetCfg.extendKey;
+      }
+      if (widgetCfg.extendType) {
+        obj.extendType = widgetCfg.extendType;
+      }
 
       if (widgetType === WidgetTypeEnums.INPUT && widgetCfg?.accurateSearch?.switchEnable) {
         obj.isAccurateSearch = isAccurateSearch;
@@ -91,9 +97,12 @@ export default {
       }
       return !Array.isArray(value) ? value : value[0];
     },
+    isDynamicTree(cfg) {
+      return !cfg?.manualMapping && cfg?.widgetCfg?.dynamicOptionInfo && cfg?.widgetCfg?.dynamicOptionInfo?.treeInfo?.enable;
+    },
     isExplicitDefaultVal(cfg) {
       const { explicitDefaultVal } = cfg.widgetCfg || {};
-      return explicitDefaultVal === 'firstOption';
+      return explicitDefaultVal === 'firstOption' || this.isDynamicTree(cfg);
     },
     isExistDefValByRenderWidget(cfg) {
       const { defaultValue, defValueUnit } = cfg.widgetCfg || {};

package/packages/upload/chunk-upload/chunk-upload-new.vue

@@ -739,7 +739,8 @@ export default {
       return new Promise((resolve, reject) => {
         const obj = {
           ...data,
-          ...this.uploadArguments
+          ...this.uploadArguments,
+          size: file.size,
         };
 
         instance