vue2-client 1.9.147 → 1.9.149

package/package.json

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

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

@@ -6,7 +6,7 @@ export default {
   name: 'Demo',
   components: { XAddNativeForm },
   mounted () {
-    getConfigByNameAsync('patientInfoCRUD', 'af-his').then(res => {
+    getConfigByNameAsync('formtestForm', 'af-system').then(res => {
       console.log('===res', res)
       this.$refs.xAddFrom.init(res)
     })

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

@@ -353,8 +353,8 @@
       <a-date-picker
         @change="attr.dataChangeFunc && debouncedDataChangeFunc()"
         v-if="mode === '新增/修改'"
+        :disabled="disabled || readOnly"
         v-model="form[attr.model]"
-        :disabled="disabled"
         :show-time="true"
         style="width: 100%;"
         :valueFormat="formatType|| 'YYYY-MM-DD HH:mm:ss'"/>
@@ -398,7 +398,7 @@
         v-else
         @change="attr.dataChangeFunc && debouncedDataChangeFunc()"
         v-model="form[attr.model]"
-        :disabled="disabled"
+        :disabled="disabled || readOnly"
         :show-time="true"
         :valueFormat="formatType || 'YYYY-MM'"
         style="width: 100%;"
@@ -426,7 +426,7 @@
         v-else
         @change="attr.dataChangeFunc && debouncedDataChangeFunc()"
         v-model="form[attr.model]"
-        :disabled="disabled"
+        :disabled="disabled || readOnly"
         format="YYYY"
         :valueFormat="formatType || 'YYYY'"
         mode="year"
@@ -473,7 +473,7 @@
         v-else
         @change="attr.dataChangeFunc && debouncedDataChangeFunc()"
         v-model="form[attr.model]"
-        :disabled="disabled"
+        :disabled="disabled || readOnly"
         style="width: 100%;"
         :showToday="true"
         :show-time="{ defaultValue: moment('00:00:00', 'HH:mm:ss') }"
@@ -481,15 +481,8 @@
     </a-form-model-item>
   </x-form-col>
   <!-- 文本域 -->
-  <a-col
-    v-else-if="attr.type === 'textarea' && show"
-    :style="layout === 'inline'?{width:'calc(100% - 60px)'}:{}"
-    :xs="24"
-    :sm="24"
-    :md="24"
-    :lg="24"
-    :xl="24"
-    :xxl="24">
+  <x-form-col v-else-if="attr.type === 'textarea' && show" :flex="attr.flex" :fullWidth="layout === 'inline'">
+    <!--    :style="layout === 'inline'?{width:'calc(100% - 60px)'}:{}"-->
     <a-form-model-item
       :labelCol="layout === 'inline'?{span:2}:undefined"
       :wrapperCol="layout === 'inline'?{span:22}:undefined"
@@ -503,17 +496,9 @@
         :placeholder="attr.placeholder ? attr.placeholder : '请输入'+attr.name.replace(/\s*/g, '')"
         :rows="4"/>
     </a-form-model-item>
-  </a-col>
+  </x-form-col>
   <!-- 文件上传 -->
-  <a-col
-    v-else-if="(attr.type === 'file' || attr.type === 'image') && show"
-    :style="layout === 'inline'?{width:'calc(100% - 60px)'}:{}"
-    :xs="24"
-    :sm="24"
-    :md="24"
-    :lg="24"
-    :xl="24"
-    :xxl="24">
+  <x-form-col v-else-if="(attr.type === 'file' || attr.type === 'image') && show" :flex="attr.flex" :fullWidth="layout === 'inline'">
     <a-form-model-item
       :labelCol="layout === 'inline'?{span:2}:undefined"
       :wrapperCol="layout === 'inline'?{span:22}:undefined"
@@ -528,7 +513,7 @@
         :service-name="serviceName"
         @setFiles="setFiles"></upload>
     </a-form-model-item>
-  </a-col>
+  </x-form-col>
   <!-- 省市区选择框 -->
   <x-form-col
     v-else-if="attr.type === 'citySelect' && show"
@@ -1160,7 +1145,7 @@ export default {
     init () {
       if (!this.attr.flex) {
         if (this.mode === '新增/修改') {
-          if (['horizontal', 'vertical'].includes(this.layout)) {
+          if (['horizontal', 'vertical'].includes(this.layout) || ['textarea', 'file', 'image'].includes(this.attr.type)) {
             // 新增修改表单 horizontal 模式下默认为一行
             this.attr.flex = {
               xs: 24,
@@ -1175,7 +1160,7 @@ export default {
             this.attr.flex = {
               xs: 24,
               sm: 12,
-              md: 12,
+              md: 8,
               lg: 8,
               xl: 6,
               xxl: 6

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

@@ -40,6 +40,10 @@ export default {
     occupyCol: {
       type: Number,
       default: 1
+    },
+    fullWidth: {
+      type: Boolean,
+      default: false
     }
   },
   computed: {
@@ -58,6 +62,13 @@ export default {
     computedStyles () {
       const realFlex = Math.min(this.computedFlex * this.occupyCol, 24)
       const flexValue = (realFlex / 24) * 100
+
+      if (this.fullWidth) {
+        return {
+          flex: `0 0 calc(${flexValue}% - 60px)`,
+          maxWidth: `${flexValue}%`,
+        }
+      }
       return {
         flex: `0 0 ${flexValue}%`,
         maxWidth: `${flexValue}%`,

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

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