cnhis-design-vue 0.2.33-beta → 0.2.34-beta

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cnhis-design-vue",
-  "version": "0.2.33-beta",
+  "version": "0.2.34-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;
       }
@@ -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/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;