vue2-client 1.5.8 → 1.5.10

package/CHANGELOG.md

@@ -1,7 +1,7 @@
 # Change Log
 > 所有关于本项目的变化都在该文档里。
 
-**1.5.6 - 1.5.7 -2022-12-05 @江超**
+**1.5.6 - 1.5.9 -2022-12-05 @江超**
 - 修复待办界面显示异常的问题
 
 **1.5.0 - 1.5.5 -2022-12-04 @江超**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vue2-client",
-  "version": "1.5.8",
+  "version": "1.5.10",
   "private": false,
   "scripts": {
     "serve": "vue-cli-service serve",

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

@@ -7,13 +7,8 @@
     @close="onClose"
   >
     <x-add-form
-      business-title="参数设置"
-      business-type="编辑"
-      :visible.sync="editQueryVisible"
-      :json-data="formObj.formJson"
-      :modify-model-data="modifyModelDataItem"
-      :loading="loading"
-      @onSubmit="submit"/>
+      ref="xAddForm"
+      @onSubmit="onAddOrEditSubmit"/>
     <a-list
       :grid="{gutter: 24, lg: 4, md: 3, sm: 1, xs: 1}"
       :dataSource="columnJson.groups"
@@ -45,18 +40,11 @@ export default {
     return {
       // 页面宽度
       screenWidth: document.documentElement.clientWidth,
-      // 是否显示参数下发抽屉
-      editQueryVisible: false,
-      targetIndex: 0,
       columnJson: {},
-      editIndex: -1,
       formObj: {
         groupName: '',
         formJson: []
-      },
-      modifyModelDataItem: {},
-      // 参数设置业务执行状态
-      loading: false
+      }
     }
   },
   mounted () {
@@ -94,36 +82,37 @@ export default {
     toEdit (item) {
       post(commonApi.getColumnsJson, { queryObject: item }).then(res => {
         this.formObj = res
-        this.modifyModelDataItem = { data: this.modifyModelData[this.formObj.groupName] }
-        this.editQueryVisible = true
+        this.$refs.xAddForm.init({
+          formItems: this.formObj.formJson,
+          serviceName: this.formObj.serviceName
+        })
+        const modifyModelData = { data: this.modifyModelData[this.formObj.groupName] }
+        this.$refs.xAddForm.open({
+          businessType: '修改',
+          modifyModelData: modifyModelData,
+          title: this.title
+        })
       })
     },
     onClose () {
       this.$emit('update:visible', false)
     },
-    submit (res) {
-      if (res.valid) {
-        this.loading = true
-        const requestParameters = {
-          paramsJson: {}
-        }
-        requestParameters.paramsJson[this.formObj.groupName] = {}
-        for (const key of Object.keys(res.form)) {
-          const realKey = key.substring(key.indexOf('_') + 1)
-          requestParameters.paramsJson[this.formObj.groupName][realKey] = res.form[key]
-        }
-        this.$emit('onSubmit', requestParameters, result => {
-          if (result) {
-            this.$message.success('参数设置成功！')
-          } else {
-            this.$message.error('参数设置失败！')
-          }
-          this.loading = false
-          this.editQueryVisible = false
-        })
-      } else {
-        return false
+    onAddOrEditSubmit (res, callback) {
+      const requestParameters = {
+        paramsJson: {}
+      }
+      requestParameters.paramsJson[this.formObj.groupName] = {}
+      for (const key of Object.keys(res.form)) {
+        requestParameters.paramsJson[this.formObj.groupName][key] = res.form[key]
       }
+      this.$emit('onSubmit', requestParameters, result => {
+        if (result) {
+          this.$message.success('参数设置成功！')
+        } else {
+          this.$message.error('参数设置失败！')
+        }
+        callback()
+      })
     }
   }
 }

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

@@ -39,7 +39,7 @@
 import XFormItem from '@vue2-client/base-client/components/common/XForm/XFormItem'
 import { formatDate } from '@vue2-client/utils/util'
 import { mapState } from 'vuex'
-import { addOrModify, post } from '@vue2-client/services/api'
+import { post } from '@vue2-client/services/api'
 
 export default {
     name: 'XAddForm',
@@ -52,8 +52,6 @@ export default {
         viewMode: false,
         // 是否展示
         isShow: false,
-        // 查询配置文件名
-        queryParamsName: '',
         // 内容加载是否完成
         loaded: false,
         // 业务类型
@@ -105,13 +103,12 @@ export default {
     },
     methods: {
       init (params) {
-        const { isShow = true, formItems, viewMode, isTableTemp, queryParamsName, serviceName = 'af-system' } = params
+        const { isShow = true, formItems, viewMode, isTableTemp, serviceName = 'af-system' } = params
         if (isShow) {
           this.isShow = true
           this.formItems = JSON.parse(JSON.stringify(formItems))
           this.viewMode = viewMode
           this.isTableTemp = isTableTemp
-          this.queryParamsName = queryParamsName
           this.serviceName = serviceName
         }
       },
@@ -251,24 +248,18 @@ export default {
             })
             return
           }
-          // 组织请求
-          const requestParameters = {
-            queryParamsName: this.queryParamsName,
-            form: {},
-            businessType: this.businessType,
-            operator: this.currUser.name
-          }
+          // 处理表单键问题
+          const realForm = {}
           for (const key of Object.keys(requestForm)) {
             const realKey = this.getRealKey(key)
-            requestParameters.form[realKey] = requestForm[key]
+            realForm[realKey] = requestForm[key]
           }
-          addOrModify(requestParameters, this.serviceName).then(res => {
-            this.$message.success(this.businessType + '成功！')
-            // commit
-            this.$emit('afterSubmit', { type: this.businessType, id: res.id, form: requestParameters.form })
-          }).catch(e => {
-            this.$message.error(this.businessType + '失败：' + e)
-          }).finally(() => {
+          // 交由父级处理
+          this.$emit('onSubmit', {
+            businessType: this.businessType,
+            realForm: realForm,
+            currUserName: this.currUser.name
+          }, () => {
             this.close()
           })
         })

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

@@ -2,7 +2,7 @@
   <div>
     <x-add-form
       ref="xAddForm"
-      @afterSubmit="afterAddOrEditSubmit"
+      @onSubmit="onAddOrEditSubmit"
     />
     <x-form
       ref="xForm"
@@ -44,7 +44,7 @@ import XForm from '@vue2-client/base-client/components/common/XForm'
 import XAddForm from '@vue2-client/base-client/components/common/XAddForm'
 import XTable from '@vue2-client/base-client/components/common/XTable'
 import XImportExcel from '@vue2-client/base-client/components/common/XImportExcel'
-import { commonApi } from '@vue2-client/services/api/common'
+import { addOrModify, commonApi } from '@vue2-client/services/api/common'
 import { indexedDB } from '@vue2-client/utils/indexedDB'
 import { mapState } from 'vuex'
 import { post } from '@vue2-client/services/api/restTools'
@@ -131,7 +131,7 @@ export default {
     },
     fixedQueryForm: {
       handler () {
-        this.$refs.xTable.refresh(true)
+        this.refreshTable(true)
       },
       deep: true
     },
@@ -194,7 +194,6 @@ export default {
         formItems: res.formJson,
         viewMode: this.viewMode,
         isTableTemp: this.isTableTemp,
-        queryParamsName: this.queryParamsName,
         serviceName: res.serviceName
       })
     },
@@ -213,11 +212,26 @@ export default {
       }
     },
     /**
-     * 新增或修改后事件
-     * @param res  参数
+     * 提交新增表单事件
      */
-    afterAddOrEditSubmit (res) {
-      this.$refs.xTable.refresh(res.type === '新增')
+    onAddOrEditSubmit (res, callback) {
+      // 组织请求
+      const requestParameters = {
+        queryParamsName: this.queryParamsName,
+        form: res.realForm,
+        businessType: res.businessType,
+        operator: res.currUserName
+      }
+      addOrModify(requestParameters, this.serviceName).then(data => {
+        this.$message.success(res.businessType + '成功！')
+        this.refreshTable(res.businessType === '新增')
+        // commit
+        this.$emit('afterSubmit', { type: res.businessType, id: data.id, form: requestParameters.form })
+      }).catch(e => {
+        this.$message.error(res.businessType + '失败：' + e)
+      }).finally(() => {
+        callback()
+      })
     },
     /**
      * 表格查询后事件
@@ -283,7 +297,14 @@ export default {
      */
     tempTableEdit (res) {
       this.$emit('tempTableEdit', res)
-    }
+    },
+    /**
+     * 刷新表格
+     * @param toFirstPage 是否到第一页
+     */
+    refreshTable (toFirstPage = true) {
+      this.$refs.xTable.refresh(toFirstPage)
+    },
   }
 }
 </script>

package/src/components/Ellipsis/Ellipsis.vue

@@ -21,7 +21,8 @@ export default {
       default: 'ant-pro-ellipsis'
     },
     tooltip: {
-      type: Boolean
+      type: Boolean,
+      default: false
     },
     length: {
       type: [String, Number],

package/src/layouts/header/HeaderNotice.vue

@@ -28,7 +28,7 @@
               <a-list class="tab-pane"></a-list>
             </a-tab-pane>
             <a-tab-pane key="3" tab="待办">
-              <a-list :data-source="backlog" class="tab-pane" item-layout="horizontal">
+              <a-list :data-source="backlog" class="tab-pane" item-layout="horizontal" :pagination="pagination">
                 <a-list-item slot="renderItem" slot-scope="item">
                   <a v-if="item.type==='制度待确认'" slot="actions" @click="confirm_institution(item)">查看</a>
                   <a-list-item-meta :description="item.description" :title="item.title"/>
@@ -63,6 +63,12 @@ export default {
       institution: undefined,
       affirmInstitution: undefined,
       backlog: [],
+      pagination: {
+        onChange: page => {
+          console.log(page)
+        },
+        pageSize: 5
+      },
       activeKey: '1'
     }
   },
@@ -88,7 +94,7 @@ export default {
                 key,
                 message: `您有${this.backlog.length}条待办需要确认`,
                 top: '50px',
-                description: <ellipsis length="200" tooltip>{ this.backlog.map((item, index) => index + 1 + '、' + item.title).join('；') }</ellipsis>,
+                description: <ellipsis length="200">{ this.backlog.map((item, index) => index + 1 + '、' + item.title).join('；') }</ellipsis>,
                 icon: <a-icon type="container" style="color: #f5222d"/>,
                 btn: h => {
                   return h(