vue2-client 1.14.45 → 1.14.46

package/package.json

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

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

@@ -4,7 +4,7 @@
       <XReport
         ref="main"
         :use-oss-for-img="false"
-        config-name="openPrescriptionCover"
+        config-name="收费组件Config"
         server-name="af-his"
         :show-img-in-cell="true"
         :display-only="true"

package/src/base-client/components/his/XCharge/XCharge.vue

@@ -56,14 +56,14 @@
 </template>
 
 <script>
-import { getConfigByName, runLogic } from '@/services/api/common'
+import { getConfigByName, runLogic } from '@vue2-client/services/api/common'
 
 export default {
   name: 'XCharge',
   props: {
-    configName: {
+    queryParamsName: {
       type: String,
-      default: '收费组件Config'
+      default: ''
     },
     parameter: {
       type: Object,
@@ -83,7 +83,7 @@ export default {
     }
   },
   created () {
-    this.getConfig(this.configName, {})
+    this.getConfig(this.queryParamsName, {})
   },
   methods: {
     getConfig (configName, param) {
@@ -97,7 +97,7 @@ export default {
       })
     },
     refreshList (param) {
-      this.getConfig(this.configName, param)
+      this.getConfig(this.queryParamsName, param)
     },
     handleAction (key) {
       console.warn('选择的的方法 ====》' + key)

package/src/base-client/components/his/XTitle/README.md

@@ -22,7 +22,7 @@ XTitle 是一个多功能的标题组件，可以显示标题文本或按钮，
 
 ### 配置参数格式
 
-XTitle 组件通过一个字符串参数进行配置 
+XTitle 组件通过一个字符串参数进行配置
 
 各部分说明：
 
@@ -37,6 +37,9 @@ XTitle 组件通过一个字符串参数进行配置
 
 ### 1. 基本标题
 
+```vue
+<x-title query-params-name="患者信息"></x-title>
+```
 ```vue
 <x-title query-params-name="患者信息-title"></x-title>
 ```
@@ -44,7 +47,7 @@ XTitle 组件通过一个字符串参数进行配置
 ### 2. 带下划线的标题
 
 ```vue
-<x-title query-params-name="患者信息-title--line"></x-title>
+<x-title query-params-name="患者信息-title-line"></x-title>
 ```
 
 ### 3. 自定义下划线颜色和宽度
@@ -53,12 +56,6 @@ XTitle 组件通过一个字符串参数进行配置
 <x-title query-params-name="患者信息-title--line-red-800"></x-title>
 ```
 
-### 4. 带点击事件的标题
-
-```vue
-<x-title query-params-name="患者信息-title-showPatient-line" @showPatient="handleShowPatient"></x-title>
-```
-
 ### 5. 按钮模式
 
 ```vue

package/src/pages/ReportGrid/index.vue

@@ -4,13 +4,14 @@
       @updateImg="updateImg"
       ref="main"
       :use-oss-for-img="false"
-      config-name="outpatientWait"
+      config-name="outpatientMedicationDispensingMainCover"
       server-name="af-his"
       :show-img-in-cell="true"
       :display-only="displayOnly"
       :edit-mode="false"
       :show-save-button="false"
       :dont-format="true"/>
+    <button @click="clickButton()"></button>
   </div>
 </template>
 
@@ -67,6 +68,9 @@ export default {
         result.push(item.exportData())
       })
       console.warn('save', result)
+    },
+    clickButton () {
+      this.findComponentByName(this, 'aaa', 10, 'parent')
     }
   }
 }

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

@@ -55,16 +55,18 @@ routerResource.newDynamicStatistics = () => import('@vue2-client/pages/NewDynami
 routerResource.example = {
   path: 'example',
   name: '示例主页面',
-  // component: () => import('@vue2-client/base-client/components/common/XDescriptions/demo.vue'),
+  // component: () => import('@vue2-client/base-client/components/common/XCalendar/demo.vue'),
+  // component: () => import('@vue2-client/base-client/components/his/XTitle/XTitle.vue'),
+  // component: () => import('@vue2-client/base-client/components/his/XCharge/XCharge.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/XReport/XReportDemo.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/base-client/components/common/XFormTable/d emo.vue'),
   // component: () => import('@vue2-client/base-client/components/common/XDatePicker/demo.vue'),
   // component: () => import('@vue2-client/base-client/components/common/XTab/XTabDemo.vue'),
   // component: () => import('@vue2-client/base-client/components/common/XRate/demo.vue'),
   // component: () => import('@vue2-client/base-client/components/common/XForm/demo.vue'),
-  component: () => import('@vue2-client/pages/WorkflowDetail/WorkFlowDemo.vue'),
+  // component: () => import('@vue2-client/pages/WorkflowDetail/WorkFlowDemo.vue'),
   // component: () => import('@vue2-client/base-client/components/common/XConversation/XConversationDemo.vue'),
   // component: () => import('@vue2-client/base-client/components/common/XButtons/XButtonDemo.vue'),
   // component: () => import('@vue2-client/base-client/components/common/XLabelSelect/XLabelSelectDemo.vue'),

package/src/utils/common.js

@@ -8,3 +8,35 @@ export async function blobValidate (data) {
     return true
   }
 }
+export function findComponentByName (instance, componentName, maxDepth = 50) {
+  // 基础判断：如果实例不存在或者已经超过最大深度，返回null
+  if (!instance || maxDepth <= 0) {
+    return null
+  }
+
+  // 检查当前实例是否有目标组件
+  try {
+    if (instance.getComponentByName && instance.getComponentByName(componentName)) {
+      return instance.getComponentByName(componentName)
+    }
+  } catch (e) {
+    console.warn('查找组件时发生错误:', e)
+  }
+
+  // 递归查找子组件
+  if (instance.$children && instance.$children.length) {
+    for (const child of instance.$children) {
+      const result = findComponentByName(child, componentName, maxDepth - 1)
+      if (result) {
+        return result
+      }
+    }
+  }
+
+  // 向上查找父组件
+  if (instance.$parent) {
+    return findComponentByName(instance.$parent, componentName, maxDepth - 1)
+  }
+
+  return null
+}

package/vue.config.js

@@ -83,7 +83,7 @@ module.exports = {
         // v3用
         // pathRewrite: { '^/api/af-system/': '/rs/', '^/api/af-iot/': '/rs/' },
         // pathRewrite: { '^/api/': '/' },
-        target: revenue,
+        target: v3Server,
         changeOrigin: true
       },
       '/devApi': {