vue2-client 1.9.113 → 1.9.115

package/package.json

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

@@ -21,7 +21,7 @@ export default {
 
 <template>
   <a-card>
-    <x-add-native-form ref="xAddFrom" @getinfo="aaa"/>
+    <x-add-native-form ref="xAddFrom" @getinfo="aaa" @onSubmit="aaa"/>
   </a-card>
 </template>
 

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

@@ -184,6 +184,7 @@
     v-else-if="attr.type === 'checkbox' && show"
     :flex="attr.flex">
     <a-form-model-item
+      v-if="!attr.showMode || mode === '查询' || attr.showMode === 'select' "
       :ref="attr.model"
       :label="showLabel?attr.name:undefined"
       :prop="attr.prop ? attr.prop : attr.model">
@@ -249,6 +250,17 @@
         </a-select-option>
       </a-select>
     </a-form-model-item>
+    <a-form-model-item
+      v-else
+      :ref="attr.model"
+      :label="showLabel?attr.name:undefined"
+      :prop="attr.prop ? attr.prop : attr.model">
+      <a-checkbox-group
+        v-model="form[attr.model]"
+        :options="option"
+        @change="attr.dataChangeFunc && debouncedDataChangeFunc()"
+      />
+    </a-form-model-item>
   </x-form-col>
   <!-- 单选框 -->
   <x-form-col
@@ -1089,7 +1101,7 @@ export default {
           let source = this.attr.keyName.substring(7)
           const userid = this.currUser.id
           let roleName = 'roleName'
-          if (source.startsWith('根据角��[') && source.endsWith(']获取人员')) {
+          if (source.startsWith('根据角色[') && source.endsWith(']获取人员')) {
             const startIndex = source.indexOf('[') + 1
             const endIndex = source.indexOf(']', startIndex)
             roleName = source.substring(startIndex, endIndex)
@@ -1223,7 +1235,7 @@ export default {
       this.emitFunc(func, groupName)
     },
     emitFunc (func, data) {
-      this.$emit('x-form-item-emit-func', func, data, data.model ? this.form[data.model] : this.form)
+      this.$emit('x-form-item-emit-func', func, data, data?.model ? this.form[data.model] : this.form)
     },
     itemMounted (h) {
       this.$emit('mounted', h)

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

@@ -37,7 +37,7 @@ export default {
   data () {
     return {
       // configName: 'medicalRecordCover'
-      configName: 'physicianOrderEntryCover'
+      configName: 'threeHealthCenterCover'
       // configName: 'medOrderManaActCover'
     }
   },

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

@@ -84,10 +84,10 @@ 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/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'),