cnhis-design-vue 2.1.51 → 2.1.53

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cnhis-design-vue",
-  "version": "2.1.51",
+  "version": "2.1.53",
   "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'
       }"
+      :row-config="{ isCurrent: true }"
       v-bind="tableAttrs"
     >
       <template v-slot:empty>
@@ -2278,6 +2279,10 @@ export default create({
     },
     // 行双击
     rowdblclick({ row, column }) {
+      // 2022/12/12 方晶晶要求 列表相关项在底部展示时, 去除双击事件, 只触发单击事件
+      if (this.aboutPositionBtm) {
+        return false;
+      }
       if (this.isScanMultiTable || this.isInlineOperating) return false;
       if (vexutils.has(row, GROUP_TITLE_KEY)) return false;
       this.$emit('setNestTableClick', this.isNestTable);
@@ -2292,7 +2297,7 @@ export default create({
       // 嵌套表与主表click切换时需要清除上次的选中
       this.isAboutNestTable && this.$emit('resetNestLastClickTable', table);
 
-      let { row, $event = {}, rowIndex, source } = data;
+      let { row, $event = {}, rowIndex, source, column } = data;
       // 点击主表格展开行按钮 不需要触发选中行
       let { className } = $event.target || {};
       if (className && vexutils.isString(className) && className.includes('vxe-table--expand-btn')) return;
@@ -2319,7 +2324,7 @@ export default create({
         const value = this.getRowClassName({ row }) == 'single--checked' ? [] : [row];
         this.$set(this, 'checkedRows', value);
         this.pubCheckChange(value);
-        this.$emit('handlerClickRow', row, rowIndex, {source});
+        this.$emit('handlerClickRow', row, rowIndex, {source, column});
         return;
       }
       this.visibleCheckAllWrap = false;
@@ -2368,7 +2373,8 @@ export default create({
           }
           this.updateAddCheckedRows(rowVal, true);
           // 需要选中行
-          this.$emit('handlerClickRow', rowVal, rowIndex, {source});
+          this.$emit('handlerClickRow', rowVal, rowIndex, {source, column});
+          this.setTableCurrentRow(table, row)
           return;
         }
         let newTheUniqueKeyArr = [];
@@ -2380,41 +2386,59 @@ export default create({
           rowLen = checkedRow.filter(item => !vexutils.has(item, GROUP_TITLE_KEY)).length;
         }
       }
-      table.setAllCheckboxRow(false);
+
+      // 相关项位于底部，再次点击已选中数据不取消勾选
+      let btmNotClear  = rowLen < 2 && checked
+      !btmNotClear && table.setAllCheckboxRow(false);
       // 全选后/数据大于一条 单击行只剩这一行 取消其他
       // 只有一条选中 单击行 取消选中
       let setChecked = checked;
       if (rowLen > 1) {
         this.selectType != 'radio' && table.setCheckboxRow([row], true);
         this.isTree != 0 && this.selectType != 'radio' && this.pubCheckChange(newRow);
-        this.selectType != 'radio' && this.$emit('handlerClickRow', row, rowIndex, {source});
+        this.selectType != 'radio' && this.$emit('handlerClickRow', row, rowIndex, {source, column});
       } else {
         setChecked = !setChecked;
         if (!setChecked) {
-          table.clearCurrentRow();
+          !this.aboutPositionBtm && table.clearCurrentRow();
           this.selectType == 'radio' && table.clearRadioRow();
           this.isTree != 0 && this.selectType != 'radio' && this.pubCheckChange([]);
         } else {
           this.selectType == 'radio' && table.setRadioRow(row);
           this.isTree != 0 && this.selectType != 'radio' && this.pubCheckChange(newRow);
         }
-        this.selectType != 'radio' && table.setCheckboxRow([row], setChecked);
+        // 相关项位于底部，再次点击已选中数据不取消勾选
+        let isBtmCheck = this.aboutPositionBtm && !setChecked
+        if (this.selectType != 'radio' && !isBtmCheck) {
+          table.setCheckboxRow([row], setChecked);
+        }
       }
       if (this.isTree != 0) {
-        setChecked && this.$emit('handlerClickRow', row, rowIndex, {source});
+        setChecked && this.$emit('handlerClickRow', row, rowIndex, {source, column});
+        this.setTableCurrentRow(table, row)
         return;
       }
 
       this.setCheckedMehod(setChecked, row);
-      if (setChecked || rowLen > 1 || !rowLen) {
-        this.$set(this, 'checkedRows', [row]);
-      }
-      if (!setChecked && rowLen === 1) {
-        this.$set(this, 'checkedRows', []);
-      }
+
+      // 选中row
+      let curCheckedRow = table.getCheckboxRecords();
+      this.$set(this, 'checkedRows', curCheckedRow);
+
       this.setCurrentCheckedLength();
       this.lastPageIndex = this.pageVO.pageIndex;
       setChecked && this.$emit('handlerClickRow', row, rowIndex, {source});
+      this.setTableCurrentRow(table, row)
+    },
+    setBtmDbClick(row){
+      if(!row) return;
+      let id = row[this.handleRowId]
+      if(!id) return;
+      let table = this.$refs.xGrid;
+      if (!table) return;
+      let curRow = table?.getRowById(id);
+      if(!curRow) return
+      this.handlerClickRow({row: curRow})
     },
     /**
      * 单选行数据 树结构 扁平化处理
@@ -2465,6 +2489,11 @@ export default create({
         return;
       }
       if (this.currentCheckedKeys.includes(row[this.primaryKey])) {
+        // 关项位于底部，再次点击已选中数据不取消勾选，批量及行级按钮要显示 且 重新加载该数据相关项
+        if(this.aboutPositionBtm) {
+          this.$emit('preRowdblclick', row, {}, true, true)
+          return;
+        }
         this.removeCheckedRows([row]);
         return;
       }
@@ -2549,11 +2578,22 @@ export default create({
       this.pubCheckChange(records);
       return true;
     },
+    setTableCurrentRow(table, row) {
+      if(!this.aboutPositionBtm) return
+      setTimeout(() => {
+        table.setCurrentRow(row);
+      }, 30)
+    },
     selectionChange({ checked, row, records }) {
       // HACK: 防止点击多选框时，触发cell-click(行选中)事件
       // $event.stopPropagation、$event.preventDefault，点击多选框列的空白处触发多选事件，无法阻止事件冒泡触发cell-click事件
       let table = this.$refs.xGrid;
-      table.clearCurrentRow();
+
+      // 相关项在底部，只选中一条的情况下，复选框不让去掉
+      if (this.aboutPositionBtm && this.checkedRows?.length === 1 && !checked) {
+        return false;
+      }
+
       this.isTriggerSelectionChange = true;
       setTimeout(() => {
         this.isTriggerSelectionChange = false;
@@ -2562,8 +2602,10 @@ export default create({
       if (this.treeTableSelectionChange(records)) return;
 
       if (checked) {
+        this.setTableCurrentRow(table, row)
         this.addCheckedRows([row]);
       } else {
+        table.clearCurrentRow();
         this.removeCheckedRows([row], true);
       }
 
@@ -2614,7 +2656,7 @@ export default create({
       this.$emit('selectionChangeAll');
     },
     handleCancelAllCheck() {
-      this.$emit('selectionChangeAllCancel');
+      this.$emit('selectionChangeAllCancel', {type: 'cancelAll'});
     },
     setCurrentCheckedLength() {
       let table = this.$refs.xGrid;
@@ -2692,7 +2734,7 @@ export default create({
       let isCheckedByCheckboxRow = vxeTable.isCheckedByCheckboxRow(row);
       // 不冒泡 手动触发方法
       if (!isCheckedByCheckboxRow) {
-        this.handlerClickRow({row, rowIndex: index, source:'linkDetail'})
+        this.handlerClickRow({row, rowIndex: index, source:'linkDetail', column: col})
       }
       e.stopPropagation();
       vxeTable.setCurrentRow(row);

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

@@ -73,11 +73,13 @@ const bigTableProps = {
   isMatchComponent: { type: Boolean, default: true }, // 为了兼容低代码(组件内部)与二次开发平台(vuex)
   asyncCount: Boolean,
   showSettings: { type: Object, default: () => ({}) },
-  filterDomPortal: { // 表头筛选挂载的地方
+  filterDomPortal: {
+    // 表头筛选挂载的地方
     type: String,
-    default: "body"
+    default: 'body'
   },
-  filterTopOffset: { // 表头 top 调节
+  filterTopOffset: {
+    // 表头 top 调节
     type: Number,
     default: 0
   },
@@ -85,15 +87,17 @@ const bigTableProps = {
   defaultEditAllRow: Boolean,
   editTableUid: [String, Number],
   curBatchBtnData: { type: Object, default: () => ({}) },
-  rowBtnAutoLayout:{// 行内按钮自适应布局
+  rowBtnAutoLayout: {
+    // 行内按钮自适应布局
     type: Boolean,
     default: true
   },
-  listCountParams:{ type: Object, default: () => ({}) },
-  tableProps:{
+  listCountParams: { type: Object, default: () => ({}) },
+  tableProps: {
     type: Object,
-    default:()=>({})
-  }
+    default: () => ({})
+  },
+  aboutPositionBtm: { type: Boolean, default: true }
 };
 
 export default bigTableProps;

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

@@ -148,16 +148,16 @@ export default create({
       default: '0'
     },
     // 没有模板提示
-    noformatTips:{
+    noformatTips: {
       type: String,
       default: ''
     },
 
-    getOnceParamsAfter:{
+    getOnceParamsAfter: {
       type: Function
     },
 
-    getPrintParamsAfter:{
+    getPrintParamsAfter: {
       type: Function
     }
   },
@@ -170,8 +170,14 @@ export default create({
     formatTitle() {
       return this.currentFormatItem?.name || '格式选择';
     },
-    printExtraParams(){
-    return  this?.printConfig?.printExtraParams || {};
+    printExtraParams() {
+      return this?.printConfig?.printExtraParams || {};
+    },
+    queryParams() {
+      return {
+        formatId: this.currentFormatId,
+        templateId: this.getTemplateIdByFormatId(this.currentFormatId)
+      };
     }
   },
   data() {
@@ -278,7 +284,7 @@ export default create({
       this.currentFormatId = this.getDefaultFormatId(this.formatList, 'defaultFlag');
 
       if (!this.currentFormatId) {
-        this.$message.error(this.noformatTips ||'获取打印格式失败，请联系管理员！');
+        this.$message.error(this.noformatTips || '获取打印格式失败，请联系管理员！');
         return this.requestError();
       }
       if (!this.currentFormatId) {
@@ -384,8 +390,8 @@ export default create({
       if (i.type === 'DATETIME') {
         tVal = tableVal ? moment(tableVal).format('YYYY-MM-DD HH:mm:ss') : '';
       }
-      if(i.type === 'TEXT'){
-        tVal = String(tableVal) || ''
+      if (i.type === 'TEXT') {
+        tVal = String(tableVal) || '';
       }
 
       return val ? val : tVal;
@@ -446,8 +452,8 @@ export default create({
         ...(params || {}),
         ...(this.token ? { token: this.token } : {}),
         ...extraParams
-      }
-      if(typeof this.getPrintParamsAfter === 'function'){
+      };
+      if (typeof this.getPrintParamsAfter === 'function') {
         let t = this.getPrintParamsAfter(res);
         return t || res;
       }
@@ -461,7 +467,7 @@ export default create({
       // 聚合一条
       let params = {};
       let obj = {};
-      let cur = this.printParams?.[0] || {}
+      let cur = this.printParams?.[0] || {};
       if (this.templateParams?.customizeDataset?.length) {
         // 有模板数据
         const key = Object.keys(cur?.datasetData || {})?.[0] || '';
@@ -481,8 +487,8 @@ export default create({
         });
       }
       params = Object.assign({}, JSON.parse(this.getPrintParams(0)), obj);
-      if(typeof this.getOnceParamsAfter === 'function'){
-        let res = this.getOnceParamsAfter(params,obj);
+      if (typeof this.getOnceParamsAfter === 'function') {
+        let res = this.getOnceParamsAfter(params, obj);
         return res || params;
       }
       return JSON.stringify(params);
@@ -530,27 +536,30 @@ export default create({
                 });
             }
           } else {
+            const queryParams = {
+              ...this.queryParams,
+              printdlgshow: this.printdlgshow
+            };
             if (this.strategy === 'MULTI') {
               // 循环多条
               for (let i = 0; i < this.printParams.length; i++) {
-                const queryParams = {
-                  formatId: this.currentFormatId,
-                  templateId: this.getTemplateIdByFormatId(this.currentFormatId),
-                  params: this.getPrintParams(i),
-                  printdlgshow: this.printdlgshow
-                };
-                printInstance.printDirect(queryParams, callLocalServicesSuccessCb, this.callLocalServicesErrorCb);
+                if (i > 0) queryParams.printdlgshow = '0';
+                printInstance.printDirect(
+                  {
+                    ...queryParams,
+                    params: this.getPrintParams(i)
+                  },
+                  callLocalServicesSuccessCb,
+                  this.callLocalServicesErrorCb
+                );
               }
             } else {
               // 聚合一条
-              const queryParams = {
-                formatId: this.currentFormatId,
-                templateId: this.getTemplateIdByFormatId(this.currentFormatId),
-                params: this.getOnceParams(),
-                printdlgshow: this.printdlgshow
-              };
               printInstance.printDirect(
-                queryParams,
+                {
+                  ...queryParams,
+                  params: this.getOnceParams()
+                },
                 res => {
                   this.callLocalServicesSuccessCb(res, 'print');
                 },
@@ -614,36 +623,17 @@ export default create({
               });
           } else {
             const IS_MULTI = this.strategy === 'MULTI';
-            if (IS_MULTI) {
-              // 循环多条
-              for (let i = 0; i < this.printParams.length; i++) {
-                const queryParams = {
-                  formatId: this.currentFormatId,
-                  templateId: this.getTemplateIdByFormatId(this.currentFormatId),
-                  params: this.getPrintParams(i)
-                };
-                printInstance.preview(
-                  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
-              );
-            }
+
+            printInstance.preview(
+              {
+                ...this.queryParams,
+                params: IS_MULTI ? this.getPrintParams() : this.getOnceParams()
+              },
+              res => {
+                this.callLocalServicesSuccessCb(res, 'preview');
+              },
+              this.callLocalServicesErrorCb
+            );
           }
         })
         .finally(() => {
@@ -681,8 +671,7 @@ export default create({
       this.identityVerification.visible = false;
 
       const queryParams = {
-        formatId: this.currentFormatId,
-        templateId: this.getTemplateIdByFormatId(this.currentFormatId),
+        ...this.queryParams,
         params: this.getPrintParams(),
         token
       };

package/packages/date-picker/index.js

@@ -4,9 +4,11 @@ import DatePicker from './src/DatePicker';
 import MonthPicker from './src/MonthPicker';
 import RangePicker from './src/RangePicker';
 import WeekPicker from './src/WeekPicker';
+import { rewriteAntd } from './src/utils';
 
 // 为组件提供 install 安装方法，供按需引入
 DatePicker.install = function(Vue) {
+  rewriteAntd();
   Vue.use(Base);
   Vue.component(DatePicker.name, DatePicker);
   Vue.component(MonthPicker.name, MonthPicker);