vue2-client 1.12.100 → 1.12.101

package/package.json

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

package/src/base-client/components/common/XReport/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/his/XSidebar/XSidebar.vue

@@ -10,7 +10,7 @@
         {{ isOpen ? '›' : '‹' }}
       </div>
     </div>
-    <div class="drawer-content" v-if="isOpen">
+    <div class="drawer-content" v-show="isOpen">
       <x-report
         ref="x_report"
         :configName="queryParamsName"
@@ -56,12 +56,38 @@ export default {
   mounted () {
     // 在挂载后调整父元素宽度
     this.updateLayout(this.isOpen)
+    // 如果抽屉初始状态为打开，设置padding
+    if (this.isOpen) {
+      this.updateCardBodyPadding()
+    }
   },
   methods: {
     toggleDrawer () {
       this.isOpen = !this.isOpen
       this.$emit('on-drawer-change', this.isOpen)
       this.updateLayout(this.isOpen)
+      if (this.isOpen) {
+        this.$nextTick(() => {
+          this.updateCardBodyPadding()
+        })
+      }
+    },
+    // 更新card-body的padding
+    updateCardBodyPadding () {
+      this.$nextTick(() => {
+        const cardBody = this.$el.querySelector('.ant-card-body')
+        if (cardBody) {
+          cardBody.style.padding = '3%'
+        } else {
+          // 如果找不到元素，可能需要等待XReport完全渲染
+          setTimeout(() => {
+            const cardBody = this.$el.querySelector('.ant-card-body')
+            if (cardBody) {
+              cardBody.style.padding = '3%'
+            }
+          }, 500)
+        }
+      })
     },
     // 获取同级的其他所有a-col元素
     getSiblingCols () {
@@ -101,14 +127,14 @@ export default {
               currentCol = currentCol.parentNode
             }
             if (currentCol) {
-              // 更新当前列的宽度
+              //  更新当前列的宽度
               const drawerWidth = isOpen ? 33.3 : 2
               // 强制更新样式
               currentCol.style.cssText = `
             flex: 0 0 ${drawerWidth}% !important;
             max-width: ${drawerWidth}% !important;
             transition: all 0.3s;`
-              // 触发XTab组件重新计算宽度
+              //  触发XTab组件重新计算宽度
               this.$nextTick(() => {
                 const tabComponent = this.$el.querySelector('.ant-tabs')
                 if (tabComponent) {
@@ -116,7 +142,7 @@ export default {
                   window.dispatchEvent(new Event('resize'))
                 }
               })
-              // 更新其他列宽度
+              //  更新其他列宽度
               otherCols.forEach((col, index) => {
                 if (index < this.mainWithData.length) {
                   const widthValue = isOpen ? this.mainWithData[index].min : this.mainWithData[index].max

package/src/expression/ExpressionRunner.js

@@ -1,26 +1,26 @@
-import Program from './core/Program'
-
-export default class ExpressionRunner {
-  /**
-   * Runs an expression with parameters
-   *
-   * @param source Expression source
-   * @param params Expression parameters
-   * @returns The result of the expression
-   */
-  static async run (source, params) {
-    const delegate = this.getDelegate(source)
-    return await delegate.invoke(params)
-  }
-
-  /**
-   * Gets the delegate for the expression
-   *
-   * @param source Expression source
-   * @returns A delegate to invoke
-   */
-  static getDelegate (source) {
-    // Parse the source and return a delegate
-    return new Program(source).parse()
-  }
-}
+import Program from './core/Program'
+
+export default class ExpressionRunner {
+  /**
+   * Runs an expression with parameters
+   *
+   * @param source Expression source
+   * @param params Expression parameters
+   * @returns The result of the expression
+   */
+  static async run (source, params) {
+    const delegate = this.getDelegate(source)
+    return await delegate.invoke(params)
+  }
+
+  /**
+   * Gets the delegate for the expression
+   *
+   * @param source Expression source
+   * @returns A delegate to invoke
+   */
+  static getDelegate (source) {
+    // Parse the source and return a delegate
+    return new Program(source).parse()
+  }
+}