vue2-client 1.8.212 → 1.8.214

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vue2-client",
-  "version": "1.8.212",
+  "version": "1.8.214",
   "private": false,
   "scripts": {
     "serve": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service serve --no-eslint",

package/src/base-client/components/common/XForm/XFormItem.vue

@@ -316,6 +316,7 @@
     :flex="attr.flex">
     <x-tree-select
       v-model="form[attr.model]"
+      :attr="attr"
       ref="xTreeSelect">
     </x-tree-select>
   </x-form-col>

package/src/base-client/components/common/XForm/XTreeSelect.vue

@@ -1,27 +1,24 @@
 <template>
   <div>
-    <template v-if="loaded">
-      <!-- 树形选择框 -->
-      <a-form-model-item v-if="loaded" :ref="model" :label="name" :prop="model">
-        <a-tree-select
-          v-model="localValue"
-          :disabled="disabled"
-          :tree-data="getTreeData()"
-          :tree-checkable="mode === '查询' && queryType !== 'RIGHT_LIKE'"
-          :placeholder="'请选择' + name"
-          :dropdown-style="{ maxHeight: '400px' }"
-          tree-node-filter-prop="label"
-          :show-checked-strategy="queryType === 'RIGHT_LIKE' ? 'SHOW_ALL' : undefined"
-          allow-clear
-          :showArrow="true"
-          class="tree-select"
-          @change="onTreeSelectChange">
-        </a-tree-select>
-      </a-form-model-item>
-    </template>
-    <template v-else>
-      <a-skeleton active />
-    </template>
+    <!-- 树形选择框 -->
+    <a-form-model-item :ref="model" :label="attr.name" :prop="model">
+      <a-spin v-if="!loaded" size="small "/>
+      <a-tree-select
+        v-else
+        v-model="localValue"
+        :disabled="disabled"
+        :tree-data="getTreeData()"
+        :tree-checkable="mode === '查询' && queryType !== 'RIGHT_LIKE'"
+        :placeholder="`请选择${name||''}`"
+        :dropdown-style="{ maxHeight: '400px' }"
+        tree-node-filter-prop="label"
+        :show-checked-strategy="queryType === 'RIGHT_LIKE' ? 'SHOW_ALL' : undefined"
+        allow-clear
+        :showArrow="true"
+        class="tree-select"
+        @change="onTreeSelectChange">
+      </a-tree-select>
+    </a-form-model-item>
   </div>
 </template>
 <script>
@@ -34,7 +31,7 @@ export default {
     prop: 'value',
     event: 'onChange'
   },
-  props: ['value'],
+  props: ['value', 'attr'],
   watch: {
     value (newVal) {
       if (newVal.length && !newVal[0]) {

package/src/base-client/components/common/XFormTable/XFormTable.vue

@@ -60,7 +60,7 @@
               <slot name="rightBtnExpand" :selectedRowKeys="selectedRowKeys" :selectedRows="selectedRows"></slot>
               <a-tooltip title="收起查询条件">
                 <a-button @click="toggleIsFormShow">
-                  <a-icon :style="iconStyle" type="vertical-align-top"/>
+                  <a-icon :style="iconStyle" :type="toggleIsFormIcon"/>
                 </a-button>
               </a-tooltip>
             </template>
@@ -118,6 +118,7 @@ export default {
       loadError: false,
       // 实际查询配置内容
       realQueryConfig: {},
+      toggleIsFormIcon: 'vertical-align-top',
       table_selectedRowKeys: [],
       table_selectedRows: []
     }
@@ -453,6 +454,7 @@ export default {
      * 查询表单部分显示/隐藏切换
      */
     toggleIsFormShow () {
+      this.toggleIsFormIcon = this.toggleIsFormIcon === 'vertical-align-top' ? 'vertical-align-bottom' : 'vertical-align-top'
       this.$refs.xForm.toggleVisible()
       this.$refs.xTable.setScrollYHeight({})
     },

package/src/base-client/components/common/XTable/XTable.vue

@@ -310,8 +310,6 @@ export default {
           totalWidth = totalWidth + 180
         }
       }
-      // 设置表格高度为固定值
-      this.setScrollYHeight({ type: 'default' })
       // 横向滚动长度大于所有宽度，才能实现固定表头
       this.scrollXWidth = totalWidth
       // 加载筛选列完成
@@ -335,6 +333,8 @@ export default {
       }
       this.clearRowKeys()
       this.$emit('afterQuery', result, requestParameters.conditionParams)
+      // 设置表格高度为固定值
+      this.setScrollYHeight({ type: 'default' })
       return result
     },
     /**
@@ -387,7 +387,6 @@ export default {
           extraHeight = 48 + 32
         }
         let tHeader = null
-        console.log(document.getElementById(id))
         if (id) {
           tHeader = document.getElementById(id) ? document.getElementById(id).getElementsByClassName('ant-table-thead')[0] : null
         } else {