vue2-client 1.12.56 → 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/XTable/XTable.vue

@@ -149,7 +149,14 @@
     </a-row>
     <!--  如果当前是表格模式  -->
     <template v-if="isTableMode">
-      <x-table-wrapper ref="table"></x-table-wrapper>
+      <x-table-wrapper ref="table">
+        <template slot="footer">
+          <slot
+            name="footer"
+            :selectedRowKeys="selectedRowKeys"
+            :selectedRows="selectedRows"></slot>
+        </template>
+      </x-table-wrapper>
     </template>
     <!--  如果当前是看板模式  -->
     <template v-else>

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

@@ -0,0 +1,80 @@
+<template>
+  <div class="list-wrapper" @click="handleClick">
+    <a-list size="large" :data-source="data" itemLayout="horizontal" class="list-container">
+      <a-list-item slot="renderItem" slot-scope="item" class="list-item">
+        {{ item.number }} {{ item.name }}
+      </a-list-item>
+    </a-list>
+  </div>
+</template>
+
+<script>
+
+export default {
+  name: 'XList',
+  data () {
+    return {
+      data: []
+    }
+  },
+  props: {
+    listData: {
+      type: Array,
+      default: []
+    }
+  },
+  methods: {
+    handleClick () {
+      this.$emit('listClick', {})
+    }
+  },
+  watch: {
+    listData: {
+      handler () {
+        this.$forceUpdate()
+      },
+      deep: true
+    }
+  }
+}
+</script>
+
+<style scoped>
+.list-wrapper {
+  max-height: 240px;
+  overflow-y: auto;
+  cursor: pointer;
+}
+
+.list-container {
+  width: 100%;
+}
+
+.list-item {
+  height: 35px;
+  border-radius: 6px;
+  background-color: #F4F4F4;
+  padding: 8px 15px 7px 15px;
+  font-size: 16px;
+  display: flex;
+  align-items: center;
+  width: 100%;
+  border: 1px solid #D9D9D9;
+  box-sizing: border-box;
+  margin-bottom: 16px;
+}
+
+/* 自定义滚动条样式 */
+.list-wrapper::-webkit-scrollbar {
+  width: 6px;
+}
+
+.list-wrapper::-webkit-scrollbar-thumb {
+  background-color: #d9d9d9;
+  border-radius: 3px;
+}
+
+.list-wrapper::-webkit-scrollbar-track {
+  background-color: #f0f0f0;
+}
+</style>

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

@@ -167,8 +167,8 @@ export default {
   transform: translateY(-50%);
   width: 24px;
   height: 48px;
-  background-color: #fff;
   cursor: pointer;
+  background-color: rgba(255, 255, 255, 0) !important;
   display: flex;
   align-items: center;
   justify-content: center;
@@ -194,6 +194,5 @@ export default {
 }
 .drawer-content {
   height: 100%;
-  overflow-y: auto;
 }
 </style>

package/src/base-client/plugins/AppData.js

@@ -118,7 +118,7 @@ const GetAppDataService = {
     return object[key]
   },
   getStylesByKey (key) {
-    const str = localStorage.getItem(process.env.VUE_APP_STYLES_KEY)
+    const str = localStorage.getItem(process.env.VUE_APP_WEB_STYLES_KEY)
     const object = JSON.parse(str)
     return object[key]
   },

package/src/base-client/plugins/GetLoginInfoService.js

@@ -144,7 +144,7 @@ const loginGen = async function (response) {
 
   Vue.$store.commit('account/setLogin', login)
 }
-const GetLoginInfoService = {
+const  GetLoginInfoService = {
   install (Vue) {
     // 给vue增添对话框显示方法
     Vue.$login = Vue.prototype.$login = GetLoginInfoService

package/src/components/FilePreview/FilePreview.vue

@@ -100,8 +100,8 @@ export default {
   methods: {
     preview () {
       if (this.compatible === 'OA') {
-        this.previewDocService = 'http://aote-office.8866.org:8406'
-        this.fileServer = 'http://aote-office.8866.org:32510/onlinePreview?url='
+        this.fileServer = 'http://aote-office.8866.org:8406'
+        this.previewDocService = 'http://aote-office.8866.org:32510/onlinePreview?url='
         this.previewGen()
         return
       }
@@ -130,11 +130,6 @@ export default {
         this.playerOptions.sources[0].src = this.path
         this.showImagePreview = 3
       } else {
-        if (this.path.startsWith('http')) {
-          this.previewDocUrl = this.path
-          this.showImagePreview = 1
-          return
-        }
         const previewDocUrl = this.previewDocService + encodeURIComponent(Base64.encode(this.fileServer + this.path))
         if (this.previewDocUrl !== previewDocUrl) {
           this.previewDocLoading = true

package/src/components/STable/index.js

@@ -368,7 +368,6 @@ export default {
       const isCurrentRow = isRowKeySequence
         ? this.clickedRowKey === index
         : this.clickedRowKey === record[this.rowKey]
-      console.log(record, index, this.rowKey, isCurrentRow)
       return {
         on: {
           click: () => this.handleRowClick(record, index)