cnhis-design-vue 2.1.23 → 2.1.24

package/package.json

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

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

@@ -136,7 +136,12 @@ export default create({
       default: () => ({})
     },
     // 1 为his老版，2 为新版 3为his更老版本
-    versionType: { type: [Number, String], default: '2' }
+    versionType: { type: [Number, String], default: '2' },
+    // 用于获取用户信息的token
+    token: {
+      type: String,
+      default: ''
+    }
   },
   computed: {
     currentFormatItem() {
@@ -166,14 +171,17 @@ export default create({
     };
   },
   beforeCreate() {
-    Vue.use(Button).use(Dropdown).use(Menu).use(Icon);
+    Vue.use(Button)
+      .use(Dropdown)
+      .use(Menu)
+      .use(Icon);
   },
   mounted() {
     this.isInited = false;
   },
   beforeDestroy() {
     // 创建Print实例的时候会在webview中注册一个事件, 需要调用printInstance.destroy()手动清除
-    printInstance?.destroy?.()
+    printInstance?.destroy?.();
   },
   watch: {
     // 监听变化, 重新格式化printParams
@@ -409,7 +417,10 @@ export default create({
     /*  */
     getPrintParams(index = 0) {
       const params = this.printParams[index];
-      return JSON.stringify(params);
+      return JSON.stringify({
+        ...(params || {}),
+        ...(this.token ? { token: this.token } : {})
+      });
     },
     getTemplateIdByFormatId(id) {
       let find = this.formatList.find(item => item.id === id);
@@ -460,7 +471,7 @@ export default create({
         })
         .then(() => {
           if (this.versionType == 1 || this.versionType == 3) {
-            const printFn = this.versionType == 1 ? 'handleHisPrint' : 'handleOldHisPrint'
+            const printFn = this.versionType == 1 ? 'handleHisPrint' : 'handleOldHisPrint';
             if (this.strategy === 'MULTI') {
               for (let i = 0; i < this.params.length; i++) {
                 const params = this.getHisParams(i);
@@ -529,7 +540,7 @@ export default create({
       const { templateParams, hisParams, params } = this;
       const { reportid = '280' } = hisParams;
       const { id, name } = templateParams;
-      const obj = {}
+      const obj = {};
       Object.keys(params[0]).forEach(v => {
         obj[v] = [];
         params.forEach(k => {
@@ -555,7 +566,7 @@ export default create({
         .then(() => {
           if (this.versionType == 1 || this.versionType == 3) {
             const params = this.strategy === 'MULTI' ? this.getHisParams() : this.getOnceHisParams();
-            const printFn = this.versionType == 1 ? 'handleHisPrint' : 'handleOldHisPrint'
+            const printFn = this.versionType == 1 ? 'handleHisPrint' : 'handleOldHisPrint';
             printInstance[printFn](8, params)
               .then(res => {
                 console.log(res, 88888888);
@@ -565,7 +576,7 @@ export default create({
               });
           } else {
             const IS_MULTI = this.strategy === 'MULTI';
-            if(IS_MULTI){
+            if (IS_MULTI) {
               // 循环多条
               for (let i = 0; i < this.printParams.length; i++) {
                 const queryParams = {
@@ -574,26 +585,26 @@ export default create({
                   params: this.getPrintParams(i)
                 };
                 printInstance.preview(
-              queryParams,
-              res => {
-                this.callLocalServicesSuccessCb(res, 'preview');
-              },
-              this.callLocalServicesErrorCb
-            );
+                  queryParams,
+                  res => {
+                    this.callLocalServicesSuccessCb(res, 'preview');
+                  },
+                  this.callLocalServicesErrorCb
+                );
               }
             } else {
-           const queryParams = {
-              formatId: this.currentFormatId,
-              templateId: this.getTemplateIdByFormatId(this.currentFormatId),
-              params: this.getOnceParams()
-            };
-            printInstance.preview(
-              queryParams,
-              res => {
-                this.callLocalServicesSuccessCb(res, 'preview');
-              },
-              this.callLocalServicesErrorCb
-            );
+              const queryParams = {
+                formatId: this.currentFormatId,
+                templateId: this.getTemplateIdByFormatId(this.currentFormatId),
+                params: this.getOnceParams()
+              };
+              printInstance.preview(
+                queryParams,
+                res => {
+                  this.callLocalServicesSuccessCb(res, 'preview');
+                },
+                this.callLocalServicesErrorCb
+              );
             }
           }
         })
@@ -612,7 +623,7 @@ export default create({
         .then(() => {
           if (this.versionType == 1 || this.versionType == 3) {
             const params = this.strategy === 'MULTI' ? this.getHisParams() : this.getOnceHisParams();
-            const printFn = this.versionType == 1 ? 'handleHisPrint' : 'handleOldHisPrint'
+            const printFn = this.versionType == 1 ? 'handleHisPrint' : 'handleOldHisPrint';
             printInstance[printFn](9, params)
               .then(res => {
                 console.log(res, 999999);
@@ -669,12 +680,12 @@ export default create({
     /**
      * 获取 axios 自定义配置
      */
-    getCustomCofing(customCofing){
-      let cCofing = {}
+    getCustomCofing(customCofing) {
+      let cCofing = {};
       let type = typeof customCofing;
-      if(type === 'function'){
+      if (type === 'function') {
         cCofing = customCofing();
-      } else if(type === 'object'){
+      } else if (type === 'object') {
         cCofing = customCofing;
       }
       return cCofing;

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

@@ -5,10 +5,23 @@
         <!-- 行内编辑对应生成的（保存、取消）按钮 -->
         <template v-if="visibleInlineOperateBtn">
           <div class="btn-custom-wrap">
-            <a-button  v-preventReClick="preventReTime" :style="{ display: isInlineOperating ? 'inline-block' : 'none' }" @click="inlineEditClick" class="btn-custom-class" style="margin: 8px 8px 8px 0" type="primary">
+            <a-button
+              v-preventReClick="preventReTime"
+              :style="{ display: isInlineOperating ? 'inline-block' : 'none' }"
+              @click="inlineEditClick"
+              class="btn-custom-class"
+              style="margin: 8px 8px 8px 0"
+              type="primary"
+            >
               保存
             </a-button>
-            <a-button  v-preventReClick="preventReTime" :style="{ display: isInlineOperating ? 'inline-block' : 'none' }" @click="inlineEditCancel" class="btn-custom-class" style="margin: 8px 8px 8px 0">
+            <a-button
+              v-preventReClick="preventReTime"
+              :style="{ display: isInlineOperating ? 'inline-block' : 'none' }"
+              @click="inlineEditCancel"
+              class="btn-custom-class"
+              style="margin: 8px 8px 8px 0"
+            >
               取消
             </a-button>
           </div>
@@ -63,14 +76,11 @@
                 @pressEnter="outFilterChange"
                 class="input-search-com"
               >
-              <template slot="prefix" v-if="showPlaceholderPrefix">
-                <a-tooltip
-                  :title="searchPlaceHolder"
-                  overlayClassName="basesearch-placeholder-tooltip"
-                >
-                  <a-icon type="info-circle" class="search-placeholder-icon" />
-                </a-tooltip>
-              </template>
+                <template slot="prefix" v-if="showPlaceholderPrefix">
+                  <a-tooltip :title="searchPlaceHolder" overlayClassName="basesearch-placeholder-tooltip">
+                    <a-icon type="info-circle" class="search-placeholder-icon" />
+                  </a-tooltip>
+                </template>
               </a-input>
             </template>
             <a-input-search
@@ -83,11 +93,8 @@
               :value="currentValue"
               @input="$emit('input', $event.target.value)"
             >
-            <template slot="prefix" v-if="showPlaceholderPrefix">
-                <a-tooltip
-                  :title="searchPlaceHolder"
-                  overlayClassName="basesearch-placeholder-tooltip"
-                >
+              <template slot="prefix" v-if="showPlaceholderPrefix">
+                <a-tooltip :title="searchPlaceHolder" overlayClassName="basesearch-placeholder-tooltip">
                   <a-icon type="info-circle" class="search-placeholder-icon" />
                 </a-tooltip>
               </template>
@@ -201,7 +208,7 @@
                 <li ref="rowTileBtnItem" class="rowTileBtn-item 123" :key="item.sid" v-if="showLi(item)" :data-key="item.sid" data-source="rowTile">
                   <template v-if="item.type == 'ADD' || item.type == 'BATCH'">
                     <a-button
-                     v-preventReClick="preventReTime"
+                      v-preventReClick="preventReTime"
                       v-show="visibleBtn(item) && !item.isHide"
                       @click.prevent.stop="showDrawer(item, j)"
                       class="btn-custom-class"
@@ -233,7 +240,7 @@
                   </template>
                   <template v-else-if="isShowRowTileBtnItem(item)">
                     <a-button
-                     v-preventReClick="preventReTime"
+                      v-preventReClick="preventReTime"
                       v-show="visibleBtn(item) && !item.isHide"
                       @click.prevent.stop="clickBtn(clickRowData, item, clickRowData.my_index, undefined, j)"
                       class="btn-custom-class"
@@ -255,6 +262,7 @@
                 <li ref="rowTileBtnItem" class="rowTileBtn-item rowPrintBtn-btn" :key="item.sid" v-if="showLi(item)" :data-key="item.sid" data-source="rowTile">
                   <template v-if="item.isVisible && !item.isHide">
                     <PrintBtn
+                      v-bind="$attrs"
                       :printConfig="printConfig"
                       :baseUrl="printConfig.printBaseUrl"
                       :strategy="item.strategy"
@@ -418,14 +426,15 @@ const BTNOBJ = {
 export default create({
   name: 'base-search',
   mixins: [durationMixin, $utils, filterApiFn, tableSearchCon, outQuickSearchFn],
-  directives: { resize,preventReClick },
+  directives: { resize, preventReClick },
   props: {
     width: {
       default: '400px'
     },
-    searchInputWidth:{ // 设置检索框的宽度
+    searchInputWidth: {
+      // 设置检索框的宽度
       type: Number,
-      default:0
+      default: 0
     },
     onSearch: Function,
     rowBtnList: {
@@ -568,7 +577,7 @@ export default create({
     useFieldList: Array,
     editTableUid: [String, Number],
 
-    preventReTime:{
+    preventReTime: {
       type: Number,
       default: 1000
     }
@@ -742,41 +751,41 @@ export default create({
     showOutSearch() {
       return this.outSearchFieldList?.length || this.outRelationQuickSearch?.length;
     },
-    showViewList(){
-      if (this.editTableSource === "relatedComponent") {
-        return this.relatedBaseInfo.showType != "TREE";
+    showViewList() {
+      if (this.editTableSource === 'relatedComponent') {
+        return this.relatedBaseInfo.showType != 'TREE';
       }
       return !this.optionsValue('hideViewList');
     },
     optionsValue() {
       return function(key) {
         return this.$attrs.tableOptions?.[key];
-      }
+      };
     },
     searchPlaceHolder() {
-      if (!this.useFieldList?.length || this.showRelatedTreeBtn) return "请输入关键字搜索";
-      let str = "";
+      if (!this.useFieldList?.length || this.showRelatedTreeBtn) return '请输入关键字搜索';
+      let str = '';
       let strList = this.useFieldList
         ?.map(item => {
-          if (item.isSearch != 1) return "";
+          if (item.isSearch != 1) return '';
           return item.formTitle || item.alias || item.title;
         })
         .filter(Boolean);
-      if(!strList?.length) return ''
-      str = "输入" + strList.join("/");
-      return str || "请输入关键字搜索";
+      if (!strList?.length) return '';
+      str = '输入' + strList.join('/');
+      return str || '请输入关键字搜索';
     },
     showRelatedSearch() {
-      return this.showRelatedTreeBtn && this.isShowSetting('hideSearch')
+      return this.showRelatedTreeBtn && this.isShowSetting('hideSearch');
     },
     showQuickSearch() {
-      let showQuick = this.isShowSetting('hideQuickSearch')
+      let showQuick = this.isShowSetting('hideQuickSearch');
       // 平铺列表, 左侧不为tree, 而是table
-      if(this.editTableSource == 'relatedComponent' && this.relatedBaseInfo?.showType != "TREE") return showQuick
-      return showQuick && this.isRelatedSearchFold
+      if (this.editTableSource == 'relatedComponent' && this.relatedBaseInfo?.showType != 'TREE') return showQuick;
+      return showQuick && this.isRelatedSearchFold;
     },
     showBaseTabs() {
-      return  this.conditionType === 'keyword' && this.tabConditionList?.length && !this.visibleInlineOperateBtn && !this.isRowEditing
+      return this.conditionType === 'keyword' && this.tabConditionList?.length && !this.visibleInlineOperateBtn && !this.isRowEditing;
     }
   },
   data() {
@@ -1061,17 +1070,17 @@ export default create({
               'div',
               {
                 directives: [
-                    {
-                      name: 'drag-move',
-                      value: {
-                        target: 'ant-modal-confirm-body'
-                      }
+                  {
+                    name: 'drag-move',
+                    value: {
+                      target: 'ant-modal-confirm-body'
                     }
-                  ],
-                  domProps: {
-                innerHTML: settingObj.tipsMsg || `是否确认${btn.name}`
+                  }
+                ],
+                domProps: {
+                  innerHTML: settingObj.tipsMsg || `是否确认${btn.name}`
+                }
               }
-              },
               // settingObj.tipsMsg || `是否确认${btn.name}`
             ),
             okText: '确定',
@@ -1155,7 +1164,7 @@ export default create({
       let paramsData = utils.setParamsValue(params, this.paramsData);
       Object.assign(btn, {
         _index_: j
-      })
+      });
       let btnData = {
         btnData: Object.assign(setData, {
           paramsData: paramsData,
@@ -1217,8 +1226,8 @@ export default create({
         return;
       }
       Object.assign(item, {
-        _index_: j,
-      })
+        _index_: j
+      });
       this.$emit('clickBtn', data, item, index);
     },
     clickGroupBtn(btn, j) {
@@ -1584,7 +1593,7 @@ export default create({
       this.$emit('pubResetCheckStatus');
     },
     handleReset() {
-      this.$emit('handleReset',{targetType: "outQuickSearchReset" });
+      this.$emit('handleReset', { targetType: 'outQuickSearchReset' });
     },
     handleUploadChange(info) {
       const { file, fileList } = info;
@@ -1672,7 +1681,7 @@ export default create({
     initOutSearchFieldList(config = {}) {
       this.outSearchFieldList = [];
       this.outRelationQuickSearch = [];
-      let mySearchFieldList = JSON.parse(JSON.stringify(this.searchFieldList)).filter(i => (i.random_key = this.getFiledRandom_key(i), i.isShowSearch == 1 && i.filterExplicit == 1));
+      let mySearchFieldList = JSON.parse(JSON.stringify(this.searchFieldList)).filter(i => ((i.random_key = this.getFiledRandom_key(i)), i.isShowSearch == 1 && i.filterExplicit == 1));
       this.outSearchFieldList = mySearchFieldList;
       // 跨表
       let outRelationQuickSearch = this.relationTableList.map(item => {
@@ -1704,10 +1713,10 @@ export default create({
       }
 
       // 如有配置默认值
-      if(this.outSearchFieldList.some(v => !!v.explicitDefaultVal)){
+      if (this.outSearchFieldList.some(v => !!v.explicitDefaultVal)) {
         this.$emit('outSearchInit');
-        if('reset' != config?.type){
-          this.outFilterChange({type:'outSearchInit'});
+        if ('reset' != config?.type) {
+          this.outFilterChange({ type: 'outSearchInit' });
         }
       }
     },
@@ -1745,7 +1754,7 @@ export default create({
         this.rowFoldHideBtnList = hideBtn;
       }
     },
-    outFilterChange(config= {}) {
+    outFilterChange(config = {}) {
       let conObj = this.getConObjParams() || [];
       this.onSave(conObj, true, config);
     },
@@ -1856,7 +1865,7 @@ export default create({
           };
         });
         let len = list?.length || 0;
-        if(len > 0){
+        if (len > 0) {
           this.setPrintNumberCache({
             ids,
             list
@@ -1957,35 +1966,32 @@ export default create({
         onOk: () => {
           _this.setBatchSaveRowStatus(true);
         },
-        onCancel() {
-        }
+        onCancel() {}
       });
     },
 
     /**
      * 获取外显检索的默认值设置
      */
-    handleGetOutSearchInitValue(){
-
-      if(this.outSearchFieldList.some(v => !!v.explicitDefaultVal)){
+    handleGetOutSearchInitValue() {
+      if (this.outSearchFieldList.some(v => !!v.explicitDefaultVal)) {
         let conObj = this.getConObjParams() || [];
-        return conObj
-        }
+        return conObj;
+      }
 
-      return []
+      return [];
     },
 
-    getFiledRandom_key(el){
+    getFiledRandom_key(el) {
       // 初始化
-       const showSetting = el?.settingObj?.showSetting || [];
-       let f = !this.$utils.isEmpty(el?.settingObj?.wordbook);
-       if(!showSetting?.length && f){
-         return Math.random().toString()
-       }
-       return '11'
+      const showSetting = el?.settingObj?.showSetting || [];
+      let f = !this.$utils.isEmpty(el?.settingObj?.wordbook);
+      if (!showSetting?.length && f) {
+        return Math.random().toString();
+      }
+      return '11';
     },
 
-
     inlineEditCancel() {
       this.setBatchCancelRowStatus(true);
     },
@@ -2039,10 +2045,10 @@ export default create({
           this.currentTempId = curItem || '0';
 
           // 按钮打卡视图列表
-          let tableViewId= this.optionsValue('tableViewId')
-          let onlyOpenView = this.optionsValue('hideViewList') && tableViewId
-          if(onlyOpenView) {
-            this.currentTempId = tableViewId
+          let tableViewId = this.optionsValue('tableViewId');
+          let onlyOpenView = this.optionsValue('hideViewList') && tableViewId;
+          if (onlyOpenView) {
+            this.currentTempId = tableViewId;
           }
           // this.handlerSelectTemp(this.currentTempId);
           this.$emit('handlerChangeView', this.currentTempId);
@@ -2117,12 +2123,12 @@ export default create({
         this.$nextTick(() => {
           this.showPlaceholderPrefix = false;
           let dom = this.$refs.baseSearchPlaceholderSpan;
-          if(!dom) return;
+          if (!dom) return;
           // input 框有padding 32px  ...显示需要多预留一些宽度12px
           let w = dom.offsetWidth + 45;
           // 非筛选外显input 有enterButton 预留宽度
-          if(!this.showOutSearch) {
-            w += 45
+          if (!this.showOutSearch) {
+            w += 45;
           }
           let maxW = 300;
           this.inputSearchW = w > maxW ? maxW : w < 200 ? 200 : w;