vue2-client 1.9.63 → 1.9.64

package/package.json

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

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

@@ -223,18 +223,25 @@ export default {
     getConfigByName,
     init (params) {
       const {
-        configName, configContent, formItems, formJson, viewMode, isHandleFormKey = true,
+        configName, configContent, formItems, formJson, viewMode, isHandleFormKey, isKeyHandle = true,
         showSubmitBtn = true, serviceName,
         modifyModelData = {}, businessType, title, fixedAddForm = {}, getDataParams = {},
         simpleFormJsonData = {}, env = 'prod', layout, xAddFormLayout = 'horizontal'
       } = params
       this.loaded = false
       // 兼容需要省略 传递 layout: res.xAddFormLayout 可以使用 ...res 展开运算符 直接转递
-      if (xAddFormLayout && !layout) {
+      if (xAddFormLayout && layout === undefined) {
         this.layout = xAddFormLayout
       } else {
         this.layout = layout
       }
+      if (isHandleFormKey && !isKeyHandle) {
+        this.isHandleFormKey = isKeyHandle
+      } else if (isHandleFormKey) {
+        this.isHandleFormKey = isHandleFormKey
+      } else {
+        this.isHandleFormKey = isKeyHandle
+      }
       this.configName = configName
       this.configContent = configContent
       this.formItems = this.getFromItem(formItems, formJson)

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

@@ -11,7 +11,7 @@
           <div class="body">
             <template v-for="(item, bodyIndex) in config.content" v-if="bodyIndex < 6">
               <div :key="'body' + bodyIndex" class="body-item">
-                <span class="body-item-label">{{ item.label }}:</span>
+                <span class="body-item-label">{{ item.label }}：</span>
                 <template v-if="item.type === 'progress'">
                   <div class="progress">
                     <div class="progress-bar">
@@ -119,6 +119,10 @@ export default {
     simpleMode: {
       type: Boolean,
       default: false
+    },
+    tableColumns:{
+      type: Array,
+      default: undefined
     }
   },
   data () {
@@ -284,20 +288,19 @@ export default {
   display: flex;
   flex-wrap: wrap;
   justify-content: space-between;
+  overflow-y: auto;
+  max-height: 85vh;
 
   .data-card {
-    width: 15vw;
-    margin: 10px 0;
+    width: 100%;
     border: 2px solid rgb(244,244,244);
     border-radius: 5px;
-    margin-bottom: 1%;
+    margin-bottom: 10px;
 
     .header {
-      height: 30px;
       width: 100%;
       background-color: rgb(244,244,244);
-      padding-top: 3%;
-      padding-left: 5%;
+      padding: 5px 15px;
 
       span {
         font-weight: bold;
@@ -306,28 +309,21 @@ export default {
     }
 
     .body {
-      width: 100%;
-      padding: 3%;
-
       .body-item {
-        height: 20px;
+        padding: 5px 15px;
       }
 
       .body-split {
-        padding-bottom: 1%;
-        margin: 1%;
+        margin: 1px 0;
       }
 
       .body-item-label {
         color: rgba(117, 117, 117, 0.8);
         font-size: 0.95em;
-        padding-left: 1.5%;
       }
 
       .body-item-value {
-        padding-right: 1.5%;
         color: black;
-        float: right;
       }
 
       .progress {
@@ -364,13 +360,10 @@ export default {
     }
 
     .footer {
-      height: 35px;
-      width: 100%;
+      padding: 5px 15px;
       background-color: rgb(244,244,244);
-      padding-top: 5%;
-
       .footer-icon {
-        margin-right: 3%;
+        margin-right: 5px;
       }
 
       .footer-item-split {
@@ -380,7 +373,6 @@ export default {
       .footer-item {
         color: rgba(117, 117, 117, 0.8);
         font-size: 1em;
-        text-align: center;
       }
 
       .footer-item:hover {

package/src/base-client/components/common/XReportGrid/XReportDesign.vue

@@ -504,6 +504,9 @@ export default {
   color: #000;
   // background-color: #fff;
   border-radius: 8px;
+  height: 85vh;
+  overflow-y: auto;
+  overflow-x: hidden;
 
   .reportTitle {
     font-weight: bold;

package/src/base-client/components/common/XReportGrid/XReportTrGroup.vue

@@ -1,10 +1,11 @@
 <template>
-  <a-row type="flex" :gutter="gutter">
+  <a-row type="flex" :gutter="gutter" style="margin-bottom: 20px;">
     <!--  预览页展示  -->
     <template v-if="display">
       <template v-if="!inputColumns">
         <a-col
           name="trGroup"
+          style="flex: 1;"
           v-for="(cell, cellIndex) in columns"
           v-if="!cell.dontShowRow"
           :key="cellIndex"
@@ -982,6 +983,7 @@ export default {
   background: #b37feb;
 }
 .flexItem {
-  border-radius: 4px;
+  border-radius: 8px;
+  height: 100%;
 }
 </style>

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

@@ -209,6 +209,7 @@
       <XDataCard
         ref="table"
         @cardEmit="handleCardEmit"
+        :tableColumns="tableColumns"
         :card-config="cardModeConfig"
         :show-pagination="true"
         :card-data="loadData"

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

@@ -87,7 +87,7 @@ routerResource.example = {
           // 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/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: {
               // 菜单中不显示