vue2-client 1.9.61 → 1.9.63

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vue2-client",
-  "version": "1.9.61",
+  "version": "1.9.63",
   "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

@@ -271,8 +271,9 @@ export default {
 </script>
 
 <style lang="less" scoped>
-.hide-page-numbers /deep/ .ant-pagination-item {
-    display: none; /* 隐藏数字页码 */
+.hide-page-numbers /deep/ .ant-pagination-item,
+.hide-page-numbers /deep/ .ant-pagination-jump-next {
+    display: none; /* 隐藏数字页码和多页跳转 */
 }
 .hide-page-numbers /deep/ .ant-pagination-prev,
 .hide-page-numbers /deep/ .ant-pagination-next {
@@ -285,14 +286,14 @@ export default {
   justify-content: space-between;
 
   .data-card {
-    height: 32vh;
     width: 15vw;
+    margin: 10px 0;
     border: 2px solid rgb(244,244,244);
     border-radius: 5px;
     margin-bottom: 1%;
 
     .header {
-      height: 14%;
+      height: 30px;
       width: 100%;
       background-color: rgb(244,244,244);
       padding-top: 3%;
@@ -305,12 +306,11 @@ export default {
     }
 
     .body {
-      height: 70%;
       width: 100%;
       padding: 3%;
 
       .body-item {
-        height: 12%;
+        height: 20px;
       }
 
       .body-split {
@@ -364,7 +364,7 @@ export default {
     }
 
     .footer {
-      height: 16%;
+      height: 35px;
       width: 100%;
       background-color: rgb(244,244,244);
       padding-top: 5%;

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

@@ -10,6 +10,7 @@
         <a-row :gutter="24">
           <x-form-item
             v-for="(item, index) in realJsonData.slice(0,7)"
+            :showLabel="!simpleMode"
             :key="index"
             :attr="item"
             :form="form"
@@ -22,6 +23,7 @@
           <div v-for="(groupItem, groupIndex) in groupJsonData" :key="'group-' + groupIndex">
             <x-form-item
               v-for="(item, index) in groupItem.groupItems"
+              :showLabel="!simpleMode"
               :key="index"
               :attr="item"
               :form="form"
@@ -34,6 +36,7 @@
           <div v-show="advanced">
             <x-form-item
               v-for="(item, index) in realJsonData.slice(7)"
+              :showLabel="!simpleMode"
               :key="'advanced'+index"
               :attr="item"
               :form="form"
@@ -60,12 +63,13 @@
                 <a-divider type="vertical"/>
               </template>
               <a-button
+                v-show="!simpleMode"
                 htmlType="submit"
                 type="primary"
                 @click="onSubmit">
                 <a-icon :style="iconStyle" type="search"/>查询
               </a-button>
-              <a-button style="margin-left: 8px" @click="resetForm">重置</a-button>
+              <a-button v-show="!simpleMode" style="margin-left: 8px" @click="resetForm">重置</a-button>
               <slot></slot>
             </span>
           </a-col>
@@ -235,7 +239,9 @@ export default {
         } else {
           formData[item.model] = item.queryFormDefault
         }
-        this.defaultMap[item.model] = formData[item.model]
+        if (item.forceQueryDefault) {
+          this.defaultMap[item.model] = formData[item.model]
+        }
       } else {
         if (item.type === 'intervalPicker') {
           formData[item.model] = ['', '']

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

@@ -86,18 +86,21 @@ export default {
           if (this.option.length > 0 && this.option[0].value.toString().indexOf('-') !== -1) {
             this.value = model + '-' + value
           } else {
-            // value = option 自身和所有子得集合
-            const values = []
-            for (const item of this.option) {
-              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 (this.mode === '查询') {
+              const values = []
+              for (const item of this.option) {
+                if (value.includes(item.value)) {
+                  values.push(item.value)
+                  if (item.children && item.children.length) {
+                    this.getValues(item.children, value, values)
+                  }
                 }
               }
+              this.$emit('onChange', values)
+            } else {
+              this.value = value
             }
-            this.$emit('onChange', values)
+            // value = option 自身和所有子得集合
           }
         } else {
           this.value = undefined
@@ -179,18 +182,22 @@ export default {
           // 从单一数据源组成的树可以直接赋值
           // this.form[this.model] = value
           // 获取所有选中节点的value
-          const 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)
+          if (this.mode === '查询') {
+            const 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)
+          } else {
+            this.$emit('onChange', value)
           }
-          this.$emit('onChange', values)
         }
       }
     },

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

@@ -73,7 +73,7 @@
               {{ button.buttonName }}
             </a-button>
 
-            <a-button v-if="allowedCardMode" @click="changeViewMode" :type="isTableMode ? '' : 'primary'">
+            <a-button v-if="allowedCardMode && !simpleMode" @click="changeViewMode" :type="isTableMode ? '' : 'primary'">
               看板模式
             </a-button>
             <slot name="button" :selectedRowKeys="selectedRowKeys" :selectedRows="selectedRows"></slot>
@@ -102,7 +102,7 @@
       </a-col>
     </a-row>
     <!--  如果当前是表格模式  -->
-    <template v-if="isTableMode">
+    <template v-if="isTableMode && !simpleMode">
       <s-table
         ref="table"
         :id="uniqueId"
@@ -721,7 +721,7 @@ export default {
       } else {
         result = query(Object.assign(requestParameters, { userId: this.currUser?.id }), this.serviceName, this.env === 'dev')
       }
-      if (this.isTableMode) {
+      if (this.isTableMode && !this.simpleMode) {
         this.clearRowKeys()
       }
       this.$emit('afterQuery', result, requestParameters.conditionParams)

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: {
               // 菜单中不显示