cnhis-design-vue 2.1.83 → 2.1.84

package/package.json

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

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

@@ -3184,10 +3184,10 @@ export default create({
     },
 
     resizableChange({column }) {
-      let { property } =column || {}
-      if (property == "operatorColumn") {
+      // let { property } =column || {}
+      // if (property == "operatorColumn") {
         this.broadcastEvent('operatorColumn-resize');
-      }
+      // }
     },
 
     onResize(){

package/packages/big-table/src/components/AutoLayoutButton.vue

@@ -45,7 +45,7 @@ export default {
       return function(item, key = 'name') {
         return item.alias || item[key];
       };
-    },
+    }
     // showBtnList() {
     //   if (!Array.isArray(this.btnList)) return [];
     //   let res = this.btnList
@@ -69,9 +69,9 @@ export default {
   render() {
     const row = this.row;
     const index = this.index;
-    if(window._talbe_row_btn_debugger){
-      console.log(this.btnList,'----------------btnList')
-      console.log(this.hideList,'----------------hideList')
+    if (window._talbe_row_btn_debugger) {
+      console.log(this.btnList, '----------------btnList');
+      console.log(this.hideList, '----------------hideList');
     }
     return (
       <div class="c_auto-layout-wrap" ref="layoutWrap">
@@ -87,8 +87,12 @@ export default {
     );
   },
   watch: {
-    btnList:{
-      handler(){
+    btnList: {
+      handler(val) {
+        if(this.compareArrays(val,this.cacheBtnList || [])){
+          return
+        }
+        this.cacheBtnList = val;
         this.reset();
         this.onResize();
       }
@@ -98,6 +102,7 @@ export default {
   created() {
     this.debouncePageResize = utils.debounce(this.handlePageResize, 300);
     this.attachEvent();
+    this.cacheBtnList = []
   },
   beforeMount() {},
   mounted() {
@@ -113,9 +118,14 @@ export default {
       let icon;
       if (btn.icon) {
         if (this.btnIcons[btn.icon]) {
-          icon = <a-icon type={this.btnIcons[btn.icon]} style={{
-                  marginRight: mr
-                }} />;
+          icon = (
+            <a-icon
+              type={this.btnIcons[btn.icon]}
+              style={{
+                marginRight: mr
+              }}
+            />
+          );
         } else {
           icon = (
             <a-tooltip title={this.handleName(btn)}>
@@ -185,72 +195,72 @@ export default {
               return b ? (
                 <a-menu-item key={b.sid + j} class="c_dropdown-btn" on-click={e => this.clickBtn(row, b, index, e.domEvent, j)}>
                   {this.getBtnIcon(b)}
-                   {b.showStyle === 'only_icon' ? '' : this.handleName(b)}
+                  {b.showStyle === 'only_icon' ? '' : this.handleName(b)}
                 </a-menu-item>
-              ): null;
+              ) : null;
             })}
           </a-menu>
         </a-dropdown>
       );
     },
 
-   async onResize() {
+    async onResize() {
       // utils.debounce(this.handlePageResize(), 300);
-        this.$nextTick(()=>{
-          this.debouncePageResize();
-        });
+      this.$nextTick(() => {
+        this.debouncePageResize();
+      });
     },
 
     handlePageResize() {
-        if(window._talbe_row_btn_debugger){
-          console.log(this.btnList,'----------------handlePageResize')
+      if (window._talbe_row_btn_debugger) {
+        console.log(this.btnList, '----------------handlePageResize');
+      }
+      const layoutWrap = this.$refs.layoutWrap;
+      if (!layoutWrap) return;
+      let wrapWidth = layoutWrap.clientWidth;
+      let btnTotalWidth = 0;
+      let showBtnListWidth = 0;
+      let hideIndex = -1;
+      let len = this?.btnList?.length || 0;
+      let last = len - 1 > 0 ? len - 1 : 0;
+      this.btnList.forEach((btn, i) => {
+        // 记录宽度
+        let btnDom = this.$refs[`rowBtnItem${btn.sid}`];
+        if (btnDom && !this.btnShowWidthObj[btn.id]) {
+          this.btnShowWidthObj[btn.id] = btnDom?.$el?.offsetWidth || 0;
+          btn.btnClientWidth = btnDom?.$el?.offsetWidth || 0;
+        }
+        if (hideIndex > 0) {
+          btn.showType = '_hide';
+          return;
+        }
+        // 最后一个不用加
+        let mg = last == i ? 0 : 10;
+        btnTotalWidth += (this.btnShowWidthObj[btn.id] || 0) + mg;
+        if (btnTotalWidth < wrapWidth) {
+          btn.showType = '_show';
+          showBtnListWidth = btnTotalWidth;
+        } else {
+          btn.showType = '_hide';
+          hideIndex = i;
         }
-        const layoutWrap = this.$refs.layoutWrap;
-        if(!layoutWrap) return;
-        let wrapWidth = layoutWrap.clientWidth;
-        let btnTotalWidth = 0;
-        let showBtnListWidth = 0;
-        let hideIndex = -1;
-        let len = this?.btnList?.length || 0;
-        let last = len -1 > 0 ? len -1 : 0;
-        this.btnList.forEach((btn, i) => {
-          // 记录宽度
-          let btnDom = this.$refs[`rowBtnItem${btn.sid}`];
-          if (btnDom && !this.btnShowWidthObj[btn.id]) {
-            this.btnShowWidthObj[btn.id] =  btnDom?.$el?.offsetWidth || 0;
-            btn.btnClientWidth = btnDom?.$el?.offsetWidth || 0;
-          }
-          if (hideIndex > 0) {
-            btn.showType = '_hide';
-            return;
-          }
-          // 最后一个不用加
-          let mg = last == i ? 0: 10;
-          btnTotalWidth += (this.btnShowWidthObj[btn.id] || 0) + mg;
-          if (btnTotalWidth < (wrapWidth)) {
-            btn.showType = '_show';
-            showBtnListWidth = btnTotalWidth
-          } else {
-            btn.showType = '_hide';
-            hideIndex = i;
-          }
-        });
-        this.hideList = [];
-        this.showList = [];
-        this.btnList.forEach(btn => {
-          if (btn.showType === '_hide') {
-            this.hideList.push(btn);
-          } else {
-            this.showList.push(btn);
-          }
-        });
-        // 边界处理
-        // 如果有 hideList 有数据
-        // 展示的按钮宽度和加上“更多按钮”的宽度大于容器的宽度，showList 最后一个按钮移动到 hideList
-        if(this.hideList.length > 0 && (showBtnListWidth + 15 + 10 > wrapWidth)){
-            let t = this.showList.pop();
-            t && this.hideList.unshift(t);
+      });
+      this.hideList = [];
+      this.showList = [];
+      this.btnList.forEach(btn => {
+        if (btn.showType === '_hide') {
+          this.hideList.push(btn);
+        } else {
+          this.showList.push(btn);
         }
+      });
+      // 边界处理
+      // 如果有 hideList 有数据
+      // 展示的按钮宽度和加上“更多按钮”的宽度大于容器的宽度，showList 最后一个按钮移动到 hideList
+      if (this.hideList.length > 0 && showBtnListWidth + 15 + 10 > wrapWidth) {
+        let t = this.showList.pop();
+        t && this.hideList.unshift(t);
+      }
     },
 
     clickBtn(row, btn, index, e, j) {
@@ -265,10 +275,23 @@ export default {
       // });
     },
 
-    reset(){
+    reset() {
       // 重置
       this.hideList = [];
       this.showList = [];
+    },
+    compareArrays(arr1, arr2) {
+      if (arr1.length !== arr2.length) {
+        return false;
+      }
+
+      for (var i = 0; i < arr1.length; i++) {
+        if (arr1[i].id !== arr2[i].id || arr1[i].updatedTime !== arr2[i].updatedTime) {
+          return false;
+        }
+      }
+
+      return true;
     }
   },
   components: {
@@ -301,7 +324,7 @@ export default {
     margin-left: 10px;
   }
 }
-.ant-dropdown-menu-item.c_dropdown-btn{
+.ant-dropdown-menu-item.c_dropdown-btn {
   justify-content: flex-start;
 }
 </style>

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

@@ -379,22 +379,19 @@ export default create({
         });
     },
     formatDefaultVal(i, tableVal) {
-      let val = i.defaultValue || '';
+      const formatMap = {
+        DATE: 'YYYY-MM-DD',
+        DATETIME: 'YYYY-MM-DD HH:mm:ss'
+      };
       let tVal = tableVal;
-      if (i.type === 'NUMBER') {
-        tVal = Number(tableVal) || 0;
-      }
-      if (i.type === 'DATE') {
-        tVal = tableVal ? moment(tableVal).format('YYYY-MM-DD') : '';
-      }
-      if (i.type === 'DATETIME') {
-        tVal = tableVal ? moment(tableVal).format('YYYY-MM-DD HH:mm:ss') : '';
+      if (Object.keys(formatMap).includes(i.type) && tableVal) {
+        tVal = moment(tableVal).format(formatMap[i.type]);
       }
       if (i.type === 'TEXT') {
         tVal = String(tableVal) || '';
       }
 
-      return val ? val : tVal;
+      return i?.defaultValue || tVal || '';
     },
     formatParams({ customizeDataset = [], param = [] }, params = []) {
       return params.map(paramObj => {