vue2-client 1.6.47 → 1.6.48

package/package.json

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

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

@@ -2,8 +2,7 @@
   <!-- 输入框 -->
   <x-form-col
     v-if="attr.type === 'input'"
-    :xl="attr.xl"
-    :xxl="attr.xxl">
+    :flex="attr.flex">
     <a-form-model-item
       :ref="attr.model"
       :label="attr.name"
@@ -14,8 +13,7 @@
   <!-- 下拉框 -->
   <x-form-col
     v-else-if="attr.type === 'select'"
-    :xl="attr.xl"
-    :xxl="attr.xxl">
+    :flex="attr.flex">
     <a-form-model-item
       :ref="attr.model"
       :label="attr.name"
@@ -88,8 +86,7 @@
   <!-- 多选框 -->
   <x-form-col
     v-else-if="attr.type === 'checkbox'"
-    :xl="attr.xl"
-    :xxl="attr.xxl">
+    :flex="attr.flex">
     <a-form-model-item
       :ref="attr.model"
       :label="attr.name"
@@ -154,8 +151,7 @@
   <!-- 单选框 -->
   <x-form-col
     v-else-if="attr.type === 'radio'"
-    :xl="attr.xl"
-    :xxl="attr.xxl">
+    :flex="attr.flex">
     <a-form-model-item
       :ref="attr.model"
       :label="attr.name"
@@ -184,8 +180,7 @@
   <!-- 日期范围选择器 -->
   <x-form-col
     v-else-if="attr.type === 'rangePicker'"
-    :xl="attr.xl"
-    :xxl="attr.xxl">
+    :flex="attr.flex">
     <a-form-model-item :ref="attr.model" :label="attr.name" :prop="attr.model">
       <a-range-picker v-model="form[attr.model]" :disabled="disabled" :show-time="true" valueFormat="YYYY-MM-DD HH:mm:ss"/>
     </a-form-model-item>
@@ -193,8 +188,7 @@
   <!-- 月份选择器 -->
   <x-form-col
     v-else-if="attr.type === 'monthPicker'"
-    :xl="attr.xl"
-    :xxl="attr.xxl">
+    :flex="attr.flex">
     <a-form-model-item :ref="attr.model" :label="attr.name" :prop="attr.model">
       <a-month-picker v-model="form[attr.model]" :disabled="disabled" :show-time="true" valueFormat="YYYY-MM"/>
     </a-form-model-item>
@@ -202,8 +196,7 @@
   <!-- 年份选择器 -->
   <x-form-col
     v-else-if="attr.type === 'yearPicker'"
-    :xl="attr.xl"
-    :xxl="attr.xxl">
+    :flex="attr.flex">
     <a-form-model-item :ref="attr.model" :label="attr.name" :prop="attr.model">
       <a-date-picker
         v-model="form[attr.model]"
@@ -220,8 +213,7 @@
   <!-- 日期选择器 -->
   <x-form-col
     v-else-if="attr.type === 'datePicker'"
-    :xl="attr.xl"
-    :xxl="attr.xxl">
+    :flex="attr.flex">
     <a-form-model-item :ref="attr.model" :label="attr.name" :prop="attr.model">
       <a-date-picker
         v-model="form[attr.model]"
@@ -234,12 +226,14 @@
   <!-- 文本域 -->
   <x-form-col
     v-else-if="attr.type === 'textarea'"
-    :lg="24"
-    :md="24"
-    :sm="24"
-    :xl="24"
-    :xs="24"
-    :xxl="24">
+    :flex="{
+      xs: 24,
+      sm: 24,
+      md: 24,
+      lg: 24,
+      xl: 24,
+      xxl: 24
+    }">
     <a-form-model-item
       :ref="attr.model"
       :label="attr.name"
@@ -250,12 +244,14 @@
   <!-- 文件上传 -->
   <x-form-col
     v-else-if="attr.type === 'file' || attr.type === 'image'"
-    :lg="24"
-    :md="24"
-    :sm="24"
-    :xl="24"
-    :xs="24"
-    :xxl="24">
+    :flex="{
+      xs: 24,
+      sm: 24,
+      md: 24,
+      lg: 24,
+      xl: 24,
+      xxl: 24
+    }">
     <a-form-model-item :ref="attr.model" :label="attr.name" :prop="attr.model">
       <upload :files="files" :images="images" :model="attr" :service-name="serviceName" @setFiles="setFiles"></upload>
     </a-form-model-item>
@@ -263,8 +259,7 @@
   <!-- 省市区选择框 -->
   <x-form-col
     v-else-if="attr.type === 'citySelect'"
-    :xl="attr.xl"
-    :xxl="attr.xxl">
+    :flex="attr.flex">
     <a-form-model-item :ref="attr.model" :label="attr.name" :prop="attr.model">
       <citySelect v-model="form[attr.model]" ></citySelect>
     </a-form-model-item>
@@ -272,8 +267,7 @@
   <!-- 地点搜索框 -->
   <x-form-col
     v-else-if="attr.type === 'addressSearch'"
-    :xl="attr.xl"
-    :xxl="attr.xxl">
+    :flex="attr.flex">
     <a-form-model-item :ref="attr.model" :label="attr.name" :prop="attr.model">
       <address-search-combobox
         v-model="searchResult"
@@ -286,8 +280,7 @@
   <!-- 人员选择框 -->
   <x-form-col
     v-else-if="attr.type === 'personSetting'"
-    :xl="attr.xl"
-    :xxl="attr.xxl">
+    :flex="attr.flex">
     <a-form-model-item :ref="attr.model" :label="attr.name" :prop="attr.model">
       <PersonSetting v-model="form[attr.model]" ></PersonSetting>
     </a-form-model-item>
@@ -295,8 +288,7 @@
   <!-- 树形选择框 -->
   <x-form-col
     v-else-if="attr.type === 'treeSelect'"
-    :xl="attr.xl"
-    :xxl="attr.xxl">
+    :flex="attr.flex">
     <x-tree-select
       ref="xTreeSelect">
     </x-tree-select>
@@ -410,12 +402,14 @@ export default {
   },
   methods: {
     init () {
-      if (this.mode === '新增/修改') {
-        if (!this.attr.xl) {
-          this.attr.xl = 12
-        }
-        if (!this.attr.xxl) {
-          this.attr.xxl = 8
+      if (this.mode === '新增/修改' && !this.attr.flex) {
+        this.attr.flex = {
+          xs: 24,
+          sm: 24,
+          md: 24,
+          lg: 12,
+          xl: 12,
+          xxl: 8
         }
       }
       if (this.attr.keyName && this.attr.keyName.indexOf('logic@') !== -1) {

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

@@ -1,49 +1,38 @@
-<template>
-  <a-col
-    :xs="xs"
-    :sm="sm"
-    :md="md"
-    :lg="lg"
-    :xl="xl"
-    :xxl="xxl" >
-    <slot></slot>
-  </a-col>
-</template>
-
-<script>
-
-export default {
-  name: 'XFormCol',
-  props: {
-    xs: {
-      type: Number,
-      default: 24
-    },
-    sm: {
-      type: Number,
-      default: 24
-    },
-    md: {
-      type: Number,
-      default: 24
-    },
-    lg: {
-      type: Number,
-      default: 12
-    },
-    xl: {
-      type: Number,
-      default: 8
-    },
-    xxl: {
-      type: Number,
-      default: 6
-    }
-  },
-  data () {
-    return {
-
-    }
-  }
-}
-</script>
+<template>
+  <a-col
+    :xs="flex.xs"
+    :sm="flex.sm"
+    :md="flex.md"
+    :lg="flex.lg"
+    :xl="flex.xl"
+    :xxl="flex.xxl" >
+    <slot></slot>
+  </a-col>
+</template>
+
+<script>
+
+export default {
+  name: 'XFormCol',
+  props: {
+    flex: {
+      type: Object,
+      default: () => {
+        return {
+          xs: 24,
+          sm: 24,
+          md: 24,
+          lg: 12,
+          xl: 8,
+          xxl: 6
+        }
+      }
+    }
+  },
+  data () {
+    return {
+
+    }
+  }
+}
+</script>