vue2-client 1.9.122 → 1.9.124

package/package.json

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

@@ -391,8 +391,8 @@ export default {
       Object.assign(this.fixedQueryForm, prefixedData)
     },
 
-    importExcelOk () {
-      this.$emit('importExcelOk')
+    importExcelOk (data) {
+      this.$emit('importExcelOk', data)
     },
     initConfig () {
       this.loading = true

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

@@ -41,7 +41,7 @@ export default {
   data () {
     return {
       // 查询配置文件名
-      queryParamsName: 'ceshiCRUD',
+      queryParamsName: 'ChargeQueryCRUD',
       // 查询配置左侧tree
       // xTreeConfigName: 'addressType',
       // 新增表单固定值

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

@@ -144,9 +144,14 @@ export default {
       formData.append('userData', JSON.stringify(userData))
       importData(formData, this.serviceName, this.env === 'dev').then(res => {
         this.fileList = []
-        this.$message.success(res.msg || res)
+        const msg = res.msg || '导入成功'
+        if (res?.successLen && !res?.msg) {
+          this.$message.success(`${msg}，成功导入${res.successLen}条数据`)
+        } else {
+          this.$message.success(msg)
+        }
         this.open = false
-        this.$emit('ok')
+        this.$emit('ok', res)
       }).catch(e => {
         this.$message.error(e)
       }).finally(() => {

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

@@ -9,6 +9,7 @@
       <XReportDesign
         @updateImg="updateImg"
         v-if="scanFinish"
+        id="printReady"
         :show-img-in-cell="showImgInCell"
         :img-prefix="imgPrefix"
         :use-oss-for-img="useOssForImg"
@@ -17,7 +18,6 @@
         :slot-config-name="type === 'display' ? undefined : activatedSlotName"
         :for-display="type === 'display'"
         ref="XReportDesign"
-        id="printReady"
         :server-name="serverName"
         :show-title="showTitle"
         :no-padding="noPadding"
@@ -387,7 +387,8 @@ export default {
     // 打印
     printDocument () {
       // x-report
-      const printContent = window.rawDocument.getElementById('printReady')
+      // const printContent = window.rawDocument.getElementById('printReady')
+      const printContent = window.document.getElementById('printReady')
       printElement(printContent)
       this.$message.success('操作成功！')
     },

package/src/base-client/components/common/XReport/XReportDesign.vue

@@ -15,9 +15,9 @@
       <div
         :class=" noPadding ? 'reportMainNoPadding' : 'reportMain'"
         :style="activatedConfig.width > 0 ? ('width:' + activatedConfig.width + 'px') : undefined">
-        <!--      大标题      -->
-        <h2 class="reportTitle" v-if="showTitle && activatedConfig.title" v-html="activatedConfig.title"></h2>
-        <!--      小标题 / 介乎于标题与表格之间的内容      -->
+        <!--      大标题
+        <h2 class="reportTitle" v-if="showTitle && activatedConfig.title" v-html="activatedConfig.title"></h2>-->
+        <!--      小标题 / 介乎于标题与表格之间的内容
         <div class="subTitle" v-if="activatedConfig.subTitle">
           <div class="subTitleItems" v-for="(item, itemIndex) in activatedConfig.subTitle" :key="itemIndex">
             <template v-if="item.type === 'column'">
@@ -40,7 +40,7 @@
               </div>
             </template>
           </div>
-        </div>
+        </div>  -->
         <!--      主体表格      -->
         <table class="reportTable" v-if="render" :style="activatedConfig.style ? activatedConfig.style : undefined">
           <tbody class="reportTable">
@@ -342,7 +342,7 @@ export default {
 
     .inputsDivItem {
       display: flex;
-      align-items: center;
+      align-items: left;
       padding: 0 4px;
       white-space: nowrap;
 
@@ -361,7 +361,7 @@ export default {
 }
 
 .reportMainForDisplay {
-  text-align: center;
+  text-align: left;
   margin: 10% auto;
   font-size: 16px;
   color: #000;
@@ -388,7 +388,7 @@ export default {
 
     .inputsDivItem {
       display: flex;
-      align-items: center;
+      align-items: left;
       padding: 0 4px;
       white-space: nowrap;
 
@@ -407,7 +407,7 @@ export default {
 }
 
 .reportMainNoPadding {
-  text-align: center;
+  text-align: left;
   margin: 0 auto;
   font-size: 16px;
   color: #000;
@@ -433,7 +433,7 @@ export default {
 
     .inputsDivItem {
       display: flex;
-      align-items: center;
+      align-items: left;
       padding: 0 4px;
       white-space: nowrap;
 

package/src/base-client/components/common/XReport/XReportTrGroup.vue

@@ -538,42 +538,50 @@ export default {
         borderBottom: borderWidth + ' solid ' + color,
         padding: '4px, 2px'
       }
+
       let result = {}
+
+      // 先添加单元格通用样式
+      if (this.config.cellStyle) {
+        result = { ...result, ...this.config.cellStyle }
+      }
+
       // 如果表格也声明了样式，用表格样式将样式覆盖
       if (cell.style) {
         if (cell.noBorder) {
-          result = { ...noBorder, ...cell.style }
+          result = { ...noBorder, ...cell.style, ...result }
         } else {
           if (this.noTopBorder) {
-            result = { ...NoTopBorder, ...cell.style }
+            result = { ...NoTopBorder, ...cell.style, ...result }
           } else {
-            result = { ...withBorder, ...cell.style }
+            result = { ...withBorder, ...cell.style, ...result }
           }
         }
+
         return result
       }
       // 如果表头声明了样式，则用其将基础样式覆盖
       if (cell.type === 'column') {
         if (this.config.labelStyle !== undefined) {
           if (cell.noBorder) {
-            result = { ...noBorder, ...this.config.labelStyle }
+            result = { ...noBorder, ...this.config.labelStyle, ...result }
           } else {
             if (this.noTopBorder) {
-              result = { ...NoTopBorder, ...this.config.labelStyle }
+              result = { ...NoTopBorder, ...this.config.labelStyle, ...result }
             } else {
-              result = { ...withBorder, ...this.config.labelStyle }
+              result = { ...withBorder, ...this.config.labelStyle, ...result }
             }
           }
           return result
         }
       }
       if (cell.noBorder) {
-        result = { ...noBorder }
+        result = { ...noBorder, ...result }
       } else {
         if (this.noTopBorder) {
-          result = { ...NoTopBorder }
+          result = { ...NoTopBorder, ...result }
         } else {
-          result = { ...withBorder }
+          result = { ...withBorder, ...result }
         }
       }
       return result
@@ -766,7 +774,6 @@ export default {
       return result
     },
     calculateTrStyle (key, config) {
-      console.log('行样式配置', config.trStyle, key)
       // 初始化行样式
       let trStyle = {}
 

package/src/base-client/components/common/XReport/index.js

@@ -1,3 +1,3 @@
-import XReport from './XReport'
-
-export default XReport
+import XReport from './XReport'
+
+export default XReport

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

@@ -0,0 +1,193 @@
+<script>
+import { asyncRunTask, exportData } 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'
+
+export default {
+  name: 'ExportExcel',
+  components: { Ellipsis },
+  data () {
+    return {
+      // 导出列选择
+      exportModalVisible: false,
+      exportType: false,
+      selectedExportColumns: [],
+      exportSelectedRows: false,
+      allColumnsSelected: false, // 新增的全选状态
+    }
+  },
+  inject: ['tableContext'],
+  methods: {
+    // 导出选中或本页数据
+    handleExport (type) {
+      this.exportType = type
+      this.exportModalVisible = true
+      // 组织默认选中的字段
+      this.selectedExportColumns = this.tableContext.tableColumns
+        .filter(column => column.slotType !== 'action' && column.defaultExport)
+        .map(column => column.dataIndex)
+    },
+    handleExportGen () {
+      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)
+      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 === 'exportByQueryASync') {
+        this.handleAsyncExportByQuery(tHeader, filterVal)
+      }
+    },
+    // 导出选中或本页数据
+    handleExportCur (tHeader, filterVal, isSelected) {
+      let exportData
+      if (isSelected) {
+        exportData = this.tableContext.selectedRows
+      } else {
+        exportData = this.tableContext.getTableData()
+      }
+      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)
+      this.$confirm({
+        title: '是否确认导出?',
+        content: '此操作将导出当前条件下所有数据而非选中数据',
+        onOk () {
+          exportData({
+            queryParamsName: that.tableContext.queryParamsName,
+            queryParams: that.tableContext.queryParams,
+            tHeader: tHeader,
+            tDataList: tDataList,
+            form: conditionParams,
+            userId: that.tableContext.currUser.id
+          }, that.tableContext.serviceName).then(res => {
+            let value = res
+            if (that.tableContext.compatible === 'V4' || (Object.keys(res).length === 1 && Object.prototype.hasOwnProperty.call(res, 'value'))) {
+              value = res.value
+            }
+            that.closeModal()
+            window.open(value)
+          })
+        },
+        onCancel () {
+        }
+      })
+    },
+    handleAsyncExportByQuery (tHeader, tDataList) {
+      const that = this
+      const conditionParams = Object.assign(that.tableContext.form, that.tableContext.fixedQueryForm)
+      this.$confirm({
+        title: '是否确认导出?',
+        content: (h) => (
+          <div>
+            <p>此操作将导出当前条件下所有数据而非选中数据</p>
+            {/* eslint-disable-next-line no-return-assign */}
+            <a-input placeholder="请输入导出文件名" onChange={(e) => this.exportFileName = e.target.value}/>
+          </div>
+        ),
+        onOk: () => {
+          if (!this.exportFileName) {
+            this.$message.error('文件名不能为空')
+            // eslint-disable-next-line prefer-promise-reject-errors
+            return Promise.reject() // 阻止对话框关闭
+          }
+          // 在这里执行导出的逻辑，并使�� this.exportFileName 作为文件名
+          const queryData = {
+            queryParamsName: that.tableContext.queryParamsName,
+            queryParams: that.tableContext.queryParams,
+            form: conditionParams,
+            tHeader: tHeader,
+            tDataList: tDataList,
+            userId: that.tableContext.currUser.id
+          }
+          const date = formatDate(new Date(), 'yyyy-MM-dd hh:mm:ss')
+
+          asyncRunTask({
+            f_task_type: '导出',
+            f_task_class: 'com.af.v4.impl.CommonExportHandlerImpl',
+            f_user_id: that.tableContext.currUser.id,
+            // 导出条件
+            f_tag1: queryData,
+            // 导出文件名
+            f_tag2: this.exportFileName + '_' + that.tableContext.currUser.username,
+            // 执行数据源
+            f_tag3: process.env.VUE_APP_SYSTEM_NAME,
+            f_service_name: that.tableContext.serviceName || process.env.VUE_APP_SYSTEM_NAME,
+            f_task_name: `${this.exportFileName}_${that.tableContext.currUser.username}_${date}`
+          }, that.tableContext.serviceName)
+            .then(res => {
+              that.closeModal()
+            }).catch(error => {
+            // 失败时的处理
+            console.log('失败:', error)
+          })
+        },
+        onCancel () {
+        }
+      })
+    },
+    closeModal () {
+      this.exportModalVisible = false
+    },
+    // 新增的全选方法
+    handleSelectAllColumns (e) {
+      if (e.target.checked) {
+        this.selectedExportColumns = this.tableContext.tableColumns.map(column => column.dataIndex)
+      } else {
+        this.selectedExportColumns = []
+      }
+    }
+  }
+}
+</script>
+
+<template>
+  <a-modal
+    title="选择导出列"
+    width="35vw"
+    v-model="exportModalVisible"
+    :destroy-on-close="true"
+    @ok="handleExportGen"
+  >
+    <a-row type="flex" justify="space-between" style="padding-left: 3rem">
+      <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">
+      <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-modal>
+</template>
+
+<style scoped lang="less">
+
+</style>

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

@@ -62,12 +62,12 @@
             </a-button>
             <a-dropdown v-if="!buttonState || buttonState.export && buttonRendering('export')">
               <a-menu slot="overlay">
-                <a-menu-item :disabled="selectedRowKeys.length === 0" key="1" @click="handleExport(true)"><a-icon
+                <a-menu-item :disabled="selectedRowKeys.length === 0" key="1" @click="handleExport('selected')"><a-icon
                   :style="iconStyle"
                   type="ordered-list"/>导出选中数据</a-menu-item>
-                <a-menu-item key="2" @click="handleExport(false)"><a-icon :style="iconStyle" type="snippets"/>导出本页数据</a-menu-item>
-                <a-menu-item key="3" @click="handleExportByQuery"><a-icon :style="iconStyle" type="download"/>导出所有符合条件的数据</a-menu-item>
-                <!--                <a-menu-item key="4" @click="handleAsyncExportByQuery"><a-icon :style="iconStyle" type="download"/>异步导出所有符合条件的数据</a-menu-item>-->
+                <a-menu-item key="2" @click="handleExport('curPage')"><a-icon :style="iconStyle" type="snippets"/>导出本页数据</a-menu-item>
+                <a-menu-item key="3" @click="handleExport('exportByQuery')"><a-icon :style="iconStyle" type="download"/>导出所有符合条件的数据</a-menu-item>
+                <!--                <a-menu-item key="4" @click="handleExport('exportByQueryASync')"><a-icon :style="iconStyle" type="download"/>异步导出所有符合条件的数据</a-menu-item>-->
               </a-menu>
               <a-button>导出 <a-icon type="down" :style="iconStyle"/> </a-button>
             </a-dropdown>
@@ -302,6 +302,9 @@
         <slot name="importExcelSlot"></slot>
       </template>
     </x-import-excel>
+    <ExportExcel
+      ref="exportExcel"
+    />
   </div>
 </template>
 <script>
@@ -309,15 +312,12 @@ 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 XFormItem from '@vue2-client/base-client/components/common/XForm/XFormItem'
 import {
-  exportData,
   query,
   querySummary,
   queryWithResource,
   remove,
-  asyncRunTask,
   getConfigByNameAsync,
   editRowSave,
   runLogic
@@ -331,10 +331,12 @@ import XDataCard from '@vue2-client/base-client/components/common/XDataCard/XDat
 import { getRealKeyData } from '@vue2-client/utils/formatter'
 import ReportTableHome from '../../../../pages/report/ReportTableHome.vue'
 import CustomFuncCel from '@vue2-client/base-client/components/common/XTable/CustomFuncCel.vue'
+import ExportExcel from '@vue2-client/base-client/components/common/XTable/ExportExcel.vue'
 
 export default {
   name: 'XTable',
   components: {
+    ExportExcel,
     CustomFuncCel,
     XDataCard,
     TableSetting,
@@ -347,6 +349,11 @@ export default {
     ReportTableHome
   },
   inject: ['getSelf'],
+  provide () {
+    return {
+      tableContext: this
+    }
+  },
   data () {
     return {
       uniqueId: `x-table-${this._uid}`, // 使用 _uid 生成唯一 ID
@@ -474,7 +481,8 @@ export default {
       // 暂存行编辑前数据 用于比较哪些变化了才需要保存
       editRowBeforeData: [],
       // 是否简易模式
-      simpleMode: false
+      simpleMode: false,
+      queryParams: {}
     }
   },
   props: {
@@ -603,9 +611,9 @@ export default {
         })
       }
     },
-    importExcelOk () {
+    importExcelOk (data) {
       this.refresh(true)
-      this.$emit('importExcelOk')
+      this.$emit('importExcelOk', data)
     },
     /**
      * 行选择事件
@@ -687,7 +695,6 @@ export default {
         cardModeConfig,
         summaryUpdate
       } = params
-      console.log('我的table', createdQuery)
       this.showSummary = Object.keys(tableSummaryMap).length > 0
       if (this.showSummary) {
         Object.keys(tableSummaryMap).forEach(item => {
@@ -965,93 +972,8 @@ export default {
       const indexColumn = this.tableColumns.find(i => i?.slotType === 'index')
       return indexColumn ? indexColumn.dataIndex : this.tableColumns[0].dataIndex
     },
-    // 导出选中或本页数据
-    handleExport (isSelected) {
-      const tHeader = this.tableColumns.filter(res => res.slotType !== 'action').map(res => res.title)
-      const filterVal = this.tableColumns.filter(res => res.slotType !== 'action').map(res => res.dataIndex)
-      let exportData
-      if (isSelected) {
-        exportData = this.selectedRows
-      } else {
-        exportData = this.$refs.table.localDataSource
-      }
-      exportJson(tHeader, exportData.map(v => filterVal.map(j => v[j])), this.title + `数据_${new Date().toLocaleString()}`)
-    },
-    // 导出符合条件的数据
-    handleExportByQuery () {
-      const that = this
-      const conditionParams = Object.assign(that.form, that.fixedQueryForm)
-      this.$confirm({
-        title: '是否确认导出?',
-        content: '此操作将导出当前条件下所有数据而非选中数据',
-        onOk () {
-          exportData({
-            queryParamsName: that.queryParamsName,
-            queryParams: that.queryParams,
-            form: conditionParams,
-            userId: that.currUser.id
-          }, that.serviceName, that.env === 'dev').then(res => {
-            let value = res
-            if (that.compatible === 'V4' || (Object.keys(res).length === 1 && Object.prototype.hasOwnProperty.call(res, 'value'))) {
-              value = res.value
-            }
-            // window.open('/res/excel/export/' + value)
-            window.open(value)
-          })
-        },
-        onCancel () {
-        }
-      })
-    },
-    handleAsyncExportByQuery () {
-      const that = this
-      const conditionParams = Object.assign(that.form, that.fixedQueryForm)
-      this.$confirm({
-        title: '是否确认导出?',
-        content: (h) => (
-          <div>
-            <p>此操作将导出当前条件下所有数据而非选中数据</p>
-            {/* eslint-disable-next-line no-return-assign */}
-            <a-input placeholder="请输入导出文件名" onChange={(e) => this.exportFileName = e.target.value}/>
-          </div>
-        ),
-        onOk: () => {
-          if (!this.exportFileName) {
-            this.$message.error('文件名不能为空')
-            // eslint-disable-next-line prefer-promise-reject-errors
-            return Promise.reject() // 阻止对话框关闭
-          }
-          // 在这里执行导出的逻辑，并使用 this.exportFileName 作为文件名
-          const queryData = {
-            queryParamsName: that.queryParamsName,
-            queryParams: that.queryParams,
-            form: conditionParams,
-            userId: that.currUser.id
-          }
-          const date = formatDate(new Date(), 'yyyy-MM-dd hh:mm:ss')
-
-          asyncRunTask({
-            f_task_type: '导出',
-            f_task_class: 'com.af.v4.impl.CommonExportHandlerImpl',
-            f_user_id: that.currUser.id,
-            // 导出条件
-            f_tag1: queryData,
-            // 导出文件名
-            f_tag2: this.exportFileName + '_' + that.currUser.username,
-            // 执行数据源
-            f_tag3: process.env.VUE_APP_SYSTEM_NAME,
-            f_service_name: that.serviceName || process.env.VUE_APP_SYSTEM_NAME,
-            f_task_name: `${this.exportFileName}_${that.currUser.username}_${date}`
-          }, that.serviceName, that.env === 'dev')
-            .then(res => {
-            }).catch(error => {
-            // 失败时的处理
-            console.log('失败:', error)
-          })
-        },
-        onCancel () {
-        }
-      })
+    handleExport (type) {
+      this.$refs.exportExcel.handleExport(type)
     },
     // 新增业务
     add () {

package/src/main.js

@@ -20,7 +20,6 @@ const router = new Router(routerOptions)
 Vue.$store = store
 Vue.$router = router
 Vue.$i18n = i18n
-
 // 绑定原型
 Vue.Modal = Modal
 

package/src/pages/DynamicStatistics/FavoriteList.vue

@@ -1,50 +1,50 @@
-<template>
-  <div>
-    <a-list v-show="!loading" size="small" :data-source="data">
-      <a-list-item slot="renderItem" slot-scope="item">
-        <div>
-          <p><a @click="$emit('openFavorites', item.uuid)">{{ item.question }} </a></p>
-          <p>{{ item.date }}</p>
-        </div>
-        <a class="delete_item">
-          <a-icon type="close" @click="$emit('saveToFavorites', item.uuid)"/>
-        </a>
-      </a-list-item>
-    </a-list>
-  </div>
-</template>
-
-<script>
-import { indexedDB } from '@vue2-client/utils/indexedDB'
-
-export default {
-  name: 'FavoriteList',
-  data () {
-    return {
-      data: [],
-      loading: false
-    }
-  },
-  mounted () {
-    this.loadData()
-  },
-  methods: {
-    loadData () {
-      indexedDB.getAll((data) => {
-        const realData = data.filter(item => item.data && item.data.uuid)
-          .map(item => item.data)
-        this.data = realData
-      })
-    }
-  }
-}
-</script>
-<style lang="less" scoped>
-.delete_item {
-  margin-left: 8px;
-  color: #333;
-}
-p {
-  margin: 0
-}
-</style>
+<template>
+  <div>
+    <a-list v-show="!loading" size="small" :data-source="data">
+      <a-list-item slot="renderItem" slot-scope="item">
+        <div>
+          <p><a @click="$emit('openFavorites', item.uuid)">{{ item.question }} </a></p>
+          <p>{{ item.date }}</p>
+        </div>
+        <a class="delete_item">
+          <a-icon type="close" @click="$emit('saveToFavorites', item.uuid)"/>
+        </a>
+      </a-list-item>
+    </a-list>
+  </div>
+</template>
+
+<script>
+import { indexedDB } from '@vue2-client/utils/indexedDB'
+
+export default {
+  name: 'FavoriteList',
+  data () {
+    return {
+      data: [],
+      loading: false
+    }
+  },
+  mounted () {
+    this.loadData()
+  },
+  methods: {
+    loadData () {
+      indexedDB.getAll((data) => {
+        const realData = data.filter(item => item.data && item.data.uuid)
+          .map(item => item.data)
+        this.data = realData
+      })
+    }
+  }
+}
+</script>
+<style lang="less" scoped>
+.delete_item {
+  margin-left: 8px;
+  color: #333;
+}
+p {
+  margin: 0
+}
+</style>

package/src/router/async/router.map.js

@@ -87,9 +87,9 @@ routerResource.example = {
           // component: () => import('@vue2-client/base-client/components/common/XFormGroup/demo.vue'),
           // component: () => import('@vue2-client/base-client/components/common/XFormGroup/demo.vue'),
           // component: () => import('@vue2-client/base-client/components/common/XReport/XReportDemo.vue'),
-          // component: () => import('@vue2-client/base-client/components/common/XFormTable/demo.vue'),
+          component: () => import('@vue2-client/base-client/components/common/XFormTable/demo.vue'),
           // component: () => import('@vue2-client/base-client/components/common/XTab/XTabDemo.vue'),
-          component: () => import('@vue2-client/base-client/components/common/XReportGrid/XReportDemo.vue'),
+          // component: () => import('@vue2-client/base-client/components/common/XReportGrid/XReportDemo.vue'),
           // component: () => import('@vue2-client/pages/WorkflowDetail/WorkFlowDemo.vue'),
           // component: () => import('@vue2-client/base-client/components/common/XConversation/XConversationDemo.vue'),
           // component: () => import('@vue2-client/base-client/components/common/XButtons/XButtonDemo.vue'),

package/src/services/api/entity.js

@@ -1,18 +1,18 @@
-import { post } from '@vue2-client/services/api/restTools'
-
-const entityApi = {
-  // 根据ID查询数据
-  getById: (entityName, id, data = {}, serviceName = process.env.VUE_APP_SYSTEM_NAME) => {
-    return post(`/api/${serviceName}/entity/query/${entityName}/${id}`, data)
-  },
-  // 根据ID集合查询所有数据
-  findAllByIds: (entityName, data, serviceName = process.env.VUE_APP_SYSTEM_NAME) => {
-    return post(`/api/${serviceName}/entity/query/${entityName}`, data)
-  },
-  // 查询实体的总数量
-  getCount: (entityName, serviceName = process.env.VUE_APP_SYSTEM_NAME) => {
-    return post(`/api/${serviceName}/entity/queryCount/${entityName}`, {})
-  }
-}
-
-export { entityApi }
+import { post } from '@vue2-client/services/api/restTools'
+
+const entityApi = {
+  // 根据ID查询数据
+  getById: (entityName, id, data = {}, serviceName = process.env.VUE_APP_SYSTEM_NAME) => {
+    return post(`/api/${serviceName}/entity/query/${entityName}/${id}`, data)
+  },
+  // 根据ID集合查询所有数据
+  findAllByIds: (entityName, data, serviceName = process.env.VUE_APP_SYSTEM_NAME) => {
+    return post(`/api/${serviceName}/entity/query/${entityName}`, data)
+  },
+  // 查询实体的总数量
+  getCount: (entityName, serviceName = process.env.VUE_APP_SYSTEM_NAME) => {
+    return post(`/api/${serviceName}/entity/queryCount/${entityName}`, {})
+  }
+}
+
+export { entityApi }

package/src/services/api/workFlow.js

@@ -1,63 +1,63 @@
-// 工单专用api
-const workFlowViewApi = {
-  // 查询：获取工作流基本数据
-  getWorkFlowBasicInfo: '/logic/getWorkFlowBasicInfo',
-  // 保存工作流流程定义
-  saveWorkFlowWorkflowDefine: '/logic/saveWorkFlowWorkflowDefine',
-  // 获取工作流流程定义
-  getWorkFlowDefine: '/logic/getWorkFlowDefine',
-  // 获取工作流当前步骤
-  getWorkFlowCurrentSubState: '/logic/getWorkFlowCurrentSubState',
-  // 保存用户每一步输入的表单内容
-  saveWorkFlowStepFormData: '/logic/saveWorkFlowStepFormData',
-  // 获取已经完成步骤的用户填写数据
-  getWorkFlowCompletedStepData: '/logic/getWorkFlowCompletedStepData',
-  // 改变工作流进度
-  updateWorkFlowState: '/logic/updateWorkFlowState',
-  // 完工确认后更改工作流状态
-  afterWorkFlowFinalStepSubmit: '/logic/afterWorkFlowFinalStepSubmit',
-  // 获取步骤留言和表单填写人姓名
-  getStepNoteAndHandler: '/logic/getStepNoteAndHandler',
-  // 更新步骤信息
-  updateWorkFlowStepData: '/logic/updateWorkFlowStepData',
-  // 保存工作流日志
-  saveWorkFlowLog: '/logic/saveWorkFlowLog',
-  // 获取工作流日志
-  getWorkFlowLog: '/logic/getWorkFlowLog',
-  // 获取员工任务详情信息
-  getEmployeeTaskDetail: '/logic/getEmployeeTaskDetail',
-  // 根据条件查询任务
-  getWorkFlowListByCondition: '/logic/getWorkFlowListByCondition',
-  // 根据流程名称获取所有步骤名称
-  getWorkFlowStepNames: '/logic/getWorkFlowStepNames',
-  // 获取工作流任务留言
-  getWorkFlowLeaveMessage: '/logic/getWorkFlowLeaveMessage',
-  // 更新任务完成时间
-  updateWorkFlowCompleteTime: '/logic/updateWorkFlowCompleteTime',
-  // 获取任务完成时间更改记录
-  getWorkFlowCompleteTimeChange: '/logic/getWorkFlowCompleteTimeChange',
-  // 修改工单
-  updateWorkFlow: '/logic/updateWorkFlow',
-  // 获取工作流流程图设计
-  getWorkFlowPaintWorkFlowDefine: '/logic/getWorkFlowPaintWorkFlowDefine',
-  // 简单添加字典项
-  simpleInsertIntoDictionary: '/logic/simpleInsertIntoDictionary',
-  // 删除工作流项目
-  deleteWorkFlow: '/logic/deleteWorkFlow',
-  // 获取流程分类数据
-  getWorkFlowCategoryTree: '/logic/getWorkFlowCategoryTree',
-  // 创建任务
-  createWorkflowTask: '/logic/createWorkflowTask',
-  // 获取部门选择框数据
-  getDepartmentList: '/logic/getDepartmentList',
-  // 获取人员任务汇总数据
-  getEmployeeSummary: '/logic/getEmployeeSummary',
-  // 获取逾期任务排行榜
-  getOverdueRanking: '/logic/getOverdueRanking',
-  // 根据人查询对应的t_workflow_step中字段f_workflow_id的数据组
-  getWorkFlowStepWorkFlowId: '/logic/getWorkFlowStepWorkFlowId',
-  // 表单提交到下一步
-  submitToNextStep: '/logic/submitToNextStep'
-}
-
-export { workFlowViewApi }
+// 工单专用api
+const workFlowViewApi = {
+  // 查询：获取工作流基本数据
+  getWorkFlowBasicInfo: '/logic/getWorkFlowBasicInfo',
+  // 保存工作流流程定义
+  saveWorkFlowWorkflowDefine: '/logic/saveWorkFlowWorkflowDefine',
+  // 获取工作流流程定义
+  getWorkFlowDefine: '/logic/getWorkFlowDefine',
+  // 获取工作流当前步骤
+  getWorkFlowCurrentSubState: '/logic/getWorkFlowCurrentSubState',
+  // 保存用户每一步输入的表单内容
+  saveWorkFlowStepFormData: '/logic/saveWorkFlowStepFormData',
+  // 获取已经完成步骤的用户填写数据
+  getWorkFlowCompletedStepData: '/logic/getWorkFlowCompletedStepData',
+  // 改变工作流进度
+  updateWorkFlowState: '/logic/updateWorkFlowState',
+  // 完工确认后更改工作流状态
+  afterWorkFlowFinalStepSubmit: '/logic/afterWorkFlowFinalStepSubmit',
+  // 获取步骤留言和表单填写人姓名
+  getStepNoteAndHandler: '/logic/getStepNoteAndHandler',
+  // 更新步骤信息
+  updateWorkFlowStepData: '/logic/updateWorkFlowStepData',
+  // 保存工作流日志
+  saveWorkFlowLog: '/logic/saveWorkFlowLog',
+  // 获取工作流日志
+  getWorkFlowLog: '/logic/getWorkFlowLog',
+  // 获取员工任务详情信息
+  getEmployeeTaskDetail: '/logic/getEmployeeTaskDetail',
+  // 根据条件查询任务
+  getWorkFlowListByCondition: '/logic/getWorkFlowListByCondition',
+  // 根据流程名称获取所有步骤名称
+  getWorkFlowStepNames: '/logic/getWorkFlowStepNames',
+  // 获取工作流任务留言
+  getWorkFlowLeaveMessage: '/logic/getWorkFlowLeaveMessage',
+  // 更新任务完成时间
+  updateWorkFlowCompleteTime: '/logic/updateWorkFlowCompleteTime',
+  // 获取任务完成时间更改记录
+  getWorkFlowCompleteTimeChange: '/logic/getWorkFlowCompleteTimeChange',
+  // 修改工单
+  updateWorkFlow: '/logic/updateWorkFlow',
+  // 获取工作流流程图设计
+  getWorkFlowPaintWorkFlowDefine: '/logic/getWorkFlowPaintWorkFlowDefine',
+  // 简单添加字典项
+  simpleInsertIntoDictionary: '/logic/simpleInsertIntoDictionary',
+  // 删除工作流项目
+  deleteWorkFlow: '/logic/deleteWorkFlow',
+  // 获取流程分类数据
+  getWorkFlowCategoryTree: '/logic/getWorkFlowCategoryTree',
+  // 创建任务
+  createWorkflowTask: '/logic/createWorkflowTask',
+  // 获取部门选择框数据
+  getDepartmentList: '/logic/getDepartmentList',
+  // 获取人员任务汇总数据
+  getEmployeeSummary: '/logic/getEmployeeSummary',
+  // 获取逾期任务排行榜
+  getOverdueRanking: '/logic/getOverdueRanking',
+  // 根据人查询对应的t_workflow_step中字段f_workflow_id的数据组
+  getWorkFlowStepWorkFlowId: '/logic/getWorkFlowStepWorkFlowId',
+  // 表单提交到下一步
+  submitToNextStep: '/logic/submitToNextStep'
+}
+
+export { workFlowViewApi }

package/src/utils/waterMark.js

@@ -1,31 +1,31 @@
-/**
- * @description: createWaterMark.js 加水印功能
- */
-let waterMarkDOM
-
-const clearWaterMark = () => {
-  if (waterMarkDOM) waterMarkDOM.remove()
-}
-/**
- * @description: 创建水印
- * @param waterMarkName 水印内容
- */
-export default function createWaterMark (waterMarkName) {
-  clearWaterMark()
-  if (!waterMarkName) {
-    return
-  }
-  const width = window.parseInt(document.body.clientWidth)
-  const canvasWidth = width / window.parseInt(width / 320)
-  const fontFamily = window.getComputedStyle(document.body)['font-family']
-  const fragment = document.createDocumentFragment()
-  waterMarkDOM = document.createElement('div')
-  waterMarkDOM.className = 'water-mark-wrap'
-  let spanStr = ''
-  for (let i = 0; i < 100; i++) {
-    spanStr += `<span class="water-word" style=width:${canvasWidth}px;height:200px;font: ${fontFamily}>${waterMarkName}</span>`
-  }
-  waterMarkDOM.innerHTML = spanStr
-  fragment.appendChild(waterMarkDOM)
-  document.body.appendChild(fragment)
-}
+/**
+ * @description: createWaterMark.js 加水印功能
+ */
+let waterMarkDOM
+
+const clearWaterMark = () => {
+  if (waterMarkDOM) waterMarkDOM.remove()
+}
+/**
+ * @description: 创建水印
+ * @param waterMarkName 水印内容
+ */
+export default function createWaterMark (waterMarkName) {
+  clearWaterMark()
+  if (!waterMarkName) {
+    return
+  }
+  const width = window.parseInt(document.body.clientWidth)
+  const canvasWidth = width / window.parseInt(width / 320)
+  const fontFamily = window.getComputedStyle(document.body)['font-family']
+  const fragment = document.createDocumentFragment()
+  waterMarkDOM = document.createElement('div')
+  waterMarkDOM.className = 'water-mark-wrap'
+  let spanStr = ''
+  for (let i = 0; i < 100; i++) {
+    spanStr += `<span class="water-word" style=width:${canvasWidth}px;height:200px;font: ${fontFamily}>${waterMarkName}</span>`
+  }
+  waterMarkDOM.innerHTML = spanStr
+  fragment.appendChild(waterMarkDOM)
+  document.body.appendChild(fragment)
+}