vue2-client 1.12.57 → 1.12.58-chengran

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

@@ -1,5 +1,5 @@
 <template>
-  <div>
+  <div class="reportGridMain" ref="reportGridMain">
     <template v-if="isWidget">
       <!--  插槽展示  -->
       <x-report-tr-group
@@ -194,6 +194,222 @@ export default {
 
       forceUpdate()
     },
+    applyAllStyles () {
+      // 应用组件样式
+      const component = this.$refs.reportGridMain
+      // 确保组件已经完全挂载
+      this.$nextTick(() => {
+        this.applyComponentStyles(component)
+      })
+    },
+    // 获取组件样式配置
+    async getComponentStyleConfig (componentType) {
+      try {
+        // 从配置中获取样式定义
+        const styleConfig = this.$appdata.getStylesByKey(componentType)
+        return styleConfig || {}
+      } catch (error) {
+        console.error('获取组件样式配置失败:', error)
+        return {}
+      }
+    },
+
+    // 解析组件样式配置
+    async parseComponentStyles (cell) {
+      if (!cell.class) return { rootStyles: {}, childStyles: {} }
+
+      const styleConfig = await this.getComponentStyleConfig('reportGridMain')
+      if (!styleConfig) return { rootStyles: {}, childStyles: {} }
+
+      const rootStyles = {}
+      const childStyles = new Map()
+
+      // 处理每个class配置
+      cell.class.split(' ').forEach(className => {
+        const classConfig = styleConfig[className]
+        if (!classConfig) return
+
+        // 处理根节点样式
+        Object.entries(classConfig).forEach(([key, value]) => {
+          if (!key.startsWith('*') && typeof key !== 'object') {
+            rootStyles[key] = value
+          }
+        })
+
+        // 处理子节点样式
+        this.parseNestedStyles(classConfig, childStyles)
+      })
+
+      console.warn('样式配置', rootStyles, childStyles)
+      return {
+        rootStyles,
+        childStyles
+      }
+    },
+
+    // 递归解析嵌套的样式配置
+    parseNestedStyles (config, styleMap, parentKey = '') {
+      Object.entries(config).forEach(([key, value]) => {
+        if (!key.startsWith('*')) return
+
+        const className = key.replace('*', '.')
+
+        // 如果值是对象，检查是否包含样式和子节点
+        if (typeof value === 'object') {
+          const { style = {}, children = {} } = this.separateStyleAndChildren(value)
+
+          // 创建或获取当前节点的样式配置
+          if (!styleMap.has(className)) {
+            styleMap.set(className, {
+              styles: {},
+              children: new Map()
+            })
+          }
+
+          const nodeData = styleMap.get(className)
+
+          // 合并样式
+          Object.assign(nodeData.styles, style)
+
+          // 递归处理子节点
+          this.parseNestedStyles(children, nodeData.children, className)
+        }
+      })
+    },
+
+    // 分离样式属性和子节点配置
+    separateStyleAndChildren (obj) {
+      const style = {}
+      const children = {}
+
+      Object.entries(obj).forEach(([key, value]) => {
+        if (key.startsWith('*')) {
+          // 子节点配置
+          children[key] = value
+        } else {
+          // 样式属性
+          style[key] = value
+        }
+      })
+
+      return { style, children }
+    },
+
+    // 应用组件样式
+    async applyComponentStyles (component) {
+      if (!component) return
+
+      const { rootStyles, childStyles } = await this.parseComponentStyles(this.activatedConfig)
+
+      // 应用根节点样式
+      if (Object.keys(rootStyles).length > 0) {
+        Object.entries(rootStyles).forEach(([property, value]) => {
+          component.style.setProperty(property, value, 'important')
+        })
+      }
+
+      // 如果没有子节点样式,直接返回
+      if (childStyles.size === 0) return
+
+      let retryCount = 0
+      const maxRetries = 5
+      const retryInterval = 100 // 100ms
+
+      const applyStyles = () => {
+        this.applyChildStylesOptimized(component, childStyles)
+      }
+
+      // 首次应用样式
+      applyStyles()
+
+      // 创建重试机制
+      const retryApplyStyles = () => {
+        if (retryCount >= maxRetries) return
+
+        setTimeout(() => {
+          applyStyles()
+          retryCount++
+          retryApplyStyles()
+        }, retryInterval)
+      }
+
+      // 开始重试
+      retryApplyStyles()
+
+      // 创建 MutationObserver 用于动态内容
+      const observer = new MutationObserver((mutations) => {
+        // 检查是否有新增节点
+        const hasNewNodes = mutations.some(mutation =>
+          mutation.type === 'childList' && mutation.addedNodes.length > 0
+        )
+
+        if (hasNewNodes) {
+          applyStyles()
+        }
+      })
+
+      // 配置 observer
+      observer.observe(component, {
+        childList: true,
+        subtree: true,
+        attributes: false
+      })
+
+      // 3秒后停止观察
+      setTimeout(() => {
+        observer.disconnect()
+      }, 3000)
+
+      // 组件销毁时清理
+      this.$once('hook:beforeDestroy', () => {
+        observer.disconnect()
+      })
+    },
+
+    // 优化后的子节点样式应用方法
+    applyChildStylesOptimized (rootElement, styleMap, parentSelector = '') {
+      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)
+                }
+              })
+            })
+          }
+
+          // 处理子层级
+          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
+        }
+      }
+    },
   },
   created () {
     console.log('>>>> xreportdesign 渲染', JSON.stringify(this.config, null, 2))
@@ -209,6 +425,7 @@ export default {
       this.activatedConfig = this.config
       this.render = true
     }
+
     this.activatedConfig.columns.forEach(row => {
       if (row[0] && row[0].type && row[0].type === 'list' && row[0].listLength === 1) {
         row.forEach(cell => {
@@ -218,6 +435,7 @@ export default {
     })
   },
   mounted () {
+    this.applyAllStyles()
   },
   watch: {
     config: {

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

@@ -25,7 +25,7 @@
           </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'].includes(cell.slotType)">
+              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'].includes(cell.slotType)">
               <component
                 :is="getComponentName(cell.slotConfig, cell.serviceName, cell.slotType)"
                 :key="cellIndex"
@@ -60,7 +60,7 @@
           </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'].includes(cell.slotType)">
+              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'].includes(cell.slotType)">
               <component
                 :is="getComponentName(cell.slotConfig, cell.serviceName, cell.slotType)"
                 :key="cellIndex"
@@ -108,6 +108,7 @@ export default {
     XCollapse: () => import('@vue2-client/base-client/components/common/XCollapse/XCollapse.vue'),
     XHDescriptions: () => import('@vue2-client/base-client/components/his/XHDescriptions/XHDescriptions.vue'),
     XSidebar: () => import('@vue2-client/base-client/components/his/XSidebar/XSidebar.vue'),
+    XList: () => import('@vue2-client/base-client/components/his/XList/XList.vue'),
   },
   props: {
     // 每一行的配置

package/src/base-client/components/common/XReportGrid/index.js

@@ -1,3 +1,3 @@
-import XReport from './XReport'
-
-export default XReport
+import XReport from './XReport'
+
+export default XReport

package/src/base-client/components/common/XReportGrid/index.md

@@ -1,44 +1,44 @@
-# XReport
-
-动态报表控件，根据JSON配置生成一个完整的报表
-
-
-## 何时使用
-
-当需要一个动态生成的报表时
-
-
-引用方式：
-
-```javascript
-import XReport from '@vue2-client/base-client/components/XReport/XReport'
-
-export default {
-    components: {
-      XReport
-    }
-}
-```
-
-## API
-
-| 参数              | 说明   | 类型    | 默认值       |
-|-----------------|------|-------|-----------|
-| configName | 配置文件名 | String | 无（必填）     |
-| activatedSlotName| 激活插槽名 | String | undefined |
-| files | 文件列表 | Array | []        |
-| authority | 权限控制 | String | user |
-| localConfig | 本地配置 | Object | undefined |
-| dontFormat | 禁止已经格式化后的配置格式化| Boolean | false|
-| configData | 配置中的Data | Object | undefined |
-## 例子1
-----
-```vue
-<XReport :config-name="'test_tableConfig'" :activated-slot-name="'test_tableConfig_slot'"/>
-```
-## 注意事项
-
-> 在某些情况下，比如手机端，只需要输入表格中一部分的内容。
-> 可以将这部分内容作为插槽，并在activatedSlotName中填写插槽名。
-> 则会在设计页面仅展示插槽中的输入项，并在预览窗口中，根据configName中的配置，
-> 渲染出来完整的表格
+# XReport
+
+动态报表控件，根据JSON配置生成一个完整的报表
+
+
+## 何时使用
+
+当需要一个动态生成的报表时
+
+
+引用方式：
+
+```javascript
+import XReport from '@vue2-client/base-client/components/XReport/XReport'
+
+export default {
+    components: {
+      XReport
+    }
+}
+```
+
+## API
+
+| 参数              | 说明   | 类型    | 默认值       |
+|-----------------|------|-------|-----------|
+| configName | 配置文件名 | String | 无（必填）     |
+| activatedSlotName| 激活插槽名 | String | undefined |
+| files | 文件列表 | Array | []        |
+| authority | 权限控制 | String | user |
+| localConfig | 本地配置 | Object | undefined |
+| dontFormat | 禁止已经格式化后的配置格式化| Boolean | false|
+| configData | 配置中的Data | Object | undefined |
+## 例子1
+----
+```vue
+<XReport :config-name="'test_tableConfig'" :activated-slot-name="'test_tableConfig_slot'"/>
+```
+## 注意事项
+
+> 在某些情况下，比如手机端，只需要输入表格中一部分的内容。
+> 可以将这部分内容作为插槽，并在activatedSlotName中填写插槽名。
+> 则会在设计页面仅展示插槽中的输入项，并在预览窗口中，根据configName中的配置，
+> 渲染出来完整的表格

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

@@ -1,110 +1,110 @@
-<template>
-  <tbody class="reportTable">
-    <template v-for="(slotRow, slotRowIndex) in activatedConfig.columns">
-      <!--   非动态行   -->
-      <template v-if="slotRow[0].type !== 'inputColumns'">
-        <!--   非展示页   -->
-        <template v-if="!forDisplay">
-          <x-report-tr-group :key="'header' + slotRowIndex" :columns="slotRow" :config-data="activatedConfig.data"></x-report-tr-group>
-        </template>
-        <!--   展示页   -->
-        <template v-else>
-          <x-report-tr-group :key="'header' + slotRowIndex" :columns="slotRow" :config-data="activatedConfig.data" :display="true"></x-report-tr-group>
-        </template>
-      </template>
-      <!--   动态行   -->
-      <template v-else>
-        <!--   非展示页   -->
-        <template v-if="!forDisplay">
-          <x-report-tr-group :key="'slotRow' + slotRowIndex" :columns="slotRow" :config-data="activatedConfig.data" :input-columns-button="true" :input-columns="true"></x-report-tr-group>
-        </template>
-        <!--   展示页   -->
-        <template v-else>
-          <x-report-tr-group
-            :columns="slotRow[0].definition"
-            :config-data="{arr: activatedConfig.data[slotRow[0].dataIndex]}"
-            :input-columns="true"
-            v-for="(item, definitionIndex) in activatedConfig.data[slotRow[0].dataIndex]"
-            :input-columns-definition-index="definitionIndex"
-            :display="true"
-            :key="slotRow[0].dataIndex + definitionIndex + slotRowIndex"></x-report-tr-group>
-        </template>
-      </template>
-    </template>
-  </tbody>
-</template>
-
-<script>
-import XReportTrGroup from '@vue2-client/base-client/components/common/XReportTrGroup'
-import { getConfigByName } from '@vue2-client/services/api/common'
-
-export default {
-  name: 'XReportSlot',
-  props: {
-    config: {
-      type: Object,
-      require: true
-    },
-    forDisplay: {
-      type: Boolean,
-      default: false
-    },
-    slotConfigName: {
-      type: String,
-      default: undefined
-    }
-  },
-  components: {
-    XReportTrGroup
-  },
-  data () {
-    return {
-      data: this.config.data,
-      slotConfig: undefined,
-      render: false,
-      activatedConfig: {},
-      slotScan: {},
-    }
-  },
-  methods: {
-    // async getAllData() {
-    //   let db = await idb.open('db-name', 1)
-    //   let tx = db.transaction('objectStoreName', 'readonly')
-    //   let store = tx.objectStore('objectStoreName')
-    //   let allSavedItems = await store.getAll()
-    //   console.log(allSavedItems)
-    //   db.close()
-    // }
-  },
-  beforeMount () {
-    if (this.slotConfigName) {
-      getConfigByName(this.slotConfigName, undefined, res => {
-        this.slotConfig = res
-        res.data = { ...res.data, ...this.config.data }
-        this.config.data = res.data
-        this.activatedConfig = res
-        this.render = true
-      })
-    } else {
-      this.activatedConfig = this.config
-      this.render = true
-    }
-  },
-  watch: {
-    config: {
-      deep: true,
-      handler (newVal) {
-      }
-    }
-  }
-}
-</script>
-
-<style lang="less" scoped>
-.reportTable {
-  width: 100%;
-  border-collapse: collapse;
-  table-layout:fixed;
-  word-break:break-all;
-}
-</style>
+<template>
+  <tbody class="reportTable">
+    <template v-for="(slotRow, slotRowIndex) in activatedConfig.columns">
+      <!--   非动态行   -->
+      <template v-if="slotRow[0].type !== 'inputColumns'">
+        <!--   非展示页   -->
+        <template v-if="!forDisplay">
+          <x-report-tr-group :key="'header' + slotRowIndex" :columns="slotRow" :config-data="activatedConfig.data"></x-report-tr-group>
+        </template>
+        <!--   展示页   -->
+        <template v-else>
+          <x-report-tr-group :key="'header' + slotRowIndex" :columns="slotRow" :config-data="activatedConfig.data" :display="true"></x-report-tr-group>
+        </template>
+      </template>
+      <!--   动态行   -->
+      <template v-else>
+        <!--   非展示页   -->
+        <template v-if="!forDisplay">
+          <x-report-tr-group :key="'slotRow' + slotRowIndex" :columns="slotRow" :config-data="activatedConfig.data" :input-columns-button="true" :input-columns="true"></x-report-tr-group>
+        </template>
+        <!--   展示页   -->
+        <template v-else>
+          <x-report-tr-group
+            :columns="slotRow[0].definition"
+            :config-data="{arr: activatedConfig.data[slotRow[0].dataIndex]}"
+            :input-columns="true"
+            v-for="(item, definitionIndex) in activatedConfig.data[slotRow[0].dataIndex]"
+            :input-columns-definition-index="definitionIndex"
+            :display="true"
+            :key="slotRow[0].dataIndex + definitionIndex + slotRowIndex"></x-report-tr-group>
+        </template>
+      </template>
+    </template>
+  </tbody>
+</template>
+
+<script>
+import XReportTrGroup from '@vue2-client/base-client/components/common/XReportTrGroup'
+import { getConfigByName } from '@vue2-client/services/api/common'
+
+export default {
+  name: 'XReportSlot',
+  props: {
+    config: {
+      type: Object,
+      require: true
+    },
+    forDisplay: {
+      type: Boolean,
+      default: false
+    },
+    slotConfigName: {
+      type: String,
+      default: undefined
+    }
+  },
+  components: {
+    XReportTrGroup
+  },
+  data () {
+    return {
+      data: this.config.data,
+      slotConfig: undefined,
+      render: false,
+      activatedConfig: {},
+      slotScan: {},
+    }
+  },
+  methods: {
+    // async getAllData() {
+    //   let db = await idb.open('db-name', 1)
+    //   let tx = db.transaction('objectStoreName', 'readonly')
+    //   let store = tx.objectStore('objectStoreName')
+    //   let allSavedItems = await store.getAll()
+    //   console.log(allSavedItems)
+    //   db.close()
+    // }
+  },
+  beforeMount () {
+    if (this.slotConfigName) {
+      getConfigByName(this.slotConfigName, undefined, res => {
+        this.slotConfig = res
+        res.data = { ...res.data, ...this.config.data }
+        this.config.data = res.data
+        this.activatedConfig = res
+        this.render = true
+      })
+    } else {
+      this.activatedConfig = this.config
+      this.render = true
+    }
+  },
+  watch: {
+    config: {
+      deep: true,
+      handler (newVal) {
+      }
+    }
+  }
+}
+</script>
+
+<style lang="less" scoped>
+.reportTable {
+  width: 100%;
+  border-collapse: collapse;
+  table-layout:fixed;
+  word-break:break-all;
+}
+</style>

package/src/base-client/components/common/XReportSlot/index.js

@@ -1,3 +1,3 @@
-import XReportSlot from './XReportSlot.vue'
-
-export default XReportSlot
+import XReportSlot from './XReportSlot.vue'
+
+export default XReportSlot