vue2-client 1.16.64 → 1.16.66

package/package.json

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

package/src/base-client/components/common/XForm/XFormItem.vue

@@ -93,7 +93,7 @@
       <a-select
         v-if="!attr.lazyLoad || attr.lazyLoad === 'false'"
         v-model="form[attr.model]"
-        :disabled="disabled"
+        :disabled="disabled || readOnly"
         @change="handleSelectChange"
         :filter-option="filterOption"
         :getPopupContainer="getPopupContainer"
@@ -166,7 +166,7 @@
       <a-select
         v-else
         v-model="form[attr.model]"
-        :disabled="disabled"
+        :disabled="disabled || readOnly"
         @change="handleSelectChange"
         :filter-option="filterOption"
         :getPopupContainer="getPopupContainer"
@@ -193,6 +193,7 @@
       </a-select>
     </a-form-model-item>
     <a-form-model-item
+      :disabled="disabled || readOnly"
       v-bind="bindOther"
       :rules="rules"
       v-else-if="attr.showMode === 'radioGroup'"

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/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

@@ -60,13 +60,13 @@ path: 'example',
   // 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/HIS/demo.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'),
   // 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/base-client/components/his/XTimeSelect/XTimeSelectDemo.vue'),
-  // component: () => import('@vue2-client/base-client/components/his/XCharge/XChargeDemo.vue'),
   // component: () => import('@vue2-client/base-client/components/his/XImportExcelButton/XFrontImportExcelDemo.vue'),
   // component: () => import('@vue2-client/pages/WorkflowDetail/WorkFlowDemo.vue'),
   // component: () => import('@vue2-client/pages/WorkflowDetail/WorkFlowDemo.vue'),