vue2-client 1.15.123 → 1.15.125

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

@@ -25,11 +25,47 @@
           </template>
           <template v-else-if="cell.type === 'slot'">
             <template
-              v-if="['x-form-table','x-add-native-form','x-tree-pro', 'x-his-editor', 'x-tab', 'x-form-group', 'x-report', 'x-buttons', 'x-label-select', 'x-conversation', 'x-check-list', 'x-cardSet', 'x-collapse','x-h-descriptions', 'x-sidebar', 'x-list','x-input','x-time-line', 'x-radio','x-calendar', 'x-time-select' ,'x-checkbox', 'x-title', 'x-select', 'x-tree-rows', 'x-three-test-orders', 'x-shift-schedule','x-charge','x-questionnaire','x-import-excel-button','x-chart'].includes(cell.slotType)">
+              v-if="[
+                'x-form-table',
+                'h-form-table',
+                'x-add-native-form',
+                'x-tree-pro',
+                'x-his-editor',
+                'x-tab',
+                'h-tab',
+                'x-form-group',
+                'x-report',
+                'x-buttons',
+                'h-buttons',
+                'x-label-select',
+                'x-conversation',
+                'x-check-list',
+                'x-cardSet',
+                'x-collapse',
+                'x-h-descriptions',
+                'x-sidebar',
+                'x-list',
+                'x-input',
+                'x-time-line',
+                'x-radio',
+                'x-calendar',
+                'x-time-select',
+                'x-checkbox',
+                'x-title',
+                'x-select',
+                'x-tree-rows',
+                'x-three-test-orders',
+                'x-shift-schedule',
+                'x-charge',
+                'x-questionnaire',
+                'x-import-excel-button',
+                'x-chart'
+              ].includes(cell.slotType)">
               <component
                 :is="getComponentName(cell.slotConfig, cell.serviceName, cell.slotType)"
                 :key="cellIndex"
                 :ref="`dynamicComponent_${ cell.slotRef || cellIndex}`"
+                v-bind="cell.attrs"
                 :serviceName="cell.serviceName"
                 :serverName="cell.serviceName"
                 v-on="getEventHandlers(cell)"
@@ -63,11 +99,47 @@
           </template>
           <template v-else-if="cell.type === 'slot'">
             <template
-              v-if="['x-form-table','x-add-native-form','x-tree-pro', 'x-his-editor', 'x-tab', 'x-form-group', 'x-report', 'x-buttons', 'x-label-select', 'x-conversation', 'x-check-list', 'x-cardSet', 'x-collapse', 'x-h-descriptions', 'x-sidebar', 'x-list','x-input','x-time-line', 'x-radio','x-calendar', 'x-time-select','x-checkbox', 'x-title', 'x-select', 'x-tree-rows', 'x-three-test-orders', 'x-shift-schedule','x-charge','x-questionnaire','x-import-excel-button','x-chart'].includes(cell.slotType)">
+              v-if="[
+                'x-form-table',
+                'h-form-table',
+                'x-add-native-form',
+                'x-tree-pro',
+                'x-his-editor',
+                'x-tab',
+                'h-tab',
+                'x-form-group',
+                'x-report',
+                'x-buttons',
+                'h-buttons',
+                'x-label-select',
+                'x-conversation',
+                'x-check-list',
+                'x-cardSet',
+                'x-collapse',
+                'x-h-descriptions',
+                'x-sidebar',
+                'x-list',
+                'x-input',
+                'x-time-line',
+                'x-radio',
+                'x-calendar',
+                'x-time-select',
+                'x-checkbox',
+                'x-title',
+                'x-select',
+                'x-tree-rows',
+                'x-three-test-orders',
+                'x-shift-schedule',
+                'x-charge',
+                'x-questionnaire',
+                'x-import-excel-button',
+                'x-chart'
+              ].includes(cell.slotType)">
               <component
                 :is="getComponentName(cell.slotConfig, cell.serviceName, cell.slotType)"
                 :key="cellIndex"
                 :ref="`dynamicComponent_${ cell.slotRef || cellIndex}`"
+                v-bind="cell.attrs"
                 :serviceName="cell.serviceName"
                 :serverName="cell.serviceName"
                 v-on="getEventHandlers(cell)"
@@ -100,13 +172,16 @@ export default {
   components: {
     Upload,
     XFormTable: () => import('@vue2-client/base-client/components/common/XFormTable/XFormTable.vue'),
+    HFormTable: () => import('@vue2-client/base-client/components/common/HIS/HFormTable/HFormTable.vue'),
     XAddNativeForm: () => import('@vue2-client/base-client/components/common/XAddNativeForm/XAddNativeForm.vue'),
     XFormGroup: () => import('@vue2-client/base-client/components/common/XFormGroup/XFormGroup.vue'),
     XTreePro: () => import('@vue2-client/base-client/components/common/XTree/XTreePro.vue'),
     XHisEditor: () => import('@vue2-client/base-client/components/his/XHisEditor/XHisEditor.vue'),
     XTab: () => import('@vue2-client/base-client/components/common/XTab/XTab.vue'),
+    HTab: () => import('@vue2-client/base-client/components/common/HIS/HTab/HTab.vue'),
     XReport: () => import('@vue2-client/base-client/components/common/XReport/XReport.vue'),
     XButtons: () => import('@vue2-client/base-client/components/common/XButtons/XButtons.vue'),
+    HButtons: () => import('@vue2-client/base-client/components/common/HIS/HButtons/HButtons.vue'),
     XLabelSelect: () => import('@vue2-client/base-client/components/common/XLabelSelect/XLabelSelect.vue'),
     XConversation: () => import('@vue2-client/base-client/components/common/XConversation/XConversation.vue'),
     XCheckList: () => import('@vue2-client/base-client/components/common/XCheckList/XCheckList.vue'),
@@ -173,7 +248,6 @@ export default {
       // 计算总共有多少个Slot
       let sum = 0
       this.columns.forEach((item) => {
-        console.log('item', item)
         if (Array.isArray(item)) {
           item.forEach((cell) => {
             if (cell.type === 'slot') {
@@ -184,7 +258,6 @@ export default {
           sum++
         }
       })
-      console.log(`=总共有 ${sum} 个插槽栅格`)
       return sum
     }
   },
@@ -210,7 +283,6 @@ export default {
       deep: true,
       immediate: true,
       handler (newVal) {
-        console.log('columns变化:', JSON.parse(JSON.stringify(newVal)))
         // 使用nextTick确保DOM更新
         this.$nextTick(() => {
           this.$forceUpdate()
@@ -218,7 +290,26 @@ export default {
       }
     }
   },
-  inject: ['openDialog', 'emitEvent', 'registerComponent', 'setColSpanByName', 'setGlobalData', 'getGlobalData', 'getComponentByName', 'runLogic', 'getMixinData', 'getSelectedId', 'isInAModal', 'getConfigByName', 'getSelectedData', 'getOutEnv', 'currUser', 'isWidget', 'findComponentByName', 'closeAddReport'],
+  inject: {
+    openDialog: { default: false },
+    emitEvent: { default: false },
+    registerComponent: { default: false },
+    setColSpanByName: { default: false },
+    setGlobalData: { default: false },
+    getGlobalData: { default: false },
+    getComponentByName: { default: false },
+    runLogic: { default: false },
+    getMixinData: { default: false },
+    getSelectedId: { default: false },
+    isInAModal: { default: false },
+    getConfigByName: { default: false },
+    getSelectedData: { default: false },
+    getOutEnv: { default: false },
+    currUser: { default: false },
+    isWidget: { default: false },
+    findComponentByName: { default: false },
+    closeAddReport: { default: false }
+  },
   methods: {
     getWindow,
     isMicroAppEnv,
@@ -262,7 +353,6 @@ export default {
         this.registerComponent(cell.slotRef, this.$refs[`dynamicComponent_${cell.slotRef || cellIndex}`][0])
       }
       // 传递给祖先组件
-      console.log(`插槽组件已经初始化 slotType ${cell.slotType}，ref= dynamicComponent_${cell.slotRef || cellIndex} ， serviceName = ${cell.serviceName}`)
       const shouldInit = cell.shouldInit == null ? true : cell.shouldInit
       if (shouldInit) {
         if (cell.slotType === 'x-add-native-form') {
@@ -281,7 +371,6 @@ export default {
               }
               param = Object.assign(param, await runLogic(res.paramLogicName, selectedId, cell.serviceName))
             }
-            console.info('给表单赋值', res)
             this.$refs[`dynamicComponent_${cell.slotRef || cellIndex}`][0].init({
               serviceName: cell.serviceName,
               configName: cell.slotConfig,
@@ -369,7 +458,6 @@ export default {
       }
       cell.events.forEach(event => {
         handlers[event.type] = async (...args) => {
-          console.info('Event handled:', event.type, args)
           let func = event.customFunction
           if (func && func.startsWith('function')) {
             func = func.replace('function', 'async function')
@@ -429,17 +517,14 @@ export default {
     },
     // 把用户定义的组件，传递到整个杉格中，方便调用
     passComponentNamesToAncestor (refs) {
-      console.log('组件的keys', Object.entries(refs), refs)
       // 遍历所有 refs
       Object.entries(refs).forEach(([refKey, refValue]) => {
         // 检查 ref 是否以 dynamicComponent_ 开头
         if (refKey.startsWith('dynamicComponent_')) {
-          console.log('组件名存在')
           const componentRef = refValue[0]
           if (componentRef) {
             // 去掉前缀并获取组件名字
             const index = refKey.replace('dynamicComponent_', '') // 去掉前缀
-            console.log('注册组件', index)
             // 传递给祖先组件
             this.registerComponent(index, componentRef)
           }
@@ -483,8 +568,6 @@ export default {
         // 处理子节点样式
         this.parseNestedStyles(classConfig, childStyles)
       })
-
-      console.warn('样式配置', rootStyles, childStyles)
       return {
         rootStyles,
         childStyles
@@ -615,44 +698,46 @@ export default {
       if (!rootElement) return
 
       // 处理样式映射
-      for (const [selector, data] of styleMap.entries()) {
-        const currentSelector = parentSelector ? `${parentSelector} ${selector}` : selector
-
-        try {
-          // 查找匹配的元素
-          const elements = Array.from(rootElement.querySelectorAll(currentSelector))
-
-          if (!elements.length) continue
-
-          // 应用当前层级样式
-          if (data.styles) {
-            elements.forEach(element => {
-              if (!element) return
-
-              // 应用每个样式属性
-              Object.entries(data.styles).forEach(([property, value]) => {
-                try {
-                  element.style.setProperty(property, value, 'important')
-                } catch (err) {
-                  console.warn(`设置样式失败: ${property}=${value}`, err)
-                }
+      try {
+        for (const [selector, data] of styleMap.entries()) {
+          const currentSelector = parentSelector ? `${parentSelector} ${selector}` : selector
+
+          try {
+            // 查找匹配的元素
+            const elements = Array.from(rootElement.querySelectorAll(currentSelector))
+
+            if (!elements.length) continue
+
+            // 应用当前层级样式
+            if (data.styles) {
+              elements.forEach(element => {
+                if (!element) return
+
+                // 应用每个样式属性
+                Object.entries(data.styles).forEach(([property, value]) => {
+                  try {
+                    element.style.setProperty(property, value, 'important')
+                  } catch (err) {
+                    console.warn(`设置样式失败: ${property}=${value}`, err)
+                  }
+                })
               })
-            })
-          }
+            }
 
-          // 处理子层级
-          if (data.children && data.children.size > 0) {
-            elements.forEach(element => {
-              if (element) {
-                this.applyChildStylesOptimized(element, data.children, currentSelector)
-              }
-            })
+            // 处理子层级
+            if (data.children && data.children.size > 0) {
+              elements.forEach(element => {
+                if (element) {
+                  this.applyChildStylesOptimized(element, data.children, currentSelector)
+                }
+              })
+            }
+          } catch (err) {
+            console.warn(`处理选择器失败: ${currentSelector}`, err)
+            continue
           }
-        } catch (err) {
-          console.warn(`处理选择器失败: ${currentSelector}`, err)
-          continue
         }
-      }
+      } catch (err) {}
     }
   },
   beforeMount () {

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

@@ -1,5 +1,5 @@
 <template>
-  <a-card :bordered="false" :body-style="bodyStyle">
+  <a-card v-if="config" :bordered="false" :body-style="bodyStyle">
     <a-tabs
       :tabBarGutter="tabBarGutter"
       :activeKey="activeKey"
@@ -47,7 +47,15 @@ export default {
     XAddNativeForm: () => import('@vue2-client/base-client/components/common/XAddNativeForm/XAddNativeForm.vue'),
     XReportGrid: () => import('@vue2-client/base-client/components/common/XReportGrid/XReport.vue')
   },
-  inject: ['isInAModal', 'getSelectedId', 'getSelectedData', 'getOutEnv', 'setGlobalData', 'getGlobalData', 'generalFunction'],
+  inject: {
+      isInAModal: { default: false },
+      getSelectedId: { default: false },
+      getSelectedData: { default: false },
+      getOutEnv: { default: false },
+      setGlobalData: { default: false },
+      getGlobalData: { default: false },
+      generalFunction: { default: false },
+    },
   provide () {
     return {
       currUser: this.currUser,
@@ -86,7 +94,7 @@ export default {
         return
       }
       const oldKey = this.activeKey
-      if (this.config.changeFunc) {
+      if (this.config && this.config.changeFunc) {
         let oldRef
         let oldTabName
         let newRef
@@ -188,14 +196,12 @@ export default {
       }
       tab.events.forEach(event => {
         handlers[event.type] = (...args) => {
-          console.info('Event handled:', event.type, args)
           executeStrFunctionByContext(this.$refs[`tab_com_${tab.slotType}_${index}`][0], event.customFunction, args)
         }
       })
       return handlers
     },
     onComponentMounted (h, tab, index) {
-      console.log(`插槽组件已经初始化 slotType ${tab.slotType}，ref= tab_com_${tab.slotType}_${index} ， serviceName = ${tab.serviceName}`)
       if (tab.slotType === 'x-add-native-form') {
         // 建议表单需要主动调用初始化方法
         getConfigByName(tab.slotConfig, tab.serviceName, async (res) => {
@@ -258,7 +264,7 @@ export default {
       }
     },
     defaultActiveKey: {
-      type: String,
+      type: [String, Number],
       default: 0
     },
     // 新增compProp参数，用于穿透到动态组件