vue2-client 1.18.27 → 1.18.28

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vue2-client",
-  "version": "1.18.27",
+  "version": "1.18.28",
   "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

@@ -66,6 +66,7 @@
             :query-params-json="queryParamsJson"
             :show-pagination="showPagination"
             :customDelete="customDelete"
+            :autoSave="autoSave"
             :extraHeight="extraHeight"
             :serviceName="serviceName"
             :pageMaxSize="realQueryConfig.queryPagesSize"
@@ -135,6 +136,7 @@
               :query-params-json="queryParamsJson"
               :show-pagination="showPagination"
               :customDelete="customDelete"
+              :autoSave="autoSave"
               :extraHeight="extraHeight"
               :serviceName="serviceName"
               :pageMaxSize="realQueryConfig.queryPagesSize"
@@ -208,17 +210,17 @@ import XAddReport from '@vue2-client/base-client/components/common/XAddReport'
 import XTable from '@vue2-client/base-client/components/common/XTable'
 import XTree from '@vue2-client/base-client/components/common/XTree'
 import XImportExcel from '@vue2-client/base-client/components/common/XImportExcel'
-import { Splitpanes, Pane } from 'splitpanes'
+import {Splitpanes, Pane} from 'splitpanes'
 import 'splitpanes/dist/splitpanes.css'
 import {
   getConfigByName,
   getConfigByLogic,
   parseConfig, runLogic, getConfigByNameAsync,
 } from '@vue2-client/services/api/common'
-import { mapState } from 'vuex'
+import {mapState} from 'vuex'
 import XTreePro from '@vue2-client/base-client/components/common/XTree/XTreePro.vue'
-import { executeStrFunctionByContext } from '@vue2-client/utils/runEvalFunction'
-import { getRealKeyData } from '@vue2-client/utils/util'
+import {executeStrFunctionByContext} from '@vue2-client/utils/runEvalFunction'
+import {getRealKeyData} from '@vue2-client/utils/util'
 import * as util from '@vue2-client/utils/util'
 import UserInfoDetailManage from '@vue2-client/pages/userInfoDetailManage/index.vue'
 
@@ -236,7 +238,7 @@ export default {
     Splitpanes,
     Pane
   },
-  provide () {
+  provide() {
     return {
       getSelf: () => this,
       emitEvent: this.emitEvent.bind(this)
@@ -282,7 +284,7 @@ export default {
     currUser: {
       default: () => {
         console.warn('currUser is not provided.')
-        return { id: null, name: 'Guest' }
+        return {id: null, name: 'Guest'}
       },
     },
 
@@ -302,7 +304,7 @@ export default {
       }
     }
   },
-  data () {
+  data() {
     return {
       // 加载状态
       loading: false,
@@ -417,6 +419,13 @@ export default {
         return false
       }
     },
+    // 行编辑模式自动数据切换自动保存
+    autoSave: {
+      type: Boolean,
+      default: () => {
+        return false
+      }
+    },
     // 行选择模式
     rowSelectMode: {
       type: Boolean,
@@ -519,24 +528,24 @@ export default {
   },
   watch: {
     logicParam: {
-      handler () {
+      handler() {
         this.initConfig()
       },
       deep: true
     },
     queryParamsJson: {
-      handler () {
+      handler() {
         this.initConfig()
       },
       deep: true
     },
     queryParamsName: {
-      handler () {
+      handler() {
         this.initConfig()
       }
     },
     serviceName: {
-      handler () {
+      handler() {
         this.initConfig()
       }
     }
@@ -546,20 +555,20 @@ export default {
     getRealKeyData,
     getConfigByNameAsync,
     getConfigByName,
-    storePaneSize (treeSize) {
+    storePaneSize(treeSize) {
       localStorage.setItem('CURD::' + this.xTreeConfigName + '::TreeSize', treeSize[0].size)
     },
-    customEvent (func, data) {
+    customEvent(func, data) {
       this.$emit(func, data)
     },
-    columnClick (key, value, record) {
+    columnClick(key, value, record) {
       this.$emit('columnClick', key, value, record)
     },
-    gotoUserDetail (key, value, record) {
+    gotoUserDetail(key, value, record) {
       this.$refs.userInfo.init(getRealKeyData(record))
     },
     // 获取主表的数据内容，去掉主表别名
-    getPrimaryData (rows) {
+    getPrimaryData(rows) {
       const alias = this.realQueryConfig.tableAliasName // 获取主表的别名
       const prefix = `${alias}_` // 构建前缀
       const result = []
@@ -580,7 +589,7 @@ export default {
     },
 
     // 给数据区域添加主表数据，给的数据没有主表别名，放着时添加主表别名
-    pushPrimaryData (rows) {
+    pushPrimaryData(rows) {
       const alias = this.realQueryConfig.tableAliasName // 获取主表的别名
       const prefix = `${alias}_` // 构建前缀
       const result = rows.map(row => {
@@ -595,7 +604,7 @@ export default {
     },
 
     // 设置固定查询条件，主表别名自动带
-    setFixedQueryForm (data) {
+    setFixedQueryForm(data) {
       const alias = this.realQueryConfig.tableAliasName // 获取主表的别名
       const prefixedData = {}
 
@@ -607,10 +616,10 @@ export default {
       Object.assign(this.fixedQueryForm, prefixedData)
     },
 
-    importExcelOk (data) {
+    importExcelOk(data) {
       this.$emit('importExcelOk', data)
     },
-    initConfig () {
+    initConfig() {
       this.loading = true
       this.loadError = false
       if (this.queryParamsName) {
@@ -625,7 +634,7 @@ export default {
       }
     },
 
-    getConfig () {
+    getConfig() {
       getConfigByName(this.queryParamsName, this.serviceName, (res) => {
         if (!res) {
           this.loading = false
@@ -635,7 +644,7 @@ export default {
         this.updateComponents(res)
       }, this.env === 'dev')
     },
-    getConfigBySource () {
+    getConfigBySource() {
       parseConfig(this.queryParamsJson, 'CRUD_FORM', this.serviceName, this.env === 'dev').then(res => {
         if (!res) {
           this.loading = false
@@ -645,7 +654,7 @@ export default {
         this.updateComponents(res, true)
       })
     },
-    getColumnJsonByLogic () {
+    getColumnJsonByLogic() {
       getConfigByLogic(this.logicName, this.logicParam, this.serviceName, (res) => {
         if (!res) {
           this.loading = false
@@ -661,7 +670,7 @@ export default {
      * @param res  参数
      * @param setQueryParams 是否设置queryParams参数
      */
-    updateComponents (res, setQueryParams) {
+    updateComponents(res, setQueryParams) {
       this.realQueryConfig = res
       // 读取表格展示模式配置
       this.tableShowMode = res.tableShowMode || 'default'
@@ -693,6 +702,7 @@ export default {
               buttonState: Object.assign(res.buttonState, this.buttonState),
               title: this.title || res.title,
               viewMode: this.viewMode,
+              autoSave: this.autoSave,
               localEditMode: localEditMode,
               rowSelectMode: this.rowSelectMode,
               allowSelectRowNum: this.allowSelectRowNum,
@@ -735,7 +745,7 @@ export default {
       this.loading = false
     },
     // 自定义按钮
-    editButtonStateDataClick (functionName, rows) {
+    editButtonStateDataClick(functionName, rows) {
       console.log('functionName', functionName)
       console.log('rows', rows)
       this.$emit(functionName, rows)
@@ -745,7 +755,7 @@ export default {
      * 提交查询表单事件
      * @param res  参数
      */
-    onSearchSubmit (res) {
+    onSearchSubmit(res) {
       if (res.valid) {
         // 如果是弹框模式，显示表单加载动画，不立即打开弹框
         if (this.tableShowMode === 'popup') {
@@ -765,11 +775,11 @@ export default {
     /**
      * 关闭表格弹框
      */
-    closeTableModal () {
+    closeTableModal() {
       this.tableModalVisible = false
     },
 
-    active (props) {
+    active(props) {
       let num = false
       for (const key in props) {
         // eslint-disable-next-line no-prototype-builtins
@@ -789,7 +799,7 @@ export default {
     /**
      * 提交新增/修改表单后事件
      */
-    onAddOrEditSubmitAfterSubmit (res) {
+    onAddOrEditSubmitAfterSubmit(res) {
       this.refreshTable(res.businessType === '新增')
       // commit
       this.$emit('afterSubmit', res)
@@ -799,7 +809,7 @@ export default {
      * @param res  参数（可能是 Promise）
      * @param conditionParams 查询条件
      */
-    async afterQuery (res, conditionParams) {
+    async afterQuery(res, conditionParams) {
       // 如果是弹框模式且正在查询中
       if (this.tableShowMode === 'popup' && this.formQueryLoading) {
         // 兼容 Promise
@@ -827,20 +837,20 @@ export default {
      * @param actionType 操作类型
      * @param fun 向上级传递的事件
      */
-    action (record, id, actionType, fun = 'action', index) {
+    action(record, id, actionType, fun = 'action', index) {
       this.$emit('innerXFormTableEmit', fun, record, id, actionType, index, this)
       this.$emit(fun, record, id, actionType, index, this)
     },
-    treeOnChecked (checkedKeys, deepNodes, deepKeys) {
+    treeOnChecked(checkedKeys, deepNodes, deepKeys) {
       this.$emit('treeOnChecked', checkedKeys, deepNodes, deepKeys)
     },
-    treeBtnFuncClick (index, func) {
+    treeBtnFuncClick(index, func) {
       this.$emit('treeBtnFuncClick', index, func)
     },
     /**
      * 新增按钮事件
      */
-    add () {
+    add() {
       if (this.customAdd) {
         this.$emit('add')
       } else {
@@ -851,7 +861,7 @@ export default {
         }
       }
     },
-    addFormInit () {
+    addFormInit() {
       const res = this.realQueryConfig
       const localEditMode = !this.localEditMode ? res.localEditMode : this.localEditMode
       this.$refs.xAddForm.init({
@@ -876,7 +886,7 @@ export default {
     /**
      * 添加按钮事件
      */
-    move () {
+    move() {
       this.moveType = true
       this.$nextTick(
         () => {
@@ -891,7 +901,7 @@ export default {
      * 修改按钮事件
      * @param modifyModelData 修改表单数据
      */
-    edit (modifyModelData) {
+    edit(modifyModelData) {
       if (this.customEdit) {
         this.$emit('edit')
       } else {
@@ -919,7 +929,7 @@ export default {
     /**
      * 删除按钮事件
      */
-    del (keys, callback) {
+    del(keys, callback) {
       if (this.customDelete) {
         this.$emit('del', keys, callback)
       }
@@ -928,14 +938,14 @@ export default {
      * 删除后事件
      * @param res
      */
-    afterDelete (res) {
+    afterDelete(res) {
       this.$emit('afterDelete', res)
     },
     /**
      * 行选择事件
      * @param row 选中行
      */
-    rowChoose (row) {
+    rowChoose(row) {
       this.$emit('rowChoose', row)
     },
     /**
@@ -943,13 +953,13 @@ export default {
      * @param currRow 当前行
      * @param defaultAppendRowData 默认追加的行数据
      */
-    validateTableAndSyncData (currRow, defaultAppendRowData) {
+    validateTableAndSyncData(currRow, defaultAppendRowData) {
       this.$refs.xTable.validateTableAndSyncData(currRow, defaultAppendRowData)
     },
     /**
      * 更多条件是否展示
      */
-    toggleAdvanced () {
+    toggleAdvanced() {
       // 只有在非弹出模式下才需要调整表格滚动高度
       if (this.tableShowMode !== 'popup') {
         this.$refs.xTable.setScrollYHeight({})
@@ -958,7 +968,7 @@ export default {
     /**
      * 查询表单部分显示/隐藏切换
      */
-    toggleIsFormShow () {
+    toggleIsFormShow() {
       this.toggleIsFormIcon = this.toggleIsFormIcon === 'vertical-align-top' ? 'vertical-align-bottom' : 'vertical-align-top'
       this.$refs.xForm.toggleVisible()
       // 只有在非弹出模式下才需要调整表格滚动高度
@@ -971,7 +981,7 @@ export default {
      * @param selectedRowKeys 选中列Key集合
      * @param selectedRows 选中列
      */
-    selectRow (selectedRowKeys, selectedRows) {
+    selectRow(selectedRowKeys, selectedRows) {
       this.table_selectedRowKeys = selectedRowKeys
       this.table_selectedRows = selectedRows
       this.$emit('selectRow', selectedRowKeys, selectedRows)
@@ -979,14 +989,14 @@ export default {
     /**
      * 清除勾选数据
      */
-    clearRowKeys () {
+    clearRowKeys() {
       this.$refs.xTable.clearRowKeys()
     },
     /**
      * 刷新表格
      * @param toFirstPage 是否到第一页
      */
-    refreshTable (toFirstPage = true) {
+    refreshTable(toFirstPage = true) {
       if (this.tableShowMode === 'popup') {
         this.formQueryLoading = true
       }
@@ -996,7 +1006,7 @@ export default {
      * 刷新表格
      * @param toFirstPage 是否到第一页
      */
-    refresh (toFirstPage = true) {
+    refresh(toFirstPage = true) {
       if (this.tableShowMode === 'popup') {
         this.formQueryLoading = true
       }
@@ -1005,7 +1015,7 @@ export default {
     /**
      * 主动传递条件查询表格
      */
-    queryTable (conditionParams) {
+    queryTable(conditionParams) {
       if (this.tableShowMode === 'popup') {
         this.formQueryLoading = true
       }
@@ -1014,30 +1024,30 @@ export default {
     /**
      * 向外暴露 resetForm 函数
      */
-    resetForm () {
+    resetForm() {
       this.$refs.xForm.resetForm()
     },
     /**
      * 获取表格数据
      */
-    getTableData () {
+    getTableData() {
       return this.$refs.xTable.getTableData()
     },
     // 在行编辑等情况下，让界面生效
-    update () {
+    update() {
       this.getTableData().push(...[])
     },
 
     /**
      * 设置表格数据
      */
-    setTableData (data) {
+    setTableData(data) {
       this.$refs.xTable.setTableData(data)
     },
     /**
      * 表单本地提交
      */
-    onLocalSubmit (res, callback) {
+    onLocalSubmit(res, callback) {
       const form = res.realForm
       if (res.businessType === '新增') {
         this.$refs.xTable.appendLocalData(form)
@@ -1050,25 +1060,25 @@ export default {
         callback()
       }
     },
-    emitFunc (func, ...args) {
+    emitFunc(func, ...args) {
       this.$emit(func, ...args)
       this.$emit('getEmitFuncData', func, ...args)
     },
     // 直接转发事件的函数
-    emitEvent (event, ...args) {
+    emitEvent(event, ...args) {
       this.$emit(event, ...args)
     },
     // 添加处理 rowClick 的方法
-    handleRowClick (record) {
+    handleRowClick(record) {
       this.$emit('rowClick', record)
     },
-    handleRowDblClick (record) {
+    handleRowDblClick(record) {
       this.$emit('rowDblClick', record)
     },
-    beforeDataChange (record) {
+    beforeDataChange(record) {
       this.$emit('beforeDataChange', record)
     },
-    onExpand (expanded, record) {
+    onExpand(expanded, record) {
       this.$emit('expand', expanded, record)
     }
   },
@@ -1076,7 +1086,7 @@ export default {
     /**
      * 实现doAction方法
      */
-    doAction (actionType, args, data) {
+    doAction(actionType, args, data) {
       switch (actionType) {
         case 'refreshTable':
           for (const item in args) {
@@ -1088,7 +1098,7 @@ export default {
       }
     }
   },
-  mounted () {
+  mounted() {
     if (!this.isMounted) {
       // 防止多次调用
       // 不知道为啥他会执行两次 mounted 暂时处理方式
@@ -1109,8 +1119,8 @@ export default {
         Object.assign(this.fixedAddForm, data)
         Object.assign(this.fixedQueryForm, data)
       } else {
-        Object.assign(this.fixedAddForm, { selected_id: selectedId })
-        Object.assign(this.fixedQueryForm, { selected_id: selectedId })
+        Object.assign(this.fixedAddForm, {selected_id: selectedId})
+        Object.assign(this.fixedQueryForm, {selected_id: selectedId})
       }
     }
   }
@@ -1125,6 +1135,7 @@ export default {
   line-height: 32px;
   margin-bottom: 12px;
 }
+
 // 表格行样式类型
 .ant-table-tbody {
   // 成功样式 - 绿色 (#52c41a)
@@ -1155,13 +1166,13 @@ export default {
 
   // 警告样式 - 黄色 (#faad14)
   .ant-table-row-warning {
-    background-color: rgba(250, 173, 20, 0.1) ;
+    background-color: rgba(250, 173, 20, 0.1);
 
     &:hover {
-      background-color: rgba(250, 173, 20, 0.15) ;
+      background-color: rgba(250, 173, 20, 0.15);
 
       td {
-        background-color: transparent ;
+        background-color: transparent;
       }
     }
 
@@ -1175,65 +1186,65 @@ export default {
     }
 
     td {
-      background-color: transparent ;
+      background-color: transparent;
     }
   }
 
   // 错误样式 - 红色 (#f5222f)
   .ant-table-row-error {
-    background-color: rgba(245, 34, 47, 0.1) ;
+    background-color: rgba(245, 34, 47, 0.1);
 
     &:hover {
-      background-color: rgba(245, 34, 47, 0.15) ;
+      background-color: rgba(245, 34, 47, 0.15);
 
       td {
-        background-color: transparent ;
+        background-color: transparent;
       }
     }
 
     // 选中状态
     &.ant-table-row-selected {
-      background-color: rgba(245, 34, 47, 0.2) ;
+      background-color: rgba(245, 34, 47, 0.2);
 
       td {
-        background-color: transparent ;
+        background-color: transparent;
       }
     }
 
     td {
-      background-color: transparent ;
+      background-color: transparent;
     }
   }
 
   // 魔法样式 - 紫色
   .ant-table-row-magic {
-    background-color: rgba(114, 46, 209, 0.1) ;
+    background-color: rgba(114, 46, 209, 0.1);
 
     &:hover {
-      background-color: rgba(114, 46, 209, 0.15) ;
+      background-color: rgba(114, 46, 209, 0.15);
 
       td {
-        background-color: transparent ;
+        background-color: transparent;
       }
     }
 
     // 选中状态
     &.ant-table-row-selected {
-      background-color: rgba(114, 46, 209, 0.2) ;
+      background-color: rgba(114, 46, 209, 0.2);
 
       td {
-        background-color: transparent ;
+        background-color: transparent;
       }
     }
 
     td {
-      background-color: transparent ;
+      background-color: transparent;
     }
   }
 
   // 默认选中状态（没有特殊行样式时）
   .ant-table-row-selected:not(.ant-table-row-success):not(.ant-table-row-warning):not(.ant-table-row-error):not(.ant-table-row-magic) {
-    background-color: rgba(24, 144, 255, 0.1) ;
+    background-color: rgba(24, 144, 255, 0.1);
   }
 }
 </style>

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

@@ -519,6 +519,11 @@ export default {
         return {}
       }
     },
+    // 行编辑模式自动数据切换自动保存
+    autoSave:{
+      type: Boolean,
+      default: false
+    },
     // 数据只有一页时是否展示分页，true：展示，auto：隐藏
     showPagination: {
       type: Boolean,
@@ -687,12 +692,12 @@ export default {
               })
             })
           },
-          onCancel () {
+          onCancel() {
           }
         })
       }
     },
-    importExcelOk (data) {
+    importExcelOk(data) {
       this.refresh(true)
       this.$emit('importExcelOk', data)
     },
@@ -701,7 +706,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, {
@@ -716,7 +721,7 @@ export default {
         callback()
       }
     },
-    setForm (record, obj) {
+    setForm(record, obj) {
       Object.assign(record, obj)
       this.$forceUpdate()
     },
@@ -725,7 +730,7 @@ export default {
      * @param {Number} rowIndex 行索引
      * @param {String} fieldName 字段名
      */
-    focusInput (rowIndex, fieldName) {
+    focusInput(rowIndex, fieldName) {
       this.$nextTick(() => {
         // 构造 ID：{rowIndex}-{fieldName}input
         const inputId = `${rowIndex}-${fieldName}input`
@@ -760,16 +765,16 @@ export default {
      * 处理表单项事件，向外抛出事件供开发者处理
      * @param {Object} context 增强的上下文数据
      */
-    handleFormItemEvent (context) {
-      const { func, attr, value, currentRecord, currentIndex, nextRecord, nextIndex } = context
+    handleFormItemEvent(context) {
+      const {func, attr, value, currentRecord, currentIndex, nextRecord, nextIndex} = context
 
       // 向外抛出事件，参数顺序：func, attr, value, currentRecord, currentIndex, nextRecord, nextIndex
       this.$emit('x-form-item-emit-func', func, attr, value, currentRecord, currentIndex, nextRecord, nextIndex)
     },
-    handleResize () {
+    handleResize() {
       this.setScrollYHeight({})
     },
-    isInAModal () {
+    isInAModal() {
       let parent = this.$parent
       while (parent) {
         // 检查组件名称，这里假设a-modal组件的名称为AModal，根据实际情况可能需要调整
@@ -782,7 +787,7 @@ export default {
     },
     executeStrFunction,
     // 切换看板模式和表格模式
-    changeViewMode () {
+    changeViewMode() {
       this.isTableMode = !this.isTableMode
       // 看板切换回表格模式 刷新列表
       this.refresh(true)
@@ -790,7 +795,7 @@ export default {
     /**
      * 初始化表格参数
      */
-    init (params) {
+    init(params) {
       const {
         // 查询参数对象, 用于没有对应查询配置文件名时
         queryParams,
@@ -964,7 +969,7 @@ export default {
       }
     },
     // 操作面板按钮渲染
-    buttonRendering (button) {
+    buttonRendering(button) {
       if (!this.buttonPermissions) {
         return true
       }
@@ -983,7 +988,7 @@ export default {
       }
     },
     // 防止查询多次点击处理
-    loadTableData (requestParameters) {
+    loadTableData(requestParameters) {
       if (this.queryPromise) {
         return this.queryPromise
       }
@@ -996,11 +1001,11 @@ export default {
      * 加载表格数据
      * @param requestParameters 请求参数
      */
-    async loadTableDataGen (requestParameters) {
+    async loadTableDataGen(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
@@ -1018,7 +1023,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')
         result.then(res => {
           this.totalCount = res.totalCount || 0
 
@@ -1077,11 +1082,11 @@ export default {
      * @param func 事件默认 action
      * @param index 行下标
      */
-    action (record, actionType, func = 'action', index) {
+    action(record, actionType, func = 'action', index) {
       this.$emit('action', record, record[this.getPrimaryKeyName()], actionType, func, index)
     },
     // 看板点击事件
-    handleCardEmit (data, eventName) {
+    handleCardEmit(data, eventName) {
       this.action(data, undefined, eventName)
     },
     /**
@@ -1091,7 +1096,7 @@ export default {
      * @param selectedRows 被选择的列集合
      * @param nativeEvent 原生事件
      */
-    onSelect (record, selected, selectedRows, nativeEvent) {
+    onSelect(record, selected, selectedRows, nativeEvent) {
       console.log('onSelect', record, selected, selectedRows)
       if (this.selectRowMode === 'listView') {
         const primaryKeyName = this.primaryKey || this.rowKey
@@ -1110,7 +1115,7 @@ export default {
      * @param selectedRows 被选择的列集合
      * @param changeRows 改变的行集合
      */
-    onSelectAll (selected, selectedRows, changeRows) {
+    onSelectAll(selected, selectedRows, changeRows) {
       console.log('onSelectAll', selected, selectedRows, changeRows)
       if (this.selectRowMode === 'listView') {
         if (!selected) {
@@ -1127,7 +1132,7 @@ export default {
      * @param currentPageSelectedKeys 被选择的列Key集合
      * @param currentPageSelectedRows 被选择的列集合
      */
-    onSelectChange (currentPageSelectedKeys, currentPageSelectedRows) {
+    onSelectChange(currentPageSelectedKeys, currentPageSelectedRows) {
       if (this.selectRowMode === 'listView' && !this.clearSelectRowAfterQuery) {
         const primaryKeyName = this.primaryKey || this.rowKey
         if (primaryKeyName) {
@@ -1187,13 +1192,13 @@ export default {
     /**
      * 清除表格选中项
      */
-    clearRowKeys () {
+    clearRowKeys() {
       this.$refs.table.clearSelected()
     },
     /**
      * 为表格附加查询条件
      */
-    setQueryForm (form = {}) {
+    setQueryForm(form = {}) {
       this.form = form
       if (this.createdQuery) {
         this.refresh(true)
@@ -1204,7 +1209,7 @@ export default {
     /**
      * 主动传递条件查询表格
      */
-    async queryTable (conditionParams) {
+    async queryTable(conditionParams) {
       // 备份一下 form 这个函数传递的 condition 仅临时用一下
       // 如果要实质修改 form 需要在 x-form 中赋值
       const _from = JSON.parse(JSON.stringify(this.form))
@@ -1217,12 +1222,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(() => {
         debounce(() => {
           const curDocument = window?.rawDocument || document
@@ -1278,17 +1283,17 @@ export default {
     /**
      * 获取主键列名称
      */
-    getPrimaryKeyName () {
+    getPrimaryKeyName() {
       if (this.primaryKey) {
         return this.primaryKey
       }
       const indexColumn = this.tableColumns.find(i => i?.slotType === 'index')
       return indexColumn ? indexColumn.dataIndex : this.tableColumns[0].dataIndex
     },
-    handleExport (type) {
+    handleExport(type) {
       this.$refs.exportExcel.handleExport(type, this.title)
     },
-    handlePrint (type) {
+    handlePrint(type) {
       const printData = {
         title: this.title,
         form: this.form,
@@ -1298,7 +1303,7 @@ export default {
       }
       this.$refs.exportExcel.handlePrint(type, printData)
     },
-    validateTableAndSyncData (currRow, defaultAppendRowData) {
+    validateTableAndSyncData(currRow, defaultAppendRowData) {
       let isLastRow = false
       if (this.localEditModeDataSource.length === 0) {
         isLastRow = true
@@ -1310,7 +1315,7 @@ export default {
       }
     },
     // 新增业务
-    add () {
+    add() {
       if (this.eventState?.customAdd) {
         this.custom('customAdd', {})
         return
@@ -1322,19 +1327,19 @@ export default {
       }
     },
     // 添加业务
-    move () {
+    move() {
       this.$emit('move')
     },
     // 通用事件业务
-    custom (func) {
+    custom(func) {
       this.$emit('customEvent', func)
     },
     // 编辑业务
-    edit (id) {
+    edit(id) {
       this.editLoading = true
       this.getEditData(id).then(modifyModelData => {
         if (this.eventState?.customEdit) {
-          this.custom('customEdit', { id, modifyModelData })
+          this.custom('customEdit', {id, modifyModelData})
           return
         }
         this.$emit('edit', modifyModelData)
@@ -1342,7 +1347,7 @@ export default {
       })
     },
     // 行选择业务
-    choose () {
+    choose() {
       if (this.isChoose) {
         // 如果配置了自定义函数
         this.$emit('rowChoose', this.selectedRows)
@@ -1351,11 +1356,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 {
@@ -1387,11 +1392,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
@@ -1436,24 +1441,24 @@ export default {
             }
           })
         },
-        onCancel () {
+        onCancel() {
         }
       })
     },
     // 导入业务
-    importData () {
+    importData() {
       this.$refs.importExcel.importExcelHandleOpen()
     },
-    afterVisibleChange (val) {
+    afterVisibleChange(val) {
       if (val) {
         this.retrieveSummaryData()
       }
     },
-    async retrieveSummaryData () {
+    async retrieveSummaryData() {
       const promises = []
 
       if (this.requestParameters.querySummary) {
-        const querySummaryPromise = querySummary(Object.assign(this.requestParameters, { userId: this.currUser?.id }), this.serviceName, this.env === 'dev')
+        const querySummaryPromise = querySummary(Object.assign(this.requestParameters, {userId: this.currUser?.id}), this.serviceName, this.env === 'dev')
           .then(res => {
             if (this.compatible === 'V3') {
               res = res.data
@@ -1475,7 +1480,7 @@ export default {
 
       if (this.showCustomSummary) {
         this.customSummaryArray.forEach(item => {
-          const runLogicPromise = runLogic(item.source, Object.assign(this.requestParameters, { userId: this.currUser?.id }), this.serviceName, this.env === 'dev')
+          const runLogicPromise = 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) {
@@ -1501,7 +1506,7 @@ export default {
       await Promise.all(promises)
       return this.summaryData
     },
-    sortSummaryData () {
+    sortSummaryData() {
       const result = this.summaryData
       // 过滤出 result 中实际存在的 title，并按照 fieldsArray 的顺序排序
       this.summaryData = [...result].sort((a, b) => {
@@ -1510,7 +1515,7 @@ export default {
         return indexA - indexB
       })
     },
-    showDrawer () {
+    showDrawer() {
       if (this.summaryUpdate) {
         this.summaryData.forEach(item => {
           item.loading = true
@@ -1522,15 +1527,15 @@ export default {
         this.$message.warning('请查询后再来查看')
       }
     },
-    onClose () {
+    onClose() {
       this.summaryDrawerVisible = false
     },
     // 获取表格内所有数据
-    getTableData () {
+    getTableData() {
       return this.$refs.table.localDataSource
     },
     // 设置表格内数据
-    setTableData (data) {
+    setTableData(data) {
       if (this.localEditMode) {
         // 本地编辑模式下，需要修改 localEditModeDataSource
         this.localEditModeDataSource = data.map((item, index) => ({
@@ -1550,24 +1555,24 @@ export default {
       }
     },
     // 获取所有本地数据
-    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) {
       if (this.localEditModeDataSource.length === 0) {
         item['序号'] = 1
       } else {
@@ -1575,20 +1580,23 @@ export default {
       }
       this.localEditModeDataSource.push(item)
     },
-    handleRowClick (record) {
+    handleRowClick(record) {
       this.$emit('rowClick', record)
     },
-    handleRowDblClick (record) {
+    handleRowDblClick(record) {
       this.$emit('rowDblClick', record)
     },
-    beforeDataChange (record) {
+    beforeDataChange(record) {
+      if (this.isEditMode && this.autoSave) {
+        this.editRowSave()
+      }
       this.$emit('beforeDataChange', record)
     },
-    onExpand (expanded, record) {
+    onExpand(expanded, record) {
       this.$emit('expand', expanded, record)
     },
     // 添加新方法处理表格选中状态
-    updateTableSelection (selectedKeys) {
+    updateTableSelection(selectedKeys) {
       console.log('selectedKeys', selectedKeys)
       if (!this.$refs.table) {
         return
@@ -1612,7 +1620,7 @@ export default {
     },
 
     // 实际执行更新选中状态的方法
-    doUpdateTableSelection (selectedKeys) {
+    doUpdateTableSelection(selectedKeys) {
       const primaryKeyName = this.primaryKey || this.rowKey
 
       // 更新内部选中状态
@@ -1695,7 +1703,8 @@ export default {
     margin: 0;
   }
 }
-.hiddenFunctionalArea{
+
+.hiddenFunctionalArea {
   display: none;
 }
 </style>

package/src/pages/userInfoDetailManage/uploadFilesHistory/index.vue

@@ -1,159 +1,159 @@
-<template>
-  <div>
-    <div class="filter-bar">
-      <a-date-picker v-model="upload_date" placeholder="上传日期" @change="selfSearch" />
-      <a-select
-        style="width: 200px;"
-        v-model="fusetype"
-        :options="fusetypes"
-        placeholder="分类"
-        @change="selfSearch"
-        allow-clear />
-      <a-button type="primary" @click="selfSearch">查询</a-button>
-    </div>
-    <a-list bordered>
-      <a-list-item v-for="item in files" :key="item.days">
-        <div class="file-group">
-          <h4>{{ item.days }}</h4>
-          <div class="file-items">
-            <div v-for="file in item.arrays" :key="file.id" class="file-card">
-              <img :src="getFileUrl(file.f_downloadpath)" class="file-image" v-if="file.f_filetype.includes('jpg') || file.f_filetype.includes('png')" @click="openPreview(file.f_downloadpath)" style="cursor:pointer" />
-              <p>上传时间: {{ file.f_uploaddate }}</p>
-              <p>操作员: {{ file.f_username }}</p>
-              <p>分类: {{ file.fusetype }}</p>
-              <p>说明: {{ file.fremarks }}</p>
-              <a :href="getFileUrl(file.f_downloadpath)" target="_blank">预览</a>
-              <a-button v-if="isDelete === '1'" @click="delet(file.id)">删除</a-button>
-            </div>
-          </div>
-        </div>
-      </a-list-item>
-    </a-list>
-    <ImagePreview :src="previewImg" :visible="previewVisible" @close="previewVisible = false" />
-  </div>
-</template>
-
-<script>
-import { post } from '@vue2-client/services/api'
-import { del } from '@vue2-client/services/api/restTools'
-import ImagePreview from './ImagePreview.vue'
-export default {
-  props: {
-    currUserInfo: {
-      type: Object,
-      default: () => undefined
-    }
-  },
-  components: { ImagePreview },
-  data () {
-    return {
-      upload_date: null,
-      fusetype: null,
-      files: [],
-      fusetypes: [],
-      isDelete: '0',
-      previewVisible: false,
-      previewImg: ''
-    }
-  },
-  methods: {
-    async getfusetypes () {
-      this.fusetypes = [{ label: '全部', value: '' }]
-      const res = await post('/api/af-revenue/logic/getFileUseType', {})
-      this.fusetypes.push(...res.map(item => ({ label: item.fusetype, value: item.fusetype })))
-    },
-    async getFiles () {
-      if (!this.currUserInfo) return
-      this.files = []
-      let condition = `f_blobid = '${this.currUserInfo.f_userinfo_id}'`
-      if (this.upload_date) {
-        condition += ` and CONVERT(VARCHAR(100), f_uploaddate, 23) = '${this.upload_date}'`
-      }
-      if (this.fusetype) {
-        condition += ` and fusetype = '${this.fusetype}'`
-      }
-      const res = await post('/api/af-revenue/logic/getAllFiles', { data: { condition } })
-      this.files = res.days.map(day => ({
-        days: day.uploadday,
-        arrays: res.array.filter(file => file.uploadday === day.uploadday)
-      }))
-    },
-    async delet (fileId) {
-      await del('api/af-revenue/entity/save/t_files', { id: fileId }, { resolveMsg: '删除成功', rejectMsg: '删除失败' })
-      this.getFiles()
-    },
-    selfSearch () {
-      this.getFiles()
-    },
-    openPreview (src) {
-      this.previewImg = this.getFileUrl(src)
-      this.previewVisible = true
-    },
-    getFileUrl (path) {
-      if (!path) return ''
-
-      console.log('原始路径:', path)
-
-      // 获取当前域名和端口
-      const baseUrl = `${window.location.protocol}//${window.location.host}`
-
-      // 如果是本地文件路径，转换为新的转发路径
-      if (path.match(/^[A-Za-z]:[\/\\]/)) {
-        // 提取文件名
-        const fileName = path.split(/[/\\]/).pop()
-        const newUrl = `${baseUrl}/rs/image/file/${fileName}`
-        console.log('转换后路径:', newUrl)
-        return newUrl
-      }
-      // 如果已经是HTTP路径，直接返回
-      if (path.startsWith('http')) {
-        console.log('HTTP路径，直接返回:', path)
-        return path
-      }
-      // 如果是相对路径，添加域名前缀
-      if (path.startsWith('/resource/')) {
-        const newUrl = `${baseUrl}${path}`
-        console.log('相对路径转换:', newUrl)
-        return newUrl
-      }
-      console.log('其他路径，直接返回:', path)
-      return path
-    }
-  },
-  mounted () {
-    if (this.$login.r.includes('上传附件删除')) {
-      this.isDelete = '1'
-    }
-    this.getFiles()
-    this.getfusetypes()
-  }
-}
-</script>
-
-<style scoped>
-.filter-bar {
-  display: flex;
-  gap: 10px;
-  margin-bottom: 15px;
-}
-.file-group {
-  margin-bottom: 15px;
-}
-.file-items {
-  display: flex;
-  flex-wrap: wrap;
-  gap: 10px;
-}
-.file-card {
-  border: 1px solid #ddd;
-  padding: 10px;
-  border-radius: 5px;
-  width: 200px;
-}
-.file-image {
-  width: 100%; /* 让图片填充整个容器 */
-  height: 150px; /* 调整高度 */
-  object-fit: cover; /* 保持图片比例，填充整个区域 */
-  border-radius: 5px; /* 圆角边框 */
-}
-</style>
+<template>
+  <div>
+    <div class="filter-bar">
+      <a-date-picker v-model="upload_date" placeholder="上传日期" @change="selfSearch" />
+      <a-select
+        style="width: 200px;"
+        v-model="fusetype"
+        :options="fusetypes"
+        placeholder="分类"
+        @change="selfSearch"
+        allow-clear />
+      <a-button type="primary" @click="selfSearch">查询</a-button>
+    </div>
+    <a-list bordered>
+      <a-list-item v-for="item in files" :key="item.days">
+        <div class="file-group">
+          <h4>{{ item.days }}</h4>
+          <div class="file-items">
+            <div v-for="file in item.arrays" :key="file.id" class="file-card">
+              <img :src="getFileUrl(file.f_downloadpath)" class="file-image" v-if="file.f_filetype.includes('jpg') || file.f_filetype.includes('png')" @click="openPreview(file.f_downloadpath)" style="cursor:pointer" />
+              <p>上传时间: {{ file.f_uploaddate }}</p>
+              <p>操作员: {{ file.f_username }}</p>
+              <p>分类: {{ file.fusetype }}</p>
+              <p>说明: {{ file.fremarks }}</p>
+              <a :href="getFileUrl(file.f_downloadpath)" target="_blank">预览</a>
+              <a-button v-if="isDelete === '1'" @click="delet(file.id)">删除</a-button>
+            </div>
+          </div>
+        </div>
+      </a-list-item>
+    </a-list>
+    <ImagePreview :src="previewImg" :visible="previewVisible" @close="previewVisible = false" />
+  </div>
+</template>
+
+<script>
+import { post } from '@vue2-client/services/api'
+import { del } from '@vue2-client/services/api/restTools'
+import ImagePreview from './ImagePreview.vue'
+export default {
+  props: {
+    currUserInfo: {
+      type: Object,
+      default: () => undefined
+    }
+  },
+  components: { ImagePreview },
+  data () {
+    return {
+      upload_date: null,
+      fusetype: null,
+      files: [],
+      fusetypes: [],
+      isDelete: '0',
+      previewVisible: false,
+      previewImg: ''
+    }
+  },
+  methods: {
+    async getfusetypes () {
+      this.fusetypes = [{ label: '全部', value: '' }]
+      const res = await post('/api/af-revenue/logic/getFileUseType', {})
+      this.fusetypes.push(...res.map(item => ({ label: item.fusetype, value: item.fusetype })))
+    },
+    async getFiles () {
+      if (!this.currUserInfo) return
+      this.files = []
+      let condition = `f_blobid = '${this.currUserInfo.f_userinfo_id}'`
+      if (this.upload_date) {
+        condition += ` and CONVERT(VARCHAR(100), f_uploaddate, 23) = '${this.upload_date}'`
+      }
+      if (this.fusetype) {
+        condition += ` and fusetype = '${this.fusetype}'`
+      }
+      const res = await post('/api/af-revenue/logic/getAllFiles', { data: { condition } })
+      this.files = res.days.map(day => ({
+        days: day.uploadday,
+        arrays: res.array.filter(file => file.uploadday === day.uploadday)
+      }))
+    },
+    async delet (fileId) {
+      await del('api/af-revenue/entity/save/t_files', { id: fileId }, { resolveMsg: '删除成功', rejectMsg: '删除失败' })
+      this.getFiles()
+    },
+    selfSearch () {
+      this.getFiles()
+    },
+    openPreview (src) {
+      this.previewImg = this.getFileUrl(src)
+      this.previewVisible = true
+    },
+    getFileUrl (path) {
+      if (!path) return ''
+
+      console.log('原始路径:', path)
+
+      // 获取当前域名和端口
+      const baseUrl = `${window.location.protocol}//${window.location.host}`
+
+      // 如果是本地文件路径，转换为新的转发路径
+      if (path.match(/^[A-Za-z]:[\/\\]/)) {
+        // 提取文件名
+        const fileName = path.split(/[/\\]/).pop()
+        const newUrl = `${baseUrl}/rs/image/file/${fileName}`
+        console.log('转换后路径:', newUrl)
+        return newUrl
+      }
+      // 如果已经是HTTP路径，直接返回
+      if (path.startsWith('http')) {
+        console.log('HTTP路径，直接返回:', path)
+        return path
+      }
+      // 如果是相对路径，添加域名前缀
+      if (path.startsWith('/resource/')) {
+        const newUrl = `${baseUrl}${path}`
+        console.log('相对路径转换:', newUrl)
+        return newUrl
+      }
+      console.log('其他路径，直接返回:', path)
+      return path
+    }
+  },
+  mounted () {
+    if (this.$login.r.includes('上传附件删除')) {
+      this.isDelete = '1'
+    }
+    this.getFiles()
+    this.getfusetypes()
+  }
+}
+</script>
+
+<style scoped>
+.filter-bar {
+  display: flex;
+  gap: 10px;
+  margin-bottom: 15px;
+}
+.file-group {
+  margin-bottom: 15px;
+}
+.file-items {
+  display: flex;
+  flex-wrap: wrap;
+  gap: 10px;
+}
+.file-card {
+  border: 1px solid #ddd;
+  padding: 10px;
+  border-radius: 5px;
+  width: 200px;
+}
+.file-image {
+  width: 100%; /* 让图片填充整个容器 */
+  height: 150px; /* 调整高度 */
+  object-fit: cover; /* 保持图片比例，填充整个区域 */
+  border-radius: 5px; /* 圆角边框 */
+}
+</style>