vue2-client 1.9.90 → 1.9.92

package/package.json

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

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

@@ -11,8 +11,11 @@
             <a-button v-if="buttonState.move && buttonRendering('move')" type="primary" @click="move">
               <a-icon type="plus"/>添加
             </a-button>
-            <a-button v-if="buttonState.choose && buttonRendering('choose')" :disabled="!isChoose" type="primary"
-                      @click="choose">
+            <a-button
+              v-if="buttonState.choose && buttonRendering('choose')"
+              :disabled="!isChoose"
+              type="primary"
+              @click="choose">
               <a-icon type="check-square"/>选择
             </a-button>
             <a-button
@@ -73,8 +76,10 @@
               <a-icon type="dashed" :style="iconStyle"/>
               {{ button.buttonName }}
             </a-button>
-            <a-button v-if="allowedCardMode && !simpleMode" @click="changeViewMode"
-                      :type="isTableMode ? '' : 'primary'">
+            <a-button
+              v-if="allowedCardMode && !simpleMode"
+              @click="changeViewMode"
+              :type="isTableMode ? '' : 'primary'">
               看板模式
             </a-button>
             <!-- 头部附加栅格 -->
@@ -286,11 +291,11 @@
   </div>
 </template>
 <script>
-import {Ellipsis, STable} from '@vue2-client/components'
-import util, {formatDate, getChangedData, setDataByRealKey} from '@vue2-client/utils/util'
+import { Ellipsis, STable } from '@vue2-client/components'
+import util, { formatDate, getChangedData, setDataByRealKey } from '@vue2-client/utils/util'
 import XBadge from '@vue2-client/base-client/components/common/XBadge'
 import TableSetting from '@vue2-client/components/TableSetting/TableSetting'
-import {exportJson} from '@vue2-client/utils/excel/Export2Excel'
+import { exportJson } from '@vue2-client/utils/excel/Export2Excel'
 import XFormItem from '@vue2-client/base-client/components/common/XForm/XFormItem'
 import {
   exportData,
@@ -304,12 +309,12 @@ import {
   runLogic
 } from '@vue2-client/services/api/common'
 import XImportExcel from '@vue2-client/base-client/components/common/XImportExcel'
-import {Modal} from 'ant-design-vue'
-import {mapState} from 'vuex'
-import {executeStrFunction, executeStrFunctionByContext} from '@vue2-client/utils/runEvalFunction'
+import { Modal } from 'ant-design-vue'
+import { mapState } from 'vuex'
+import { executeStrFunction, executeStrFunctionByContext } from '@vue2-client/utils/runEvalFunction'
 import debounce from 'lodash.debounce'
 import XDataCard from '@vue2-client/base-client/components/common/XDataCard/XDataCard.vue'
-import {getRealKeyData} from '@vue2-client/utils/formatter'
+import { getRealKeyData } from '@vue2-client/utils/formatter'
 import ReportTableHome from '../../../../pages/report/ReportTableHome.vue'
 
 export default {
@@ -326,7 +331,7 @@ export default {
     ReportTableHome
   },
   inject: ['getSelf'],
-  data() {
+  data () {
     return {
       uniqueId: `x-table-${this._uid}`, // 使用 _uid 生成唯一 ID
       // 筛选列加载状态
@@ -491,7 +496,7 @@ export default {
     }
   },
   computed: {
-    rowSelection() {
+    rowSelection () {
       return {
         selectedRowKeys: this.selectedRowKeys,
         onChange: this.onSelectChange,
@@ -503,38 +508,40 @@ export default {
         }),
       }
     },
-    ...mapState('account', {currUser: 'user'}),
+    ...mapState('account', { currUser: 'user' }),
     ...mapState('setting', ['compatible'])
   },
-  mounted() {
+  mounted () {
     window.addEventListener('resize', this.handleResize)
   },
-  beforeDestroy() {
+  beforeDestroy () {
     window.removeEventListener('resize', this.handleResize)
   },
   methods: {
-    columnClick(key, value, record) {
+    columnClick (key, value, record) {
       this.$emit('columnClick', key, value, record)
     },
-    getFromItem(model, text, record, index) {
+    getFromItem (model, text, record, index) {
       const aa = this.formItems.find(item => item.model === model && item.editRow)
       if (aa) {
         const tempConfig = JSON.parse(JSON.stringify(aa))
         if (tempConfig.editRowShowFunc) {
-          if (executeStrFunctionByContext(this, tempConfig.editRowShowFunc, [text, record, index, tempConfig]) {
+          if (executeStrFunctionByContext(this, tempConfig.editRowShowFunc, [text, record, index, tempConfig])) {
             return tempConfig
           }
+        } else {
+          return tempConfig
         }
       }
       return false
     },
     // 打开行编辑
-    openEditMode() {
+    openEditMode () {
       this.isEditMode = true
       this.editRowBeforeData = JSON.parse(JSON.stringify(this.getTableData()))
     },
     // 标记行保存
-    editRowSave() {
+    editRowSave () {
       // 获取最新数据
       const editRowAfterData = this.getTableData()
       const changeData = getChangedData(this.editRowBeforeData, editRowAfterData)
@@ -563,12 +570,12 @@ export default {
               })
             })
           },
-          onCancel() {
+          onCancel () {
           }
         })
       }
     },
-    importExcelOk() {
+    importExcelOk () {
       this.refresh(true)
       this.$emit('importExcelOk')
     },
@@ -577,7 +584,7 @@ export default {
      * @param row 选中行集合
      * @param attr 表单项属性
      */
-    async rowChoose(row, attr, callback, record) {
+    async rowChoose (row, attr, callback, record) {
       // 如果配置了自定义函数
       if (attr.dataChangeFunc) {
         await executeStrFunction(attr.dataChangeFunc, [record, this.setForm, {
@@ -592,15 +599,15 @@ export default {
         callback()
       }
     },
-    setForm(record, obj) {
+    setForm (record, obj) {
       Object.assign(record, obj)
     },
-    handleResize() {
+    handleResize () {
       debounce(() => {
         this.setScrollYHeight({})
       }, 100)()
     },
-    isInAModal() {
+    isInAModal () {
       let parent = this.$parent
       while (parent) {
         // 检查组件名称，这里假设a-modal组件的名称为AModal，根据实际情况可能需要调整
@@ -613,7 +620,7 @@ export default {
     },
     executeStrFunction,
     // 切换看板模式和表格模式
-    changeViewMode() {
+    changeViewMode () {
       this.isTableMode = !this.isTableMode
       // 看板切换回表格模式 刷新列表
       if (this.isTableMode) {
@@ -623,7 +630,7 @@ export default {
     /**
      * 初始化表格参数
      */
-    init(params) {
+    init (params) {
       const {
         // 查询参数对象, 用于没有对应查询配置文件名时
         queryParams,
@@ -740,7 +747,7 @@ export default {
       }
     },
     // 操作面板按钮渲染
-    buttonRendering(button) {
+    buttonRendering (button) {
       if (!this.buttonPermissions) {
         return true
       }
@@ -762,11 +769,11 @@ export default {
      * 加载表格数据
      * @param requestParameters 请求参数
      */
-    async loadTableData(requestParameters) {
+    async loadTableData (requestParameters) {
       let result
       if (this.localEditMode) {
         if (!this.isLocalDataSourceLoadedExternally && requestParameters?.conditionParams && Object.keys(requestParameters?.conditionParams).length > 0) {
-          const result = await query(Object.assign(requestParameters, {userId: this.currUser?.id}),
+          const result = await query(Object.assign(requestParameters, { userId: this.currUser?.id }),
             this.serviceName, this.env === 'dev')
           if (result.data) {
             let no = 0
@@ -784,7 +791,7 @@ export default {
           })
         })
       } else {
-        result = query(Object.assign(requestParameters, {userId: this.currUser?.id}), this.serviceName, this.env === 'dev')
+        result = query(Object.assign(requestParameters, { userId: this.currUser?.id }), this.serviceName, this.env === 'dev')
       }
       if (this.isTableMode && !this.simpleMode) {
         this.clearRowKeys()
@@ -798,11 +805,11 @@ export default {
      * @param actionType 操作类型
      * @param func 事件默认 action
      */
-    action(record, actionType, func = 'action') {
+    action (record, actionType, func = 'action') {
       this.$emit('action', record, record[this.getPrimaryKeyName()], actionType, func)
     },
     // 看板点击事件
-    handleCardEmit(data, eventName) {
+    handleCardEmit (data, eventName) {
       this.action(data, undefined, eventName)
     },
     /**
@@ -810,7 +817,7 @@ export default {
      * @param selectedRowKeys 被选择的列Key集合
      * @param selectedRows 被选择的列集合
      */
-    onSelectChange(selectedRowKeys, selectedRows) {
+    onSelectChange (selectedRowKeys, selectedRows) {
       this.selectedRowKeys = selectedRowKeys
       this.selectedRows = selectedRows
       this.isModify = this.selectedRowKeys.length === 1
@@ -821,13 +828,13 @@ export default {
     /**
      * 清除表格选中项
      */
-    clearRowKeys() {
+    clearRowKeys () {
       this.$refs.table.clearSelected()
     },
     /**
      * 为表格附加查询条件
      */
-    setQueryForm(form = {}) {
+    setQueryForm (form = {}) {
       this.form = form
       if (this.createdQuery) {
         this.refresh(true)
@@ -839,12 +846,12 @@ export default {
      * 表格重新加载方法
      * 如果参数为 true, 则强制刷新到第一页
      */
-    refresh(bool) {
+    refresh (bool) {
       this.$nextTick(() => {
         this.$refs.table.refresh(bool)
       })
     },
-    setScrollYHeight({extraHeight = this.extraHeight, id = this.uniqueId, type = ''}) {
+    setScrollYHeight ({ extraHeight = this.extraHeight, id = this.uniqueId, type = '' }) {
       this.$nextTick(() => {
         setTimeout(() => {
           const curDocument = window?.rawDocument || document
@@ -901,7 +908,7 @@ export default {
      * @param date 日期字符串
      * @param format 格式化方式
      */
-    format(date, format) {
+    format (date, format) {
       return formatDate(date, format)
     },
     /**
@@ -909,7 +916,7 @@ export default {
      * @param number string 或者 number
      * @param decimalPlaces 小数位数
      */
-    numberFormat(number, decimalPlaces = 2) {
+    numberFormat (number, decimalPlaces = 2) {
       const value = parseFloat(number)
       if (!isNaN(value)) {
         return value.toFixed(decimalPlaces)
@@ -920,7 +927,7 @@ export default {
     /**
      * 获取主键列名称
      */
-    getPrimaryKeyName() {
+    getPrimaryKeyName () {
       if (this.primaryKey) {
         return this.primaryKey
       }
@@ -928,7 +935,7 @@ export default {
       return indexColumn ? indexColumn.dataIndex : this.tableColumns[0].dataIndex
     },
     // 导出选中或本页数据
-    handleExport(isSelected) {
+    handleExport (isSelected) {
       const tHeader = this.tableColumns.filter(res => res.slotType !== 'action').map(res => res.title)
       const filterVal = this.tableColumns.map(res => res.dataIndex)
       let exportData
@@ -940,13 +947,13 @@ export default {
       exportJson(tHeader, exportData.map(v => filterVal.map(j => v[j])), this.title + `数据_${new Date().toLocaleString()}`)
     },
     // 导出符合条件的数据
-    handleExportByQuery() {
+    handleExportByQuery () {
       const that = this
       const conditionParams = Object.assign(that.form, that.fixedQueryForm)
       this.$confirm({
         title: '是否确认导出?',
         content: '此操作将导出当前条件下所有数据而非选中数据',
-        onOk() {
+        onOk () {
           exportData({
             queryParamsName: that.queryParamsName,
             queryParams: that.queryParams,
@@ -961,11 +968,11 @@ export default {
             window.open(value)
           })
         },
-        onCancel() {
+        onCancel () {
         }
       })
     },
-    handleAsyncExportByQuery() {
+    handleAsyncExportByQuery () {
       const that = this
       const conditionParams = Object.assign(that.form, that.fixedQueryForm)
       this.$confirm({
@@ -1011,20 +1018,20 @@ export default {
             console.log('失败:', error)
           })
         },
-        onCancel() {
+        onCancel () {
         }
       })
     },
     // 新增业务
-    add() {
+    add () {
       this.$emit('add')
     },
     // 添加业务
-    move() {
+    move () {
       this.$emit('move')
     },
     // 编辑业务
-    edit(id) {
+    edit (id) {
       this.editLoading = true
       this.getEditData(id).then(modifyModelData => {
         this.$emit('edit', modifyModelData)
@@ -1032,7 +1039,7 @@ export default {
       })
     },
     // 行选择业务
-    choose() {
+    choose () {
       if (this.isChoose) {
         // 如果配置了自定义函数
         this.$emit('rowChoose', this.selectedRows)
@@ -1041,11 +1048,11 @@ export default {
       }
     },
     // 自定义按钮点击
-    editButtonStateDataClick(index) {
+    editButtonStateDataClick (index) {
       this.$emit('editButtonStateDataClick', this.editButtonStateData[index].functionName, this.selectedRows)
     },
     // 获取被编辑的数据
-    getEditData(id) {
+    getEditData (id) {
       if (!id) {
         this.selectId = this.selectedRowKeys[0]
       } else {
@@ -1077,11 +1084,11 @@ export default {
       requestParameters.conditionParams[primaryKeyName] = this.selectId
       requestParameters.f_businessid = this.selectId
       return queryWithResource(requestParameters, this.serviceName, this.env === 'dev').then(res => {
-        return {data: res.data[0], primaryKeyData: primaryKeyData, images: res.images, files: res.files}
+        return { data: res.data[0], primaryKeyData: primaryKeyData, images: res.images, files: res.files }
       })
     },
     // 删除业务
-    deleteItem() {
+    deleteItem () {
       if (this.viewMode) {
         this.$message.info('预览模式禁止删除')
         return
@@ -1119,20 +1126,20 @@ export default {
             }
           })
         },
-        onCancel() {
+        onCancel () {
         }
       })
     },
     // 导入业务
-    importData() {
+    importData () {
       this.$refs.importExcel.importExcelHandleOpen()
     },
-    afterVisibleChange() {
+    afterVisibleChange () {
       this.retrieveSummaryData()
     },
-    async retrieveSummaryData() {
+    async retrieveSummaryData () {
       if (this.requestParameters.querySummary) {
-        querySummary(Object.assign(this.requestParameters, {userId: this.currUser?.id}), this.serviceName, this.env === 'dev').then(res => {
+        querySummary(Object.assign(this.requestParameters, { userId: this.currUser?.id }), this.serviceName, this.env === 'dev').then(res => {
           if (res.length > 0) {
             this.summaryData.forEach(item => {
               res.forEach(summary => {
@@ -1148,7 +1155,7 @@ export default {
       }
       if (this.showCustomSummary) {
         this.customSummaryArray.forEach(item => {
-          runLogic(item.source, Object.assign(this.requestParameters, {userId: this.currUser?.id}), this.serviceName, this.env === 'dev').then((res) => {
+          runLogic(item.source, Object.assign(this.requestParameters, { userId: this.currUser?.id }), this.serviceName, this.env === 'dev').then((res) => {
             this.summaryData.forEach(summary => {
               if (item.key === summary.key) {
                 summary.value = res.value
@@ -1168,7 +1175,7 @@ export default {
         })
       }
     },
-    showDrawer() {
+    showDrawer () {
       if (this.summaryUpdate) {
         this.summaryData.forEach(item => {
           item.loading = true
@@ -1180,36 +1187,36 @@ export default {
         this.$message.warning('请查询后再来查看')
       }
     },
-    onClose() {
+    onClose () {
       this.summaryDrawerVisible = false
     },
     // 获取表格内所有数据
-    getTableData() {
+    getTableData () {
       return this.$refs.table.localDataSource
     },
     // 设置表格内数据
-    setTableData(data) {
-      Object.assign(this.$refs.table, {localDataSource: data})
+    setTableData (data) {
+      Object.assign(this.$refs.table, { localDataSource: data })
     },
     // 获取所有本地数据
-    getLocalData() {
+    getLocalData () {
       return this.localEditModeDataSource
     },
     // 获取指定rowKey的value的本地数据
-    getDataByRowKeyValue(rowKeyValue) {
+    getDataByRowKeyValue (rowKeyValue) {
       return this.getLocalData().find(item => {
         return item[this.rowKey] === rowKeyValue
       })
     },
     // 修改本地数据
-    modifyLocalData(rowKeyValue, data) {
+    modifyLocalData (rowKeyValue, data) {
       const modifyItem = this.getDataByRowKeyValue(rowKeyValue)
       if (modifyItem) {
         Object.assign(modifyItem, data)
       }
     },
     // 追加本地数据
-    appendLocalData(item) {
+    appendLocalData (item) {
       item['序号'] = this.localEditModeDataSource.length
       this.localEditModeDataSource.push(item)
     }