vue2-client 1.8.73 → 1.8.74

package/CHANGELOG.md

@@ -1,7 +1,7 @@
 # Change Log
 > 所有关于本项目的变化都在该文档里。
 
-**1.8.66 - 1.8.73 -2024-3-5 @江超**
+**1.8.66 - 1.8.74 -2024-3-5 @江超**
 - 完善`XTable`在开发环境下的查询效果
 
 **1.8.65 -2024-3-5 @张振宇**

package/package.json

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

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

@@ -1,20 +1,27 @@
 <template>
-  <!-- 树形选择框 -->
-  <a-form-model-item v-if="loaded" :ref="model" :label="name" :prop="model">
-    <a-tree-select
-      v-model="value"
-      :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
-      class="tree-select"
-      @change="onTreeSelectChange">
-    </a-tree-select>
-  </a-form-model-item>
+  <div>
+    <template v-if="loaded">
+      <!-- 树形选择框 -->
+      <a-form-model-item v-if="loaded" :ref="model" :label="name" :prop="model">
+        <a-tree-select
+          v-model="value"
+          :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
+          class="tree-select"
+          @change="onTreeSelectChange">
+        </a-tree-select>
+      </a-form-model-item>
+    </template>
+    <template v-else>
+      <a-skeleton active />
+    </template>
+  </div>
 </template>
 <script>
 import XFormCol from '@vue2-client/base-client/components/common/XFormCol'

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

@@ -7,8 +7,8 @@
           ref="xAddForm"
           @afterSubmit="onAddOrEditSubmitAfterSubmit"
         />
-        <div v-if="title" class="crud_title">
-          {{ title }}
+        <div v-if="crudTitle" class="crud_title">
+          {{ crudTitle }}
         </div>
         <x-form
           ref="xForm"
@@ -96,6 +96,11 @@ export default {
       type: String,
       default: ''
     },
+    // 卡片标题
+    crudTitle: {
+      type: String,
+      default: null
+    },
     // 查询配置文件名
     queryParamsName: {
       type: String,

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

@@ -251,13 +251,14 @@ export default {
       this.env = env
       this.rowKey = this.tableColumns[0].dataIndex
       let totalWidth = 0
-      // 设置表格宽度
       for (let i = 0; i < this.tableColumns.length; i++) {
         const item = this.tableColumns[i]
+        // 设置操作列
         if (item.slotType === 'action') {
           item.fixed = 'right'
           item.width = 70
         }
+        // 设置表格宽度
         if (item.width) {
           totalWidth = totalWidth + item.width
         } else {
@@ -512,8 +513,12 @@ export default {
 :deep(.ant-table-thead > tr > th) {
   font-weight: 600;
 }
-:deep(.ant-table-pagination.ant-pagination){
+
+:deep(.ant-table-pagination.ant-pagination) {
   margin-bottom: 0;
 }
-:deep(.ant-table td) { white-space: nowrap; }
+
+:deep(.ant-table td) {
+  white-space: nowrap;
+}
 </style>