vue2-client 1.16.65 → 1.16.67

package/package.json

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

package/src/base-client/components/common/XFormTable/demo.vue

@@ -4,7 +4,6 @@
       title="示例表单"
       :queryParamsName="queryParamsName"
       :fixedAddForm="fixedAddForm"
-      :x-tree-config-name="xTreeConfigName"
       :externalSelectedRowKeys="selectedKeys"
       @action="action"
       @selectRow="selectRow"
@@ -27,7 +26,7 @@ export default {
   data () {
     return {
       // 查询配置文件名
-      queryParamsName: 'address_management',
+      queryParamsName: 'chargeQueryCRUD',
       // 查询配置左侧tree
       xTreeConfigName: 'addressType',
       // 新增表单固定值

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

@@ -1,5 +1,5 @@
 <template>
-  <a-row id="has_row" type="flex" :gutter="gutter" :style="isWidget ? {margin: '0px'} : {'margin-bottom': '.5rem'}">
+  <a-row id="has_row" type="flex" :gutter="dynamicGutter" :style="isWidget ? {margin: '0px'} : {'margin-bottom': '.5rem'}">
     <template v-for="(cell, cellIndex) in columns">
       <a-col
         name="trGroup"
@@ -268,6 +268,18 @@ export default {
         }
       })
       return sum
+    },
+    // 动态 gutter 配置：当包含 x-sidebar 时禁用 gutter
+    dynamicGutter () {
+      // 检查当前行是否包含 x-sidebar 组件
+      const hasXSidebar = this.columns.some(cell => {
+        if (Array.isArray(cell)) {
+          return cell.some(item => item.slotType === 'x-sidebar')
+        }
+        return cell.slotType === 'x-sidebar'
+      })
+      // 如果包含 x-sidebar，禁用 gutter 以避免影响同级组件的 padding
+      return hasXSidebar ? 0 : this.gutter
     }
   },
   data () {

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

@@ -209,7 +209,8 @@
         <a @click="tableContext.gotoUserDetail(item.dataIndex,text,record)">{{ text }}</a>
       </span>
       <span v-else-if="item.slotType === 'ellipsis'" :key="'ellipsis-' + c_index">
-        <ellipsis :length="item.slotValue" tooltip>{{ text === '' ? '--' : text }}</ellipsis>
+        <!-- <ellipsis :length="item.slotValue" tooltip>{{ text === '' ? '--' : text }}</ellipsis> -->
+        <span>{{ text === '' ? '--' : text }}</span>
       </span>
       <span v-else-if="item.slotType === 'progress'" :key="'progress-' + c_index">
         <!-- websocket-id (配置名称-字段名称-用户id-数据行id) -->
@@ -320,7 +321,16 @@ export default {
       return this.tableContext.expandedGrid ? this.$refs.expandableTable : this.$refs.simpleTable
     },
     realTableColumns () {
-      return this.tableContext.tableColumns.filter(item => item.slotType !== 'action' || !this.disableAction)
+      return this.tableContext.tableColumns.filter(item => item.slotType !== 'action' || !this.disableAction).map((item) => {
+        // todo delete 后台现在也是200 不过要清楚配置缓存 这里是为了让不清缓存也能达到争取的效果
+        if (item.slotType === 'date' || item.slotType === 'dateTime') {
+          item.width = 200
+        }
+        if (['ellipsis', 'towDecimal', 'date', 'dateTime', 'fourDecimal', 'int'].includes(item.slotType)) {
+          item.ellipsis = true
+        }
+        return item
+      })
     },
     components () {
       return {

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

@@ -135,7 +135,10 @@ export default {
 
       // 设置布局样式
       Object.entries(layoutStyles).forEach(([property, value]) => {
-        element.style.setProperty(property, value)
+        // 将驼峰命名转换为CSS标准命名
+        const cssProperty = property.replace(/([A-Z])/g, '-$1').toLowerCase()
+        element.style.setProperty(cssProperty, value)
+        console.log(`设置样式: ${cssProperty} = ${value}`, element)
       })
 
       // 恢复保护的样式
@@ -335,7 +338,7 @@ export default {
                   // 使用安全的方式设置布局样式
                   this.safeSetLayoutStyles(mainCol, {
                     flex: '1 1 auto',
-                    maxWth: `calc(100% - ${remainingWidth} - ${width})`,
+                    maxWidth: `calc(100% - ${remainingWidth} - ${width})`,
                     transition: 'all 0.3s'
                   })
                 }

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

@@ -54,13 +54,14 @@ routerResource.example = {
 path: 'example',
   name: '示例主页面',
   // component: () => import('@vue2-client/pages/WorkflowDetail/WorkFlowDemo2.vue'),
+  component: () => import('@vue2-client/base-client/components/common/XFormTable/demo.vue'),
   // component: () => import('@vue2-client/pages/WorkflowDetail/WorkFlowDemo.vue'),
   // component: () => import('@vue2-client/pages/addressSelect/addressDemo.vue'),
   // component: () => import('@vue2-client/base-client/components/common/XDescriptions/demo.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/XReportGrid/XReportDemo.vue'),
+  // component: () => import('@vue2-client/base-client/components/common/XReportGrid/XReportDemo.vue'),
   // component: () => import('@vue2-client/base-client/components/common/HIS/demo.vue'),
   // component: () => import('@vue2-client/base-client/components/common/XDatePicker/demo.vue'),
   // component: () => import('@vue2-client/base-client/components/common/XTab/XTabDemo.vue'),