vue2-client 1.9.110 → 1.9.112

package/package.json

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

@@ -234,7 +234,8 @@ export default {
   provide () {
     return {
       getComponentByName: this.getComponentByName,
-      registerComponent: this.registerComponent
+      registerComponent: this.registerComponent,
+      getSelf: () => this,
     }
   },
   methods: {

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

@@ -519,7 +519,22 @@
         :arrowPointAtCenter="true"
         :overlayStyle="{ width: '1000px', height: '30vh' }">
         <template #content>
+          <x-report
+            v-if="isCover"
+            :use-oss-for-img="false"
+            :config-name="queryParamsName"
+            :service-name="serviceName"
+            :show-img-in-cell="true"
+            :display-only="true"
+            :edit-mode="false"
+            :show-save-button="true"
+            :no-padding="true"
+            :dont-format="true"
+            @rowChoose="rowChoose"
+          >
+          </x-report>
           <x-form-table
+            v-else
             title="请选择数据"
             :queryParamsName="queryParamsName"
             :rowSelectMode="true"
@@ -671,6 +686,7 @@ export default {
   components: {
     XFormTable: () => import('@vue2-client/base-client/components/common/XFormTable/XFormTable.vue'),
     Recording: () => import('@vue2-client/base-client/components/common/Recording/Recording.vue'),
+    XReport: () => import('@vue2-client/base-client/components/common/XReportGrid/XReport.vue'),
     XLicensePlate,
     XTreeSelect,
     XFormCol,
@@ -849,6 +865,15 @@ export default {
             // 按现有方式处理
             return this.attr.keyName.split('@')[this.attr.keyName.split('@').length - 1]
         }
+    },
+    // 判断弹出时是否Cover，弹出只支持Cover以及CRUD
+    isCover () {
+        // 如果 queryParamsName 为空，返回空
+        if (!this.queryParamsName) {
+            return false
+        }
+        const result = this.queryParamsName.endsWith('Cover')
+        return result
     }
   },
   watch: {
@@ -888,7 +913,7 @@ export default {
       deep: true
     }
   },
-  inject: ['registerComponent', 'getComponentByName'],
+  inject: ['registerComponent', 'getComponentByName', 'getSelf'],
   methods: {
     // 把内部的crud表单录入放到表单中，以便外部可以调用
     onComponentMounted (h, attr) {
@@ -1064,7 +1089,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)

package/src/base-client/components/common/XLabelSelect/XLabelSelectDemo.vue

@@ -11,7 +11,7 @@
 </template>
 
 <script>
-import XLabelSelect from '@/base-client/components/common/XLabelSelect/XLabelSelect.vue'
+import XLabelSelect from '@vue2-client/base-client/components/common/XLabelSelect/XLabelSelect.vue'
 
 export default {
   components: {

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

@@ -27,6 +27,11 @@
         :show-images="hasImages"
         :image-list="imageList">
       </XReportDesign>
+
+      <a-button @click="saveConfig" v-if="showSaveButton">
+        提交
+      </a-button>
+
     </template>
     <template v-else>
       <!--  用以包裹整个页面  -->
@@ -45,9 +50,6 @@
             预览
           </a-radio-button>
         </a-radio-group>
-        <a-radio-button @click="saveConfig" style="border-radius: 0 4px 4px 0" v-if="showSaveButton">
-          保存
-        </a-radio-button>
         <!--   主体表格   -->
         <XReportDesign
           v-if="scanFinish"
@@ -92,6 +94,8 @@ import { mapState } from 'vuex'
 import { getConfigByName, runLogic } from '@vue2-client/services/api/common'
 import XReportDesign from './XReportDesign.vue'
 import { printElement } from './print'
+import { executeStrFunctionByContext } from '@vue2-client/utils/runEvalFunction'
+
 // import XAddReport from '@vue2-client/base-client/components/common/XAddReport'
 
 export default {
@@ -123,7 +127,7 @@ export default {
       type: String,
       default: undefined
     },
-    // 本地配置，调试用
+    // 本地配��，调试用
     localConfig: {
       type: Object,
       default: undefined
@@ -421,7 +425,7 @@ export default {
             targetData = targetData[path]
           }
         }
-        // 将修改的数据，添加update = true属性
+        // 将修改的数���，添加update = true属性
         targetData.update = true
       })
       return tempData
@@ -457,17 +461,10 @@ export default {
       this.$refs[componentName] = component
     },
 
-    // 正常的保存方法，当前修改内容会直接全部导出到外部
+    // 提交处理，调用配置中的函数
     saveConfig () {
-      if (this.activeConfig === undefined || this.activeConfig === null) {
-        return this.originalConfig.data
-      } else {
-        const tempDataKeys = Object.keys(this.activeConfig.tempData)
-        tempDataKeys.forEach(key => {
-          this.changeDeepObject(this.activeConfig.data, key, this.activeConfig.tempData[key])
-        })
-        this.$emit('saveConfig', this.$refs.XReportDesign.activatedConfig)
-      }
+      const funcStr = this.config.confirmFunction
+      executeStrFunctionByContext(this, funcStr, [this])
     },
     // 通过@@@分割临时变量，找到对应的key，并修改它的值
     changeDeepObject (obj, strPath, newVal) {
@@ -729,7 +726,7 @@ export default {
           titleCellFlag = false
           firstSubLine = false
         }
-        // 保存上一个的colspan，保持生成的格子与原格式一致
+        // 保存上一个的colspan���保持生成的格子与原格式一致
         preColSpan = cell.colSpan
       })
 

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

@@ -26,13 +26,18 @@ export default {
   components: {
     XReport, XAddReport
   },
+  provide () {
+    return {
+      getSelectedId: () => 10
+    }
+  },
   mounted () {
       // this.$refs.main.openDialog('surgerySchedCover', -1, {})
   },
   data () {
     return {
       // configName: 'medicalRecordCover'
-      configName: 'physicianOrderEntryCover'
+      configName: 'medOrderManaActCover'
     }
   },
   methods: {

package/src/base-client/components/common/XTable/CustomFuncCel.vue

@@ -1,5 +1,5 @@
 <script>
-import { Ellipsis } from '@/components'
+import { Ellipsis } from '@vue2-client/components'
 import { executeStrFunctionByContext } from '@vue2-client/utils/runEvalFunction'
 import { getConfigByNameAsync, runLogic } from '@vue2-client/services/api/common'
 

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

@@ -330,7 +330,7 @@ import debounce from 'lodash.debounce'
 import XDataCard from '@vue2-client/base-client/components/common/XDataCard/XDataCard.vue'
 import { getRealKeyData } from '@vue2-client/utils/formatter'
 import ReportTableHome from '../../../../pages/report/ReportTableHome.vue'
-import CustomFuncCel from '@/base-client/components/common/XTable/CustomFuncCel.vue'
+import CustomFuncCel from '@vue2-client/base-client/components/common/XTable/CustomFuncCel.vue'
 
 export default {
   name: 'XTable',