vue2-client 1.9.60 → 1.9.61

package/package.json

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

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

@@ -59,18 +59,34 @@
     </div>
     <div v-if="this.showPagination">
       <a-divider/>
-      <a-pagination
-        v-model="pageNum"
-        style="float: right"
-        :total="total"
-        show-less-items
-        :page-size="pageSize"
-        :page-size-options="pageSizeOptions"
-        show-size-changer
-        @change="pageNumChange"
-        :showTotal="paginationShowTotal"
-        @showSizeChange="pageSizeChange">
-      </a-pagination>
+      <div v-if="!simpleMode">
+        <a-pagination
+          v-model="pageNum"
+          style="float: right"
+          :total="total"
+          show-less-items
+          :page-size="pageSize"
+          :page-size-options="pageSizeOptions"
+          show-size-changer
+          @change="pageNumChange"
+          :showTotal="paginationShowTotal"
+          @showSizeChange="pageSizeChange">
+        </a-pagination>
+      </div>
+      <div v-else>
+        <!-- simpleMode页面 -->
+        <a-pagination
+          v-model="pageNum"
+          style="float: right"
+          :total="total"
+          :page-size="pageSize"
+          :class="{'hide-page-numbers': true}"
+          :page-size-options="pageSizeOptions"
+          @change="pageNumChange"
+          :showTotal="paginationShowTotal"
+          @showSizeChange="pageSizeChange">
+        </a-pagination>
+      </div>
     </div>
   </div>
 </template>
@@ -98,6 +114,11 @@ export default {
     testData: {
       type: Array,
       default: undefined
+    },
+    // 是否简易模式
+    simpleMode: {
+      type: Boolean,
+      default: false
     }
   },
   data () {
@@ -250,6 +271,14 @@ export default {
 </script>
 
 <style lang="less" scoped>
+.hide-page-numbers /deep/ .ant-pagination-item {
+    display: none; /* 隐藏数字页码 */
+}
+.hide-page-numbers /deep/ .ant-pagination-prev,
+.hide-page-numbers /deep/ .ant-pagination-next {
+    display: inline-block; /* 保留左右跳转按钮 */
+}
+
 .XCard {
   display: flex;
   flex-wrap: wrap;

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

@@ -293,7 +293,7 @@ export default {
           if (this.form[key] === null || this.form[key] === '') {
             this.form[key] = undefined
           }
-          if (Array.isArray(this.form[key]) && !this.form[key][0]) {
+          if (Array.isArray(this.form[key]) && this.form[key].length === 0) {
             this.form[key] = undefined
           }
           // 如果 form 中没有值，但是有默认值

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

@@ -89,14 +89,14 @@ export default {
             // value = option 自身和所有子得集合
             const values = []
             for (const item of this.option) {
-              if (item.value == value) {
+              console.log(item.value, value)
+              if (value.includes(item.value)) {
                 values.push(item.value)
-              }
-              if (item.children && item.children.length) {
-                this.getValues(item.children, value, values)
+                if (item.children && item.children.length) {
+                  this.getValues(item.children, value, values)
+                }
               }
             }
-            this.value = values
             this.$emit('onChange', values)
           }
         } else {
@@ -180,12 +180,14 @@ export default {
           // this.form[this.model] = value
           // 获取所有选中节点的value
           const values = []
-          for (const item of extra.allCheckedNodes) {
-            if (item.node.key) {
-              values.push(item.node.key)
-            }
-            if (item.children && item.children.length) {
-              this.getNodeValues(item.children, value, values)
+          if (extra.allCheckedNodes) {
+            for (const item of extra.allCheckedNodes) {
+              if (item.node.key) {
+                values.push(item.node.key)
+              }
+              if (item.children && item.children.length) {
+                this.getNodeValues(item.children, value, values)
+              }
             }
           }
           this.$emit('onChange', values)

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

@@ -34,7 +34,7 @@ export default {
   data () {
     return {
       // 查询配置文件名
-      queryParamsName: 'ceshiCRUD',
+      queryParamsName: 'ChargeQueryCRUD',
       // 查询配置左侧tree
       // xTreeConfigName: 'addressType',
       // 新增表单固定值

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

@@ -80,7 +80,7 @@
           </a-space>
         </span>
       </a-col>
-      <a-col v-show="showRightTools">
+      <a-col v-show="showRightTools && !simpleMode">
         <span :style="{ float: 'right', overflow: 'hidden', marginBottom: '8px' }">
           <a-button-group>
             <slot name="rightBtnExpand" :selectedRowKeys="selectedRowKeys" :selectedRows="selectedRows"></slot>
@@ -211,7 +211,8 @@
         @cardEmit="handleCardEmit"
         :card-config="cardModeConfig"
         :show-pagination="true"
-        :card-data="loadData"/>
+        :card-data="loadData"
+        :simple-mode="simpleMode"/>
     </template>
     <!-- 上传文件 -->
     <a-drawer

package/src/router/async/router.map.js

@@ -85,9 +85,9 @@ routerResource.example = {
           name: '示例页面',
           // component: () => import('@vue2-client/base-client/components/common/XAddNativeForm/demo.vue'),
           // component: () => import('@vue2-client/base-client/components/common/XReport/XReportDemo.vue'),
-          // component: () => import('@vue2-client/base-client/components/common/XFormTable/demo.vue'),
+          component: () => import('@vue2-client/base-client/components/common/XFormTable/demo.vue'),
           // component: () => import('@vue2-client/base-client/components/common/XTab/XTabDemo.vue'),
-          component: () => import('@vue2-client/base-client/components/common/XReportGrid/XReportDemo.vue'),
+          // component: () => import('@vue2-client/base-client/components/common/XReportGrid/XReportDemo.vue'),
           // component: () => import('@vue2-client/pages/WorkflowDetail/WorkFlowDemo.vue'),
           meta: {
               // 菜单中不显示