vue2-client 1.8.436 → 1.8.438

package/package.json

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

@@ -201,20 +201,21 @@ export default {
   methods: {
     init (params) {
       const {
-        configName, configContent, formItems, viewMode, isHandleFormKey = true,
+        configName, configContent, formItems, formJson, viewMode, isHandleFormKey = true,
         showSubmitBtn = true, serviceName, isTableTemp = false, isKeyHandle = true,
         modifyModelData = {}, businessType, title, fixedAddForm = {}, getDataParams = {},
-        simpleFormJsonData = {}, env = 'prod', layout = 'horizontal'
+        simpleFormJsonData = {}, env = 'prod', layout, xAddFormLayout = 'horizontal'
       } = params
       this.loaded = false
-      this.layout = layout
-      this.configName = configName
-      this.configContent = configContent
-      if (typeof formItems === 'string') {
-        this.formItems = JSON.parse(formItems)
+      // 兼容需要省略 传递 layout: res.xAddFormLayout 可以使用 ...res 展开运算符 直接转递
+      if (xAddFormLayout && !layout) {
+        this.layout = xAddFormLayout
       } else {
-        this.formItems = JSON.parse(JSON.stringify(formItems))
+        this.layout = layout
       }
+      this.configName = configName
+      this.configContent = configContent
+      this.formItems = this.getFromItem(formItems, formJson)
       this.viewMode = viewMode
       this.isHandleFormKey = isHandleFormKey
       this.showSubmitBtn = showSubmitBtn
@@ -266,6 +267,15 @@ export default {
       }
       this.loaded = true
     },
+    // 兼容需要省略 传递 [formItems: res.formJson ] 可以使用 ...res 展开运算符 直接转递
+    getFromItem (formItems, formJson) {
+      const _formItems = formItems || formJson
+      if (typeof formItems === 'string') {
+        this.formItems = JSON.parse(_formItems)
+      } else {
+        this.formItems = JSON.parse(JSON.stringify(_formItems))
+      }
+    },
     // 时间组件赋默认值
     getDateRange (type, defaultValue) {
       // const format = type === 'datePicker' ? 'YYYY-MM-DD' : 'YYYY-MM-DD HH:mm:ss'

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

@@ -21,6 +21,7 @@
           :disabled="disabled && !readOnly"
           :whitespace="true"
           style="flex: 1; width: auto; min-width: 0;"
+          @change="attr.dataChangeFunc && debouncedDataChangeFunc()"
           :suffix="attr.inputSuffix && mode !== '新增' ? attr.inputSuffix : ''"
           @blur="attr.inputOnBlurFunc && emitFunc(attr.inputOnBlurFunc,attr)"
           :placeholder="attr.placeholder ? attr.placeholder : '请输入'+attr.name.replace(/\s*/g, '')"
@@ -77,6 +78,7 @@
         v-if="!attr.lazyLoad || attr.lazyLoad === 'false'"
         v-model="form[attr.model]"
         :disabled="disabled"
+        @change="attr.dataChangeFunc && debouncedDataChangeFunc()"
         :filter-option="filterOption"
         :getPopupContainer=" triggerNode => { return triggerNode.parentNode } "
         :placeholder="attr.placeholder ? attr.placeholder : '请选择'"
@@ -139,6 +141,7 @@
         v-else
         v-model="form[attr.model]"
         :disabled="disabled"
+        @change="attr.dataChangeFunc && debouncedDataChangeFunc()"
         :filter-option="filterOption"
         :getPopupContainer=" triggerNode => { return triggerNode.parentNode } "
         :placeholder="attr.placeholder ? attr.placeholder : '搜索' + attr.name"
@@ -174,6 +177,7 @@
         :filter-option="filterOption"
         :getPopupContainer=" triggerNode => { return triggerNode.parentNode } "
         :placeholder="attr.placeholder ? attr.placeholder : '请选择'"
+        @change="attr.dataChangeFunc && debouncedDataChangeFunc()"
         mode="multiple"
         show-search
         allowClear
@@ -213,6 +217,7 @@
         :getPopupContainer=" triggerNode => { return triggerNode.parentNode } "
         :placeholder="attr.placeholder ? attr.placeholder : '搜索' + attr.name"
         mode="multiple"
+        @change="attr.dataChangeFunc && debouncedDataChangeFunc()"
         show-search
         allowClear
         @search="fetchFunction"
@@ -234,7 +239,10 @@
       :ref="attr.model"
       :label="attr.name"
       :prop="attr.prop ? attr.prop : attr.model">
-      <a-radio-group v-model="form[attr.model]">
+      <a-radio-group
+        v-model="form[attr.model]"
+        @change="attr.dataChangeFunc && debouncedDataChangeFunc()"
+      >
         <template v-if="attr.keys">
           <a-radio v-for="(item,index) in attr.keys" :key="index" :value="item.value">
             {{ item.label }}
@@ -263,6 +271,7 @@
     :flex="attr.flex">
     <a-form-model-item :ref="attr.model" :label="attr.name" :prop="attr.prop ? attr.prop : attr.model">
       <a-date-picker
+        @change="attr.dataChangeFunc && debouncedDataChangeFunc()"
         v-if="mode === '新增/修改'"
         v-model="form[attr.model]"
         :disabled="disabled"
@@ -271,6 +280,7 @@
         valueFormat="YYYY-MM-DD HH:mm:ss"/>
       <a-range-picker
         v-else
+        @change="attr.dataChangeFunc && debouncedDataChangeFunc()"
         v-model="form[attr.model]"
         :disabled="disabled"
         :show-time="true"
@@ -285,6 +295,7 @@
     :flex="attr.flex">
     <a-form-model-item :ref="attr.model" :label="attr.name" :prop="attr.prop ? attr.prop : attr.model">
       <a-month-picker
+        @change="attr.dataChangeFunc && debouncedDataChangeFunc()"
         v-model="form[attr.model]"
         :disabled="disabled"
         :show-time="true"
@@ -299,6 +310,7 @@
     :flex="attr.flex">
     <a-form-model-item :ref="attr.model" :label="attr.name" :prop="attr.prop ? attr.prop : attr.model">
       <a-date-picker
+        @change="attr.dataChangeFunc && debouncedDataChangeFunc()"
         v-model="form[attr.model]"
         :disabled="disabled"
         format="YYYY"
@@ -317,6 +329,7 @@
     :flex="attr.flex">
     <a-form-model-item :ref="attr.model" :label="attr.name" :prop="attr.prop ? attr.prop : attr.model">
       <a-range-picker
+        @change="attr.dataChangeFunc && debouncedDataChangeFunc()"
         v-if="mode === '查询' && attr.queryType === 'BETWEEN' "
         v-model="form[attr.model]"
         :disabled="disabled"
@@ -325,6 +338,7 @@
         format="YYYY-MM-DD"
         valueFormat="YYYY-MM-DD HH:mm:ss"/>
       <a-date-picker
+        @change="attr.dataChangeFunc && debouncedDataChangeFunc()"
         v-else-if="mode === '查询'"
         v-model="form[attr.model]"
         :disabled="disabled"
@@ -332,6 +346,7 @@
         valueFormat="YYYY-MM-DD"/>
       <a-date-picker
         v-else
+        @change="attr.dataChangeFunc && debouncedDataChangeFunc()"
         v-model="form[attr.model]"
         :disabled="disabled"
         style="width: 100%;"
@@ -394,6 +409,7 @@
     :flex="attr.flex">
     <a-form-model-item :ref="attr.model" :label="attr.name" :prop="attr.prop ? attr.prop : attr.model">
       <citySelect
+        @change="attr.dataChangeFunc && debouncedDataChangeFunc()"
         ref="citySelect"
         v-model="form[attr.model]"
         :contexts="attr.contexts"
@@ -446,6 +462,7 @@
     v-else-if="attr.type === 'treeSelect' && show"
     :flex="attr.flex">
     <x-tree-select
+      @onChange="attr.dataChangeFunc && debouncedDataChangeFunc()"
       v-model="form[attr.model]"
       :attr="attr"
       ref="xTreeSelect">
@@ -459,7 +476,10 @@
       :ref="attr.model"
       :label="attr.name"
       :prop="attr.prop ? attr.prop : attr.model">
-      <a-rate v-model="form[attr.model]"/>
+      <a-rate
+        v-model="form[attr.model]"
+        @change="attr.dataChangeFunc && debouncedDataChangeFunc()"
+      />
     </a-form-model-item>
   </x-form-col>
   <!--  区间选择器  -->
@@ -518,7 +538,11 @@
         @blur="attr.inputOnBlurFunc && emitFunc(attr.inputOnBlurFunc,attr)"
         :placeholder="attr.placeholder ? attr.placeholder : '请输入'+attr.name.replace(/\s*/g, '')"
         :ref="`${attr.model}input`"/>
-      <x-license-plate v-else v-model="form[attr.model]"></x-license-plate>
+      <x-license-plate
+        v-else
+        v-model="form[attr.model]"
+        @change="attr.dataChangeFunc && debouncedDataChangeFunc()"
+      ></x-license-plate>
     </a-form-model-item>
   </x-form-col>
 </template>
@@ -706,15 +730,11 @@ export default {
       deep: true
     },
     form: {
-      handler (newVal) {
+      handler (newVal, oldVal) {
         // 如果是从函数获取 options
         if (this.attr.keyName && (this.attr.keyName.toString().indexOf('async ') !== -1 || this.attr.keyName.toString().indexOf('function') !== -1)) {
           this.debouncedUpdateOptions()
         }
-        // 如果有自定义函数变更函数
-        if (this.attr.dataChangeFunc) {
-          this.debouncedDataChangeFunc()
-        }
         // 如果有自定义是否展示表单项函数
         if (this.attr.showFormItemFunc) {
           this.debouncedShowFormItemFunc()

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

@@ -4,7 +4,7 @@
       <XReport
         ref="main"
         :use-oss-for-img="false"
-        config-name="templateManageView2"
+        config-name="adviceCheckCover"
         server-name="af-his"
         :show-img-in-cell="true"
         :display-only="true"

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

@@ -12,12 +12,13 @@
           :span="cell.colSpan ? cell.colSpan * 2 : undefined">
           <!-- 插槽渲染 -->
           <template v-if="cell.type === 'slot'">
-            <template v-if="['x-form-table','x-add-native-form','x-tree-pro', 'x-his-editor'].includes(cell.slotType)">
+            <template v-if="['x-form-table','x-add-native-form','x-tree-pro', 'x-his-editor', 'x-tab'].includes(cell.slotType)">
               <component
                 :is="getComponentName(cell.slotConfig, cell.serviceName, cell.slotType)"
                 :key="cellIndex"
                 :ref="`dynamicComponent_${ cell.slotRef || cellIndex}`"
                 :serviceName="cell.serviceName"
+                :serverName="cell.serviceName"
                 v-on="getEventHandlers(cell)"
                 @hook:mounted="(h)=>onComponentMounted(h,cell,cellIndex)"
                 :queryParamsName="cell.slotConfig"

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

@@ -78,7 +78,8 @@ routerResource.example = {
       {
           path: 'default',
           name: '示例页面',
-          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/XReportGrid/XReportDemo.vue'),
           // component: () => import('@vue2-client/pages/WorkflowDetail/WorkFlowDemo.vue'),
           meta: {
               // 菜单中不显示