vue2-client 1.8.366 → 1.8.368

package/package.json

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

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

@@ -17,7 +17,7 @@
             <!-- 详情区域 -->
             <div class="row">
               <div class="content">
-                <a-descriptions :column="desColumn" size="small">
+                <a-descriptions :column="desColumn" style="padding-left: 2%">
                   <slot name="descriptionsContent" :details="details"/>
                 </a-descriptions>
               </div>

package/src/base-client/components/common/XTree/XTreePro.vue

@@ -5,7 +5,7 @@
         <a-col span="16" :offset="2">
           <span>{{ config.title }}</span>
         </a-col>
-        <a-col span="4" :offset="2" v-if="treeDisplaySwitch">
+        <a-col span="1" :offset="2" v-if="treeDisplaySwitch">
           <a-icon :type="treeDisplayConfig.showTree? 'caret-down':'caret-left'" :style="{color: treeDisplayConfig.buttonColor}" @click="treeDisplayConfig.showTree=!treeDisplayConfig.showTree"/>
         </a-col>
       </a-row>
@@ -50,6 +50,7 @@
               :item-size="40"
               :auto-expand-parent="true"
               @check-change="handleCheckChange"
+              @node-click="handleNodeClick"
               :filter-node-method="filterNode"
               :props="props"
             >

package/src/pages/XReportGridView/XReport.vue

@@ -129,7 +129,7 @@ export default {
     // 只做展示
     displayOnly: {
       type: Boolean,
-      default: false
+      default: true
     },
     // 表格没有边距
     noPadding: {
@@ -149,7 +149,7 @@ export default {
     // 是否展示保存按钮
     showSaveButton: {
       type: Boolean,
-      default: true
+      default: false
     },
     // 是否将组件注册到外层提供的容器中，方便外侧统一保存
     registerMap: {

package/src/pages/XReportGridView/XReportDemo.vue

@@ -4,7 +4,7 @@
       @updateImg="updateImg"
       ref="main"
       :use-oss-for-img="false"
-      config-name="ceshi"
+      config-name="cs1"
       server-name="af-system"
       :show-img-in-cell="true"
       :display-only="displayOnly"

package/src/pages/XReportGridView/XReportTrGroup.vue

@@ -12,7 +12,15 @@
           :span="cell.colSpan ? cell.colSpan * 2 : undefined">
           <!-- 插槽渲染 -->
           <template v-if="cell.type === 'slot'">
-            <component :is="getComponentName(cell.slotConfig, cell.serviceName)" :key="cellIndex" :serviceName="cell.serviceName" :queryParamsName="cell.slotConfig" />
+            <template v-if="cell.slotType === 'x-form-table'">
+              <component :is="getComponentName(cell.slotConfig, cell.serviceName, cell.slotType)" :key="cellIndex" :serviceName="cell.serviceName" :queryParamsName="cell.slotConfig" />
+            </template>
+          </template>
+          <!-- button 按钮渲染 -->
+          <template v-else-if="cell.type === 'button'">
+            <a-button @[cell.eventType]="() => executeCustomFunction(cell.customFunction)">
+              {{ cell.buttonName }}
+            </a-button>
           </template>
           <template v-else-if="cell.type === 'column'">
             <template v-if="cell.customFunction">
@@ -459,10 +467,21 @@ export default {
     }
   },
   methods: {
-    async getComponentName (queryParamsName, serviceName) {
+    executeCustomFunction (funcStr) {
+      try {
+        // 使用 Function 构造器创建函数
+        // eslint-disable-next-line no-new-func
+        const func = new Function('return ' + funcStr)()
+        // 执行函数
+        func.call(this)
+      } catch (error) {
+        console.error('Error executing custom function:', error)
+      }
+    },
+    getComponentName (queryParamsName, serviceName, componentName) {
       // const config = await getConfigByName(queryParamsName, serviceName)
       // const componentName = config.$globalProp.type
-      return 'x-form-table'
+      return componentName
     },
     updateImg (data) {
       this.$emit('updateImg', data)

package/src/pages/XTab/XTab.vue

@@ -1,11 +1,10 @@
 <template>
   <div>
-    <a-tabs v-model="activeKey">
+    <a-tabs default-active-key="0">
       <a-tab-pane
         v-for="(tab, index) in config"
         :key="index"
         :tab="tab.title"
-        :keyProp="'key'"
       >
         <component :is="tab.slotType" :key="index" :serviceName="tab.serviceName" :queryParamsName="tab.slotConfig" />
       </a-tab-pane>
@@ -14,49 +13,68 @@
 </template>
 
 <script>
-import { Tabs, Button } from 'ant-design-vue'
 import XFormTable from '@vue2-client/base-client/components/common/XFormTable/XFormTable'
 import { getConfigByName } from '@vue2-client/services/api/common'
 
 export default {
   name: 'XTab',
+  components: {
+    XFormTable,
+  },
+  data () {
+    return {
+      activeKey: 0,
+      // 配置
+      config: undefined,
+    }
+  },
+  methods: {
+    initConfig () {
+      if (this.configName) {
+        this.getConfig()
+      } else if (this.localConfig) {
+        this.config = this.localConfig.data
+        console.log('>>>> this.config: ', JSON.stringify(this.config))
+      }
+    },
+    getConfig () {
+      getConfigByName(this.configName, this.serverName, res => {
+        this.config = res.data
+      })
+    }
+  },
   props: {
     // 配置名
     configName: {
       type: String,
-      required: true
+      default: undefined
     },
     serverName: {
       type: String,
-      required: true
-    }
+      default: undefined
+    },
+    // 本地配置，调试用
+    localConfig: {
+      type: Object,
+      default: undefined
+    },
   },
   watch: {
     configName: {
       deep: true,
       immediate: true,
       handler (val) {
-        if (val) {
-          getConfigByName(this.configName, this.serverName, res => {
-            this.config = res.data
-          })
-        }
+        this.initConfig()
       }
-    }
-  },
-  components: {
-    XFormTable,
-    'a-tabs': Tabs,
-    'a-tab-pane': Tabs.TabPane,
-    'a-button': Button,
-  },
-  data () {
-    return {
-      activeKey: '1',
-      // 配置
-      config: undefined,
-    }
+    },
+    // 如果本地配置更改了，重新初始化
+    localConfig: {
+      deep: true,
+      immediate: true,
+      handler (val) {
+        this.initConfig()
+      }
+    },
   },
-  methods: {},
 }
 </script>