vue2-client 1.9.69 → 1.9.70

package/package.json

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

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

@@ -20,11 +20,11 @@
             :setForm="setForm"
             @mounted="onItemMounted"
           />
-          <div v-for="(groupItem, groupIndex) in groupJsonData" :key="'group-' + groupIndex">
+          <template v-for="(groupItem, groupIndex) in groupJsonData">
             <x-form-item
               v-for="(item, index) in groupItem.groupItems"
               :showLabel="!simpleMode"
-              :key="index"
+              :key="`group-${groupIndex}-item-${index}`"
               :attr="item"
               :form="form"
               :service-name="serviceName"
@@ -32,21 +32,20 @@
               :env="env"
               :setForm="setForm"
             />
-          </div>
-          <div v-show="advanced">
-            <x-form-item
-              v-for="(item, index) in realJsonData.slice(7)"
-              :showLabel="!simpleMode"
-              :key="'advanced'+index"
-              :attr="item"
-              :form="form"
-              :service-name="serviceName"
-              :get-data-params="getDataParams"
-              :env="env"
-              :setForm="setForm"
-              @mounted="onItemMounted"
-            />
-          </div>
+          </template>
+          <x-form-item
+            v-show="advanced"
+            v-for="(item, index) in realJsonData.slice(7)"
+            :showLabel="!simpleMode"
+            :key="'advanced'+index"
+            :attr="item"
+            :form="form"
+            :service-name="serviceName"
+            :get-data-params="getDataParams"
+            :env="env"
+            :setForm="setForm"
+            @mounted="onItemMounted"
+          />
           <a-col style="margin-left: auto">
             <span
               :style="advanced && { float: 'right', overflow: 'hidden' } || {} "

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

@@ -2,6 +2,7 @@
   <!-- 输入框 -->
   <x-form-col
     v-if="attr.type === 'input' && show"
+    :occupyCol="attr.occupyCol"
     :flex="attr.flex">
     <a-form-model-item
       :ref="attr.model"
@@ -447,6 +448,7 @@
   <!-- 地点搜索框 -->
   <x-form-col
     v-else-if="attr.type === 'addressSearch' && show"
+    :occupyCol="attr.occupyCol"
     :flex="attr.flex">
     <a-form-model-item
       :ref="attr.model"
@@ -943,34 +945,22 @@ export default {
               xxl: 24
             }
           } else {
-            if (['input', 'addressSearch'] && this.attr.occupyCol) {
-              // 如果是 input 看是否配置了 占用列配置
-              this.attr.flex = {
-                xs: 8 * this.attr.occupyCol,
-                sm: 8 * this.attr.occupyCol,
-                md: 8 * this.attr.occupyCol,
-                lg: 8 * this.attr.occupyCol,
-                xl: 8 * this.attr.occupyCol,
-                xxl: 8 * this.attr.occupyCol
-              }
-            } else {
-              // 新增修改表单 vertical 模式下默认为1列
-              this.attr.flex = {
-                xs: 24,
-                sm: 24,
-                md: 24,
-                lg: 12,
-                xl: 8,
-                xxl: 8
-              }
+            // 新增修改表单 vertical 模式下默认为1列
+            this.attr.flex = {
+              xs: 24,
+              sm: 12,
+              md: 12,
+              lg: 8,
+              xl: 6,
+              xxl: 6
             }
           }
         } else {
           this.attr.flex = {
             xs: 24,
             sm: 24,
-            md: 24,
-            lg: 8,
+            md: 8,
+            lg: 6,
             xl: 6,
             xxl: 6
           }

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

@@ -1,6 +1,5 @@
 <template>
-  <a-col
-    :style="computedStyles">
+  <a-col :style="computedStyles">
     <slot></slot>
   </a-col>
 </template>
@@ -38,6 +37,10 @@ export default {
         xxl: 6,
       }),
     },
+    occupyCol: {
+      type: Number,
+      default: 1
+    }
   },
   computed: {
     computedFlex () {
@@ -53,12 +56,14 @@ export default {
       return this.flex.xxl
     },
     computedStyles () {
-      const flexValue = (this.computedFlex * 100) / 24
+      const realFlex = Math.min(this.computedFlex * this.occupyCol, 24)
+      const flexValue = (realFlex / 24) * 100
       return {
         flex: `0 0 ${flexValue}%`,
         maxWidth: `${flexValue}%`,
       }
     }
+
   },
   data () {
     return {

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

@@ -5,6 +5,11 @@ import { getConfigByNameAsync } from '@vue2-client/services/api/common'
 export default {
   name: 'Demo',
   components: { XFormGroup },
+  data () {
+    return {
+      visible: true
+    }
+  },
   created () {
     getConfigByNameAsync('addUserGeneralInfoFrom', 'af-revenue').then(res => {
       this.$refs.xFormGroupDemo.init({
@@ -26,7 +31,7 @@ export default {
 
 <template>
   <a-modal
-    :visible="true"
+    v-model="visible"
     :bodyStyle="{height:'70vh'}"
     title="测试表单组"
     @ok="submitForm"

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

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

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

@@ -84,8 +84,9 @@ routerResource.example = {
           path: 'default',
           name: '示例页面',
           // component: () => import('@vue2-client/base-client/components/common/XAddNativeForm/demo.vue'),
+          component: () => import('@vue2-client/base-client/components/common/XFormGroup/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/pages/WorkflowDetail/WorkFlowDemo.vue'),