cnhis-design-vue 0.2.32-beta → 0.2.36-beta

package/package.json

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

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

@@ -1041,12 +1041,14 @@ export default create({
     checkListFormUnionSettingParamsList() {
       if (!this.listFormUnionSetting?.paramsList?.length) {
         this.$message.warning('可编辑行需要设置关联表单字段，设置后请重试！');
+        this.$emit('resetInlineEditAll', false);
         this.$emit('triggerSpinning', false);
         return false;
       }
       let find = this.fieldListOriginal?.find(item => item.isEdit == 1);
       if (!find) {
         this.$message.warning('没有设置可编辑字段，请联系管理员');
+        this.$emit('resetInlineEditAll', false);
         this.$emit('triggerSpinning', false);
         return false;
       }
@@ -1235,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);
@@ -1253,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'
@@ -2980,7 +2982,7 @@ export default create({
         let rowItemWrap = [...wrap.querySelectorAll('.vxe-cell')];
         rowItemWrap.push(...[...wrap.querySelectorAll('.vxe-body--column')]);
         rowItemWrap.forEach(dom => {
-          dom.style.height = height;
+          dom.style.setProperty('height', height, 'important');
           dom.style.lineHeight = lineHeight;
           if (height) {
             dom.style.backgroundColor = '#EFF5FF';

package/packages/big-table/src/components/edit-form/EditForm.vue

@@ -441,6 +441,13 @@ export default {
 </script>
 <style lang="less" scoped>
 .editForm-page {
+  height: 100%;
+  width: 100%;
+  display: flex;
+  align-items: center;
+  .ant-form {
+    width: 100%;
+  }
   /deep/.has-error .ant-input-group-addon {
     color: rgba(0, 0, 0, 0.65);
   }

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/scale-view/scaleView.vue

@@ -534,7 +534,6 @@ export default create({
       immediate: true,
       deep: true,
       handler(newVal, oldVal) {
-        console.log(this.params, "---params");
         if (oldVal) {
           if (newVal.guage_id) {
             if (newVal.guage_id != oldVal.guage_id) {
@@ -666,8 +665,6 @@ export default create({
       this.handleEvaluateParams(this.config.evaluateResultSetting);
       this.handleShowEvaluate();
 
-      console.log(this.config.evaluateResultSetting);
-
       this.defaultFormArray = JSON.parse(JSON.stringify(list));
       let filterArr = this.filterArr;
       list = list.filter(v => !filterArr.includes(v.type));
@@ -865,10 +862,20 @@ export default create({
             if (urlKey) {
               let list = urlKey.split(",");
               if (list.length > 1) {
-                defValue = list.map(l => decodeURIComponent(this.getQueryVariable(l)));
+                let val = list
+                  .map(l => {
+                    let tempV = this.getQueryVariable(l);
+                    if (tempV) return decodeURIComponent(tempV);
+                    return null;
+                  })
+                  .filter(Boolean);
+                val.length && (defValue = val);
               } else {
-                let val = decodeURIComponent(this.getQueryVariable(list[0]));
-                defValue = item.type == "CHECKBOX_BLOCK" ? val.split() : val;
+                let val = this.getQueryVariable(list[0]);
+                if (val) {
+                  val = decodeURIComponent(val);
+                  defValue = item.type == "CHECKBOX_BLOCK" ? val.split() : val;
+                }
               }
             }
           }

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

@@ -2,7 +2,16 @@
   <div class="base-search">
     <div class="base-container">
       <div class="bease-left" ref="baseLeft" v-resize="onResize">
-        <ul>
+        <!-- 行内编辑对应生成的（保存、取消）按钮 -->
+        <template v-if="visibleInlineOperateBtn">
+          <a-button :style="{ display: isInlineOperating ? 'inline-block' : 'none' }" @click="inlineEditClick" class="btn-custom-class" style="margin: 8px 8px 8px 0" type="primary">
+            保存
+          </a-button>
+          <a-button :style="{ display: isInlineOperating ? 'inline-block' : 'none' }" @click="inlineEditCancel" class="btn-custom-class" style="margin: 8px 8px 8px 0">
+            取消
+          </a-button>
+        </template>
+        <ul v-else>
           <div ref="btnRow" class="btn-row" v-if="isShowSettingBtn">
             <a-button class="btn-setting" v-show="currentTempId != '0' && isShowSetting('hideSettingBtn')" icon="setting" @click="handlerSetting">
               设置
@@ -310,15 +319,6 @@
                   </a-button>
                 </a-dropdown>
               </template>
-              <!-- 行内编辑对应生成的（保存、取消）按钮 -->
-              <template v-if="visibleInlineOperateBtn">
-                <a-button :style="{ display: isInlineOperating ? 'inline-block' : 'none' }" @click="inlineEditClick" class="btn-custom-class" style="margin: 0 8px 8px 0" type="primary">
-                  保存
-                </a-button>
-                <a-button :style="{ display: isInlineOperating ? 'inline-block' : 'none' }" @click="inlineEditCancel" class="btn-custom-class" style="margin: 0 8px 8px 0">
-                  取消
-                </a-button>
-              </template>
             </template>
           </template>
         </ul>
@@ -815,7 +815,7 @@ export default create({
       if (index !== -1) this.$emit('tabClick', this.tabConditionList[index]);
     },
     pageResize(obj) {
-      if (this.resizeFlag) return;
+      if (this.resizeFlag || this.visibleInlineOperateBtn) return;
       let baseLeft = this.$refs['baseLeft'];
       if (!baseLeft) return;
       this.resizeFlag = true;
@@ -839,7 +839,7 @@ export default create({
       }
     },
     onResize() {
-      if (this.isButtonFolding || this.isShowSetting('buttonAdaption') || this.relatedIsTree == 1) return;
+      if (this.isButtonFolding || this.isShowSetting('buttonAdaption') || this.relatedIsTree == 1 || this.visibleInlineOperateBtn) return;
       utils.debounce(this.pageResize({ type: 'resize' }), 300);
     },
     async saveListIsTile() {
@@ -1916,7 +1916,6 @@ export default create({
             _this.setBatchSaveRowStatus(true);
           },
           onCancel() {
-            _this.setBatchCancelRowStatus(true);
           }
         });
         return;
@@ -2095,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);
         });
       }
     }

package/packages/table-filter/src/classification/Classification-com.vue

@@ -435,6 +435,11 @@ import create from '@/core/create';
 export default create({
   name: 'Classification',
   mixins: [filterApiFn],
+  provide() {
+    return {
+      root_isShowResetButton: this.isShowResetButton
+    };
+  },
   components: {
     // Search,
     [Icon.name]: Icon,
@@ -487,6 +492,7 @@ export default create({
     countCondition: { type: Number }, // 是否统计筛选分类，1统计筛选分类，0反之
     countTabCondition: { type: Number }, // 筛选页签是否进行数量统计，1统计筛选页签，0反之
     keyword: { type: String },
+    isShowResetButton: { type: Boolean, default: true }, // 是否显示  恢复默认设置 按钮
     fieldKeys: {
       type: Array,
       default: () => []

package/packages/table-filter/src/components/table-modal/TableModal.vue

@@ -25,7 +25,7 @@
       </div>
     </slot>
     <template #footer v-if="type == 'search'">
-      <a-popconfirm class="btn-reset" title="确认要恢复系统默认设置吗？" ok-text="确认" cancel-text="取消" @confirm="popconfirm">
+      <a-popconfirm v-if="isShowResetButton" class="btn-reset" title="确认要恢复系统默认设置吗？" ok-text="确认" cancel-text="取消" @confirm="popconfirm">
         <a-button>恢复默认设置</a-button>
       </a-popconfirm>
 
@@ -144,6 +144,7 @@ import draggable from 'vuedraggable';
 import svgIcon from '@/component/svg/index.vue';
 export default {
   mixins: [filterApiFn],
+  inject: { isShowResetButton: { from: 'root_isShowResetButton' } },
   props: {
     visibleIn: Boolean,
     loading: Boolean,