vue2-client 1.14.95 → 1.14.97

package/package.json

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

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

@@ -362,6 +362,11 @@ export default {
       type: Number,
       default: 80
     },
+    // 是否禁用右侧操作行为
+    disableAction: {
+      type: Boolean,
+      default: false
+    },
     // 额外参数，用于控制组件行为
     extraParams: {
       type: Object,
@@ -541,6 +546,7 @@ export default {
             env: this.env,
             form: this.$refs.xForm.form,
             summaryUpdate: true,
+            disableAction: this.disableAction,
             ...res
           })
           if (this.realQueryConfig?.funcData?.pageMounted) {

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

@@ -151,6 +151,7 @@
     <template v-if="isTableMode">
       <x-table-wrapper
         ref="table"
+        :disableAction="disableAction"
         @rowClick="handleRowClick"
         @beforeDataChange="beforeDataChange"
         @expand="onExpand">
@@ -458,7 +459,9 @@ export default {
       selectRowMode: 'default',
       tableSize: 'default',
       clearSelectRowAfterQuery: false,
-      selectedRowModalVisible: false
+      selectedRowModalVisible: false,
+      // 是否禁用右侧操作行为
+      disableAction: false
     }
   },
   props: {
@@ -739,7 +742,8 @@ export default {
         printTemplate = 'DEFAULT_CRUD_PRINT_TEMPLATE',
         selectRowMode = 'default',
         tableSize = 'default',
-        clearSelectRowAfterQuery = false
+        clearSelectRowAfterQuery = false,
+        disableAction = false
       } = params
       this.showSummary = Object.keys(tableSummaryMap).length > 0
       if (this.showSummary) {
@@ -792,6 +796,7 @@ export default {
       this.selectRowMode = selectRowMode
       this.tableSize = tableSize
       this.clearSelectRowAfterQuery = clearSelectRowAfterQuery
+      this.disableAction = disableAction
       if (this.chartsConfigArray.length > 0) {
         // 循环chartsConfigArray，将每个配置的数据请求参数赋值给requestParameters
         this.chartsConfigArray.forEach(item => {

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

@@ -5,7 +5,7 @@
     ref="expandableTable"
     :id="tableContext.uniqueId"
     :alert="true"
-    :columns="tableContext.tableColumns"
+    :columns="realTableColumns"
     :data="loadData()"
     :rowKey="tableContext.rowKey"
     :showSummary="tableContext.showSummary"
@@ -24,7 +24,7 @@
     @rowClick="handleRowClick"
   >
     <template
-      v-for="(item, c_index) in tableContext.tableColumns"
+      v-for="(item, c_index) in realTableColumns"
       :slot="item.dataIndex"
       slot-scope="text, record, index">
       <template v-if="tableContext.isEditMode && getFromItem(item.dataIndex,text, record, index)">
@@ -140,7 +140,7 @@
     ref="simpleTable"
     :id="tableContext.uniqueId"
     :alert="true"
-    :columns="tableContext.tableColumns"
+    :columns="realTableColumns"
     :data="loadData()"
     :rowKey="tableContext.rowKey"
     :showSummary="tableContext.showSummary"
@@ -158,7 +158,7 @@
     @beforeDataChange="beforeDataChange"
   >
     <template
-      v-for="(item, c_index) in tableContext.tableColumns"
+      v-for="(item, c_index) in realTableColumns"
       :slot="item.dataIndex"
       slot-scope="text, record, index">
       <template v-if="tableContext.isEditMode && getFromItem(item.dataIndex,text, record, index)">
@@ -287,6 +287,9 @@ export default {
     // 获取当前活动的表格实例
     activeTable () {
       return this.tableContext.expandedGrid ? this.$refs.expandableTable : this.$refs.simpleTable
+    },
+    realTableColumns () {
+      return this.tableContext.tableColumns.filter(item => item.slotType !== 'action' || !this.disableAction)
     }
   },
   props: {
@@ -294,6 +297,10 @@ export default {
       type: Boolean,
       required: false,
       default: false
+    },
+    disableAction: {
+      type: Boolean,
+      default: false
     }
   },
   inject: ['tableContext'],
@@ -384,11 +391,11 @@ export default {
       if (aa) {
         const tempConfig = JSON.parse(JSON.stringify(aa))
         // 如果找到了字段
-        const ColumnIndex = this.tableContext.tableColumns.findIndex(item => item.dataIndex === model)
+        const ColumnIndex = this.realTableColumns.findIndex(item => item.dataIndex === model)
         // 并且表单项是日期框
         if (ColumnIndex !== -1 && ['yearPicker', 'monthPicker', 'datePicker', 'rangePicker'].includes(tempConfig.type)) {
           // 修改他的列宽
-          this.tableContext.tableColumns[ColumnIndex].width = 220
+          this.realTableColumns[ColumnIndex].width = 220
         }
         // 如果有检验规则检验是数字
         if (ColumnIndex !== -1 && ['number', 'integer', 'float'].includes(tempConfig?.rule?.type)) {