cnhis-design-vue 0.2.34-beta → 0.2.35-beta

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cnhis-design-vue",
-  "version": "0.2.34-beta",
+  "version": "0.2.35-beta",
   "description": "基于 Ant Desgin Vue 的UI库",
   "keyword": "cnhis-design-vue vue cnhis",
   "homepage": "http://dv.cnhis.com/",

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

@@ -1237,16 +1237,16 @@ export default create({
       vxeTable.remove(tableData[0]);
     },
     submitInlineForm() {
-      let { error } = this.$store.state.inlineEdit;
+      let error = this.inlineError;
       if (error) {
         this.resetEditRowStatus();
         this.$emit('triggerSpinning', false);
         return false;
       }
 
-      let { formData, listFormUnionSetting, originalTableRow } = this.$store.state.inlineEdit;
+      let { inlineFormData, listFormUnionSetting, inlineOriginalTableRow } = this;
       let { formId } = listFormUnionSetting;
-      let { id } = originalTableRow;
+      let { id } = inlineOriginalTableRow;
       if (!formId) {
         console.log('缺少formId');
         this.$emit('triggerSpinning', false);
@@ -1255,7 +1255,7 @@ export default create({
       if (this.isSaveForm) return false;
       this.isSaveForm = true;
 
-      let params = Object.assign({}, formData, {
+      let params = Object.assign({}, inlineFormData, {
         formId,
         id,
         editMode: 'row'

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

@@ -442,7 +442,7 @@ export default {
         this.$emit('triggerSpinning', false);
         return;
       }
-      let { listFormUnionSetting } = this.$store.state.inlineEdit;
+      let { listFormUnionSetting } = this
       let { formId } = listFormUnionSetting;
       let params = this.handleSubmitParams(this.batchFormData);
       if (!formId || !params) {
@@ -484,7 +484,7 @@ export default {
         let obj = batchFormData[key];
         if (matchItem) {
           obj = Object.assign({}, obj, {
-            id: matchItem.id
+            [this.primaryKey]: matchItem[this.primaryKey]
           });
         }
         arr.push(obj);

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

@@ -67,6 +67,7 @@ const bigTableProps = {
   isInlineAdding: Boolean,
   isInlineSave: Boolean,
   isInlineCancel: Boolean,
+  inlineError: Boolean,
   resetInlineEdit: Function, // 重置状态（不包含编辑、新增状态)
   resetEditRowStatus: Function, // 重置编辑行保存表单相关状态
   pageIndexOldtableData: {
@@ -77,7 +78,9 @@ const bigTableProps = {
   submitForm: Function,
   isMatchComponent: Boolean,
   asyncCount: Boolean,
-  showSettings: { type: Object, default: () => ({}) }
+  showSettings: { type: Object, default: () => ({}) },
+  inlineFormData: { type: Object, default: () => ({}) },
+  inlineOriginalTableRow: { type: Object, default: () => ({}) }
 };
 
 export default bigTableProps;

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

@@ -512,7 +512,7 @@ export default create({
       const { id, name } = templateParams;
       return {
         reportid,
-        formatid: id,
+        formatid: this.currentFormatId || id,
         formatname: name,
         param: params[index]
       };
@@ -531,7 +531,7 @@ export default create({
       });
       return {
         reportid,
-        formatid: id,
+        formatid: this.currentFormatId || id,
         formatname: name,
         param: obj
       };

package/packages/multi-chat/setting/index.vue

@@ -151,6 +151,9 @@ export default {
   },
   mounted() {
     this.getSdkAppId();
+    
+    const item = this.menuList.find( v=> v.active);
+    item && this.handleMenuClick(item.type);
   },
   watch: {
     useMenuList(v) {
@@ -185,6 +188,7 @@ export default {
         });
     },
     handleMenuClick(type) {
+      console.log("触发tab切换");
       this.menuList.map(item => {
         item.active = item.type === type;
       });

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

@@ -2094,14 +2094,12 @@ export default create({
           if(!dom) return;
           // input 框有padding 32px  ...显示需要多预留一些宽度12px
           let w = dom.offsetWidth + 45;
-          console.log(w, "wwww");
           let maxW = this.showOutSearch ? 284 : 244;
           this.inputSearchW = w > maxW ? 300 : w < 200 ? 200 : w;
           if (w > maxW) {
             this.showPlaceholderPrefix = true;
           }
           this.onResize();
-          console.log(this.inputSearchW);
         });
       }
     }