vue2-client 1.15.34 → 1.15.36

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

@@ -1,51 +1,51 @@
-<script>
-import { Ellipsis } from '@vue2-client/components'
-import { executeStrFunctionByContext } from '@vue2-client/utils/runEvalFunction'
-import { getConfigByNameAsync, runLogic } from '@vue2-client/services/api/common'
-
-export default {
-  name: 'CustomFuncCel',
-  methods: {
-    runLogic,
-    async fetchSlotValue () {
-      try {
-        let func = this.item.slotCustomFunction
-        if (this.item.slotCustomFunction.startsWith('function')) {
-          func = `async ${func}`
-        }
-        this.slotValueResult = await executeStrFunctionByContext(this, func, [this.text, this.record, this.localDataSource, this.index, runLogic, getConfigByNameAsync])
-        this.loading = false
-      } catch (error) {
-        console.error('Error fetching slot value:', error)
-      }
-    }
-  },
-  mounted () {
-    this.fetchSlotValue()
-  },
-  data: () => {
-    return {
-      slotValueResult: '',
-      loading: true
-    }
-  },
-  components: { Ellipsis },
-  // eslint-disable-next-line
-  props: ['item', 'text', 'record', 'index', 'localDataSource'],
-}
-</script>
-
-<template>
-  <span>
-    <template v-if="item.slotValue">
-      <ellipsis :length="item.slotValue" tooltip>{{ loading ? text : slotValueResult }}</ellipsis>
-    </template>
-    <template v-else>
-      {{ loading ? text : slotValueResult }}
-    </template>
-  </span>
-</template>
-
-<style scoped lang="less">
-
-</style>
+<script>
+import { Ellipsis } from '@vue2-client/components'
+import { executeStrFunctionByContext } from '@vue2-client/utils/runEvalFunction'
+import { getConfigByNameAsync, runLogic } from '@vue2-client/services/api/common'
+
+export default {
+  name: 'CustomFuncCel',
+  methods: {
+    runLogic,
+    async fetchSlotValue () {
+      try {
+        let func = this.item.slotCustomFunction
+        if (this.item.slotCustomFunction.startsWith('function')) {
+          func = `async ${func}`
+        }
+        this.slotValueResult = await executeStrFunctionByContext(this, func, [this.text, this.record, this.localDataSource, this.index, runLogic, getConfigByNameAsync])
+        this.loading = false
+      } catch (error) {
+        console.error('Error fetching slot value:', error)
+      }
+    }
+  },
+  mounted () {
+    this.fetchSlotValue()
+  },
+  data: () => {
+    return {
+      slotValueResult: '',
+      loading: true
+    }
+  },
+  components: { Ellipsis },
+  // eslint-disable-next-line
+  props: ['item', 'text', 'record', 'index', 'localDataSource'],
+}
+</script>
+
+<template>
+  <span>
+    <template v-if="item.slotValue">
+      <ellipsis :length="item.slotValue" tooltip>{{ loading ? text : slotValueResult }}</ellipsis>
+    </template>
+    <template v-else>
+      {{ loading ? text : slotValueResult }}
+    </template>
+  </span>
+</template>
+
+<style scoped lang="less">
+
+</style>

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

@@ -1,282 +1,282 @@
-<script>
-import { exportData, getConfigByNameAsync, queryAll } from '@vue2-client/services/api/common'
-import { formatDate } from '@vue2-client/utils/util'
-import { exportJson } from '@vue2-client/utils/excel/Export2Excel'
-import { Ellipsis } from '@vue2-client/components'
-import PrintBill from '@vue2-client/base-client/components/common/XPrint/PrintBill.vue'
-import hiPrintCss from '@vue2-client/base-client/components/common/XPrint/css/hiPrintCss'
-
-export default {
-  name: 'ExportExcel',
-  components: { PrintBill, Ellipsis },
-  data () {
-    return {
-      // 导出列选择
-      exportModalVisible: false,
-      summaryLoadingShow: false,
-      tipMsg: '正在获取汇总数据。。。',
-      exportType: false,
-      type: 'export',
-      selectedExportColumns: [],
-      exportSelectedRows: false,
-      allColumnsSelected: false,
-      exportFileName: '',
-      confirmLoading: null,
-      printData: {}
-    }
-  },
-  inject: ['tableContext'],
-  methods: {
-    // 导出选中或本页数据
-    handleExport (type, title) {
-      this.exportFileName = title || '查询导出'
-      this.type = 'export'
-      this.handle(type)
-    },
-    // 导出选中或本页数据
-    handlePrint (type, printData) {
-      this.type = 'print'
-      this.printData = printData
-      this.handle(type)
-    },
-    handle (type) {
-      this.exportType = type
-      this.confirmLoading = false
-      this.exportModalVisible = true
-      // 组织默认选中的字段
-      this.selectedExportColumns = this.tableContext.tableColumns
-        .filter(column => column.slotType !== 'action' && column.defaultExport)
-        .map(column => column.dataIndex)
-    },
-    handleGen () {
-      const tHeader = this.tableContext.tableColumns
-          .filter(column => this.selectedExportColumns.includes(column.dataIndex))
-          .map(column => column.title)
-      const filterVal = this.tableContext.tableColumns
-          .filter(column => this.selectedExportColumns.includes(column.dataIndex))
-          .map(column => column.dataIndex)
-      this.confirmLoading = true
-      if (this.type === 'export') {
-       if (this.exportType === 'curPage' || this.exportType === 'selected') {
-         this.handleExportCur(tHeader, filterVal, this.exportType === 'selected')
-       } else if (this.exportType === 'exportByQuery') {
-         this.handleExportByQuery(tHeader, filterVal)
-       }
-     } else {
-       if (this.exportType === 'curPage' || this.exportType === 'selected') {
-         this.handlePrintCur(tHeader, filterVal, this.exportType === 'selected')
-       } else if (this.exportType === 'exportByQuery') {
-         this.handlePrintByQuery(tHeader, filterVal)
-       }
-     }
-    },
-    // 打印选中或本页数据
-    handlePrintCur (tHeader, filterVal, isSelected) {
-      let exportData
-      if (isSelected) {
-        exportData = this.tableContext.selectedRows
-      } else {
-        exportData = this.tableContext.getTableData()
-      }
-      // 获取模板内容
-      this.handlePrintGen(tHeader, filterVal, exportData)
-    },
-    // 打印查询结果
-    async handlePrintByQuery (tHeader, filterVal) {
-      try {
-        const requestParameters = this.tableContext.requestParameters
-        this.summaryLoadingShow = true
-        this.tipMsg = '正在组织数据。。。'
-        const res = await queryAll(Object.assign(requestParameters, { userId: this.tableContext.currUser?.id, pageSize: 200 }), this.tableContext.serviceName, this.tableContext.env === 'dev')
-        this.handlePrintGen(tHeader, filterVal, res.data)
-      } finally {
-        this.confirmLoading = false
-      }
-    },
-    // 获取模板内容
-    handlePrintGen (tHeader, filterVal, exportData) {
-      getConfigByNameAsync(this.tableContext.printTemplate, this.tableContext.serviceName).then(async res => {
-        if (this.printData && this.printData.summary) {
-          this.summaryLoadingShow = true
-          this.tipMsg = '正在获取汇总数据。。。'
-          this.printData.summaryData = {}
-          const tempSummary = await this.printData.summary()
-          tempSummary.forEach(row => {
-            this.printData.summaryData[row.key] = row.value
-          })
-          this.summaryLoadingShow = false
-        }
-        // 如果模板中有默认表格 使用当前选中字段替换表格内容
-        const crudTableIndex = res.panels[0].printElements.findIndex(h => h.printElementType?.type === 'table' && h.options.field === 'CRUD_TABLE')
-        if (crudTableIndex !== -1) {
-          console.log()
-          res.panels[0].printElements[crudTableIndex].options.columns = [tHeader.map((title, index) => {
-            return {
-              colspan: 1,
-              field: filterVal[index],
-              columnId: filterVal[index],
-              rowspan: 1,
-              width: res.panels[0].printElements[crudTableIndex].options.width / tHeader.length,
-              checked: true,
-              fixed: false,
-              title: title,
-              tableSummary: this.tableContext.summaryData.find(item => item.title === title) ? 'sum' : undefined
-            }
-          })]
-        }
-        this.$nextTick(() => {
-          console.log('打印数据预览', this.printData)
-          this.$print(undefined, res, { ...this.printData, CRUD_TABLE: exportData }, {}, {
-            callback: () => {
-              this.confirmLoading = false
-              this.closeModal()
-              this.$emit('ok')
-            },
-            styleHandler: () => {
-              this.confirmLoading = false
-              return hiPrintCss()
-            }
-          })
-        })
-      }).finally(() => {
-        this.confirmLoading = false
-        this.summaryLoadingShow = false
-      })
-    },
-    // 导出选中或本页数据
-    handleExportCur (tHeader, filterVal, isSelected) {
-      let exportData
-      if (isSelected) {
-        exportData = this.tableContext.selectedRows
-      } else {
-        exportData = this.tableContext.getTableData()
-      }
-      if (tHeader.includes('序号')) {
-        exportData = exportData.map((item, index) => ({
-          ...item,
-          序号: index + 1
-        }))
-      }
-      this.confirmLoading = false
-      exportJson(tHeader, exportData.map(v => filterVal.map(j => v[j])), `${this.tableContext.title || ''}数据_${new Date().toLocaleString()}`)
-    },
-    // 导出符合条件的数据
-    handleExportByQuery (tHeader, tDataList) {
-      const that = this
-      const conditionParams = Object.assign(that.tableContext.form, that.tableContext.fixedQueryForm)
-      Object.keys(conditionParams).forEach(key => {
-        if (Array.isArray(conditionParams[key])) {
-          // 检查数组中是否包含 null
-          const hasNull = conditionParams[key].every(item => item === '') || conditionParams[key].length === 0
-          // 如果包含 null，则删除该属性
-          if (hasNull) {
-            delete conditionParams[key]
-          }
-        }
-      })
-      const dateTime = formatDate(new Date(), 'yyyy-MM-dd_hh-mm-ss')
-      const fileNamePrefix = this.exportFileName || '查询导出'
-      const name = `${fileNamePrefix}_${dateTime}`
-      const param = {
-        queryParamsName: this.tableContext.queryParamsName,
-        queryParams: this.tableContext.queryParams,
-        tHeader: tHeader,
-        tDataList: tDataList,
-        form: conditionParams,
-        userId: this.tableContext.currUser.id,
-        fileName: name
-      }
-      exportData(param, this.tableContext.serviceName).then(res => {
-        this.closeModal()
-        if (!res.isAsync) {
-          let value = res.result
-          if (this.tableContext.compatible === 'V4' && (Object.keys(res).length === 1 && Object.prototype.hasOwnProperty.call(res, 'value'))) {
-            value = res.value
-          }
-          this.confirmLoading = false
-          window.open(value)
-        }
-      })
-    },
-    closeModal () {
-      this.exportModalVisible = false
-    },
-    // 新增的全选方法
-    handleSelectAllColumns (e) {
-      if (e.target.checked) {
-        this.selectedExportColumns = this.tableContext.tableColumns.map(column => column.dataIndex)
-      } else {
-        this.selectedExportColumns = []
-      }
-    },
-    // 校验文件名不能包含特殊字符
-    validateFileName () {
-      // 允许的字符：中文 字母 数字 下划线 - 点
-      const regex = /^[a-zA-Z0-9_\-.\u4e00-\u9fa5]+$/
-      if (!regex.test(this.exportFileName)) {
-        this.$message.warn('文件名称仅仅支持包含中文、字母、数字、下划线、-和点')
-        this.exportFileName = this.exportFileName.slice(0, -1)
-      }
-    }
-  }
-}
-</script>
-
-<template>
-  <a-modal
-    title="选择导出列"
-    width="35vw"
-    :confirmLoading="confirmLoading"
-    v-model="exportModalVisible"
-    :destroy-on-close="true"
-    @ok="handleGen"
-  >
-    <a-row v-if="type === 'export'" type="flex" style="padding-left: 3rem; padding-bottom: 1rem" align="middle">
-      <a-col style="padding-right: 0.5rem">
-        <span>文件名: </span>
-      </a-col>
-      <a-col>
-        <a-input
-          @change="validateFileName"
-          placeholder="请输入导出文件名"
-          v-model="exportFileName"
-        />
-      </a-col>
-    </a-row>
-    <a-row type="flex" justify="space-between" style="padding-left: 3rem" v-show="!summaryLoadingShow">
-      <a-col :span="8" style="margin-top: 3px">
-        <a-checkbox
-          :checked="selectedExportColumns.length === tableContext.tableColumns.length"
-          @change="handleSelectAllColumns"
-        >
-          全选
-        </a-checkbox>
-      </a-col>
-    </a-row>
-    <a-checkbox-group v-model="selectedExportColumns" v-show="!summaryLoadingShow">
-      <a-row type="flex" justify="space-between" style="padding-left: 3rem">
-        <a-col
-          :span="8"
-          style="margin-top: 3px"
-          v-for="column in tableContext.tableColumns.filter(res => res.slotType !== 'action')"
-          :key="column.dataIndex">
-          <a-checkbox
-            :label="column.title"
-            :value="column.dataIndex"
-          >
-            <ellipsis :length="18" tooltip>
-              {{ column.title }}
-            </ellipsis>
-          </a-checkbox>
-        </a-col>
-      </a-row>
-    </a-checkbox-group>
-    <a-row type="flex" justify="center" v-show="summaryLoadingShow">
-      <a-spin :tip="tipMsg" v-show="summaryLoadingShow"/>
-    </a-row>
-  </a-modal>
-</template>
-
-<style scoped lang="less">
-
-</style>
+<script>
+import { exportData, getConfigByNameAsync, queryAll } from '@vue2-client/services/api/common'
+import { formatDate } from '@vue2-client/utils/util'
+import { exportJson } from '@vue2-client/utils/excel/Export2Excel'
+import { Ellipsis } from '@vue2-client/components'
+import PrintBill from '@vue2-client/base-client/components/common/XPrint/PrintBill.vue'
+import hiPrintCss from '@vue2-client/base-client/components/common/XPrint/css/hiPrintCss'
+
+export default {
+  name: 'ExportExcel',
+  components: { PrintBill, Ellipsis },
+  data () {
+    return {
+      // 导出列选择
+      exportModalVisible: false,
+      summaryLoadingShow: false,
+      tipMsg: '正在获取汇总数据。。。',
+      exportType: false,
+      type: 'export',
+      selectedExportColumns: [],
+      exportSelectedRows: false,
+      allColumnsSelected: false,
+      exportFileName: '',
+      confirmLoading: null,
+      printData: {}
+    }
+  },
+  inject: ['tableContext'],
+  methods: {
+    // 导出选中或本页数据
+    handleExport (type, title) {
+      this.exportFileName = title || '查询导出'
+      this.type = 'export'
+      this.handle(type)
+    },
+    // 导出选中或本页数据
+    handlePrint (type, printData) {
+      this.type = 'print'
+      this.printData = printData
+      this.handle(type)
+    },
+    handle (type) {
+      this.exportType = type
+      this.confirmLoading = false
+      this.exportModalVisible = true
+      // 组织默认选中的字段
+      this.selectedExportColumns = this.tableContext.tableColumns
+        .filter(column => column.slotType !== 'action' && column.defaultExport)
+        .map(column => column.dataIndex)
+    },
+    handleGen () {
+      const tHeader = this.tableContext.tableColumns
+          .filter(column => this.selectedExportColumns.includes(column.dataIndex))
+          .map(column => column.title)
+      const filterVal = this.tableContext.tableColumns
+          .filter(column => this.selectedExportColumns.includes(column.dataIndex))
+          .map(column => column.dataIndex)
+      this.confirmLoading = true
+      if (this.type === 'export') {
+       if (this.exportType === 'curPage' || this.exportType === 'selected') {
+         this.handleExportCur(tHeader, filterVal, this.exportType === 'selected')
+       } else if (this.exportType === 'exportByQuery') {
+         this.handleExportByQuery(tHeader, filterVal)
+       }
+     } else {
+       if (this.exportType === 'curPage' || this.exportType === 'selected') {
+         this.handlePrintCur(tHeader, filterVal, this.exportType === 'selected')
+       } else if (this.exportType === 'exportByQuery') {
+         this.handlePrintByQuery(tHeader, filterVal)
+       }
+     }
+    },
+    // 打印选中或本页数据
+    handlePrintCur (tHeader, filterVal, isSelected) {
+      let exportData
+      if (isSelected) {
+        exportData = this.tableContext.selectedRows
+      } else {
+        exportData = this.tableContext.getTableData()
+      }
+      // 获取模板内容
+      this.handlePrintGen(tHeader, filterVal, exportData)
+    },
+    // 打印查询结果
+    async handlePrintByQuery (tHeader, filterVal) {
+      try {
+        const requestParameters = this.tableContext.requestParameters
+        this.summaryLoadingShow = true
+        this.tipMsg = '正在组织数据。。。'
+        const res = await queryAll(Object.assign(requestParameters, { userId: this.tableContext.currUser?.id, pageSize: 200 }), this.tableContext.serviceName, this.tableContext.env === 'dev')
+        this.handlePrintGen(tHeader, filterVal, res.data)
+      } finally {
+        this.confirmLoading = false
+      }
+    },
+    // 获取模板内容
+    handlePrintGen (tHeader, filterVal, exportData) {
+      getConfigByNameAsync(this.tableContext.printTemplate, this.tableContext.serviceName).then(async res => {
+        if (this.printData && this.printData.summary) {
+          this.summaryLoadingShow = true
+          this.tipMsg = '正在获取汇总数据。。。'
+          this.printData.summaryData = {}
+          const tempSummary = await this.printData.summary()
+          tempSummary.forEach(row => {
+            this.printData.summaryData[row.key] = row.value
+          })
+          this.summaryLoadingShow = false
+        }
+        // 如果模板中有默认表格 使用当前选中字段替换表格内容
+        const crudTableIndex = res.panels[0].printElements.findIndex(h => h.printElementType?.type === 'table' && h.options.field === 'CRUD_TABLE')
+        if (crudTableIndex !== -1) {
+          console.log()
+          res.panels[0].printElements[crudTableIndex].options.columns = [tHeader.map((title, index) => {
+            return {
+              colspan: 1,
+              field: filterVal[index],
+              columnId: filterVal[index],
+              rowspan: 1,
+              width: res.panels[0].printElements[crudTableIndex].options.width / tHeader.length,
+              checked: true,
+              fixed: false,
+              title: title,
+              tableSummary: this.tableContext.summaryData.find(item => item.title === title) ? 'sum' : undefined
+            }
+          })]
+        }
+        this.$nextTick(() => {
+          console.log('打印数据预览', this.printData)
+          this.$print(undefined, res, { ...this.printData, CRUD_TABLE: exportData }, {}, {
+            callback: () => {
+              this.confirmLoading = false
+              this.closeModal()
+              this.$emit('ok')
+            },
+            styleHandler: () => {
+              this.confirmLoading = false
+              return hiPrintCss()
+            }
+          })
+        })
+      }).finally(() => {
+        this.confirmLoading = false
+        this.summaryLoadingShow = false
+      })
+    },
+    // 导出选中或本页数据
+    handleExportCur (tHeader, filterVal, isSelected) {
+      let exportData
+      if (isSelected) {
+        exportData = this.tableContext.selectedRows
+      } else {
+        exportData = this.tableContext.getTableData()
+      }
+      if (tHeader.includes('序号')) {
+        exportData = exportData.map((item, index) => ({
+          ...item,
+          序号: index + 1
+        }))
+      }
+      this.confirmLoading = false
+      exportJson(tHeader, exportData.map(v => filterVal.map(j => v[j])), `${this.tableContext.title || ''}数据_${new Date().toLocaleString()}`)
+    },
+    // 导出符合条件的数据
+    handleExportByQuery (tHeader, tDataList) {
+      const that = this
+      const conditionParams = Object.assign(that.tableContext.form, that.tableContext.fixedQueryForm)
+      Object.keys(conditionParams).forEach(key => {
+        if (Array.isArray(conditionParams[key])) {
+          // 检查数组中是否包含 null
+          const hasNull = conditionParams[key].every(item => item === '') || conditionParams[key].length === 0
+          // 如果包含 null，则删除该属性
+          if (hasNull) {
+            delete conditionParams[key]
+          }
+        }
+      })
+      const dateTime = formatDate(new Date(), 'yyyy-MM-dd_hh-mm-ss')
+      const fileNamePrefix = this.exportFileName || '查询导出'
+      const name = `${fileNamePrefix}_${dateTime}`
+      const param = {
+        queryParamsName: this.tableContext.queryParamsName,
+        queryParams: this.tableContext.queryParams,
+        tHeader: tHeader,
+        tDataList: tDataList,
+        form: conditionParams,
+        userId: this.tableContext.currUser.id,
+        fileName: name
+      }
+      exportData(param, this.tableContext.serviceName).then(res => {
+        this.closeModal()
+        if (!res.isAsync) {
+          let value = res.result
+          if (this.tableContext.compatible === 'V4' && (Object.keys(res).length === 1 && Object.prototype.hasOwnProperty.call(res, 'value'))) {
+            value = res.value
+          }
+          this.confirmLoading = false
+          window.open(value)
+        }
+      })
+    },
+    closeModal () {
+      this.exportModalVisible = false
+    },
+    // 新增的全选方法
+    handleSelectAllColumns (e) {
+      if (e.target.checked) {
+        this.selectedExportColumns = this.tableContext.tableColumns.map(column => column.dataIndex)
+      } else {
+        this.selectedExportColumns = []
+      }
+    },
+    // 校验文件名不能包含特殊字符
+    validateFileName () {
+      // 允许的字符：中文 字母 数字 下划线 - 点
+      const regex = /^[a-zA-Z0-9_\-.\u4e00-\u9fa5]+$/
+      if (!regex.test(this.exportFileName)) {
+        this.$message.warn('文件名称仅仅支持包含中文、字母、数字、下划线、-和点')
+        this.exportFileName = this.exportFileName.slice(0, -1)
+      }
+    }
+  }
+}
+</script>
+
+<template>
+  <a-modal
+    title="选择导出列"
+    width="35vw"
+    :confirmLoading="confirmLoading"
+    v-model="exportModalVisible"
+    :destroy-on-close="true"
+    @ok="handleGen"
+  >
+    <a-row v-if="type === 'export'" type="flex" style="padding-left: 3rem; padding-bottom: 1rem" align="middle">
+      <a-col style="padding-right: 0.5rem">
+        <span>文件名: </span>
+      </a-col>
+      <a-col>
+        <a-input
+          @change="validateFileName"
+          placeholder="请输入导出文件名"
+          v-model="exportFileName"
+        />
+      </a-col>
+    </a-row>
+    <a-row type="flex" justify="space-between" style="padding-left: 3rem" v-show="!summaryLoadingShow">
+      <a-col :span="8" style="margin-top: 3px">
+        <a-checkbox
+          :checked="selectedExportColumns.length === tableContext.tableColumns.length"
+          @change="handleSelectAllColumns"
+        >
+          全选
+        </a-checkbox>
+      </a-col>
+    </a-row>
+    <a-checkbox-group v-model="selectedExportColumns" v-show="!summaryLoadingShow">
+      <a-row type="flex" justify="space-between" style="padding-left: 3rem">
+        <a-col
+          :span="8"
+          style="margin-top: 3px"
+          v-for="column in tableContext.tableColumns.filter(res => res.slotType !== 'action')"
+          :key="column.dataIndex">
+          <a-checkbox
+            :label="column.title"
+            :value="column.dataIndex"
+          >
+            <ellipsis :length="18" tooltip>
+              {{ column.title }}
+            </ellipsis>
+          </a-checkbox>
+        </a-col>
+      </a-row>
+    </a-checkbox-group>
+    <a-row type="flex" justify="center" v-show="summaryLoadingShow">
+      <a-spin :tip="tipMsg" v-show="summaryLoadingShow"/>
+    </a-row>
+  </a-modal>
+</template>
+
+<style scoped lang="less">
+
+</style>