vue2-client 1.9.8 → 1.9.10

package/docs/Logic/345/207/275/346/225/260/344/275/277/347/224/250/347/233/270/345/205/263.md

@@ -16,7 +16,7 @@
   * sql.query(sql别名 string，sql参数 string，页数 int，每页行数 int) 执行已经注册的sql 返回 org.json.JSONArray
   * sql.querySQL(sql名称，sql语句) 执行一个没有注册的sql语句 返回 org.json.JSONArray
   * sql.querySQL(sql名称，sql语句，页数 int，每页行数 int) ) 执行一个没有注册的sql语句 返回 org.json.JSONArray
-  * sql.execSQL(sql名称，sql语句，页数 int，每页行数 int) ) 执行一个增删改sql语句 返回 org.json.JSONArray
+  * sql.execSQL(sql名称，sql语句) 执行一个增删改sql语句 返回 org.json.JSONArray
 - entity 对应 EntityService 类，其中有方法
   * entity.partialSave(实体名称 string,保存参数 org.json.JSONObject) 返回整个实体 JSONObject
   * entity.delete(实体名称 string,id Object)

package/docs//345/207/275/346/225/260/344/275/277/347/224/250/347/233/270/345/205/263.md

@@ -4,10 +4,12 @@
 - 用this.函数函数调用方式调用相应功能。
 
 # 通过this可以调用的函数
+- openDialog(configName, selectedId, mixinData)：打开一个对话框，例如：this.openDialog('xxx', 5, {})
 - openDialog(configName, selectedId, mixinData, outEnv)：打开一个对话框：
 * selectId：id号，formtable选择时，用selectId过滤数据 可以传递 json {a_id: 1} 或者 传递 1  ，传递数值会默认拼接查询条件 {selected_id:1}
 * mixinData: form表单需要的数据
 * outEnv: 传递给打开的界面的数据，在打开界面的js中通过this.outEnv可以访问
+* getOutEnv 获取获取 outEnv
 ```js
 this.openDialog('xxx', 5, {}, {})
 ```
@@ -17,31 +19,7 @@ this.openDialog('xxx', 5, {}, {})
 - 先给组件起名字，命名规范：main，left，right，top，bottom
 - 用 this.getComponentByName('main') 拿到组件。
 
-# 特殊处理
-- form表单提交数据到列表，而非后台。用 `this.outEnv.data.push(...[])`刷新列表数据。
-
 # x-form-table 可以使用的函数/数据
-- getTableData(): 获取所有数据
-- 获取selectedid getSelectedId()
-- 重新查询 refreshTable()
-```js
-假如组件名称叫 xtable
-// 所有选中的id
-const allid =  this.$refs.xtable.table_selectedRowKeys
-// 所有选中的行 table_selectedRowKeys
-const allrecord =  this.$refs.xtable.table_selectedRows
-
-// xtable 所调用事件
-// 新增修改后调用事件
-afterSubmit( type(新增/修改/擦和讯), id: (所操作的主键id), form: (请求的表单内容))
-// 查询后
-afterQuery( res (查询后数据), querparams (查询参数))
-// 删除后
-afterDelete( res (删除接口返回数据))
-// 操作按钮
-action(record (当前记录), id （当前记录主键）, actionType （操作类型）)
-```
-
 - table_selectedRowKeys 获取选中的id  /不用加 () 这是一个data 中的变量
 - table_selectedRows 获取选中的行  /不用加 () 这是一个data 中的变量
 - getSelectedId 获取获取selectedid

package/package.json

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

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

@@ -71,6 +71,7 @@ export default {
         getSelectedId: () => this.getSelectedId(),
         getSelectedData: () => { return this.selectedId },
         getMixinData: () => { return this.mixinData },
+        getOutEnv: () => { return this.outEnv },
         isInAModal: () => { return true }
       }
     },

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

@@ -134,7 +134,7 @@ export default {
     XAddReport,
     XImportExcel
   },
-  inject: ['getSelectedId', 'getSelectedData', 'getMixinData'],
+  inject: ['getSelectedId', 'getSelectedData', 'getMixinData', 'getOutEnv'],
   data () {
     return {
       // 加载状态
@@ -374,7 +374,8 @@ export default {
           env: this.env,
           form: this.$refs.xForm.form,
           allowedCardMode: res.allowedCardMode,
-          cardModeConfig: res.cardModeConfig
+          cardModeConfig: res.cardModeConfig,
+          summaryUpdate: true
         })
       }
       this.loading = false

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

@@ -490,7 +490,7 @@ export default {
       // tableConfig: {}
     }
   },
-  inject: ['openDialog', 'registerComponent', 'getComponentByName', 'runLogic', 'getMixinData', 'getSelectedId', 'isInAModal', 'getConfigByName', 'getSelectedData'],
+  inject: ['openDialog', 'registerComponent', 'getComponentByName', 'runLogic', 'getMixinData', 'getSelectedId', 'isInAModal', 'getConfigByName', 'getSelectedData', 'getOutEnv'],
   methods: {
     onComponentMounted (h, cell, cellIndex) {
       if (this.getMixinData && this.getMixinData()) {

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

@@ -36,7 +36,7 @@ export default {
     XAddNativeForm: () => import('@vue2-client/base-client/components/common/XAddNativeForm/XAddNativeForm.vue'),
     XReportGrid: () => import('@vue2-client/base-client/components/common/XReportGrid/XReport.vue')
   },
-  inject: ['isInAModal', 'getSelectedId', 'getSelectedData'],
+  inject: ['isInAModal', 'getSelectedId', 'getSelectedData', 'getOutEnv'],
   data () {
     return {
       activeKey: 0,

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

@@ -213,6 +213,7 @@
       :closable="false"
       :visible="summaryDrawerVisible"
       :z-index="2000"
+      width="25%"
       :after-visible-change="afterVisibleChange"
       @close="onClose"
     >
@@ -224,7 +225,15 @@
             :title="f.title + '：'"
             :value="f.value"
             :precision="2"
-            style="margin-right: 50px"/>
+            style="margin-right: 50px">
+            <template #prefix>
+              <a-spin :spinning="f.loading">
+              </a-spin>
+            </template>
+            <template #suffix>
+              <a-icon v-show="!f.loading" :type="f.success !== false ? 'check-circle' : 'close-circle'" :style="{color: f.success !== false ? 'green' : 'red'}"/>
+            </template>
+          </a-statistic>
         </div>
       </template>
     </a-drawer>
@@ -255,7 +264,9 @@ import {
   querySummary,
   queryWithResource,
   remove,
-  asyncRunTask, editRowSave
+  asyncRunTask,
+  editRowSave,
+  runLogic
 } from '@vue2-client/services/api/common'
 import XImportExcel from '@vue2-client/base-client/components/common/XImportExcel'
 import { Modal } from 'ant-design-vue'
@@ -356,6 +367,8 @@ export default {
       buttonPermissions: [],
       // 是否展示汇总
       showSummary: false,
+      // 自定义汇总
+      showCustomSummary: false,
       summaryData: [],
       // 图标样式
       iconStyle: {
@@ -370,6 +383,7 @@ export default {
       summaryDrawerVisible: false,
       // 汇总更新标志
       summaryUpdate: false,
+      customSummaryArray: [],
       formItems: [],
       // 是否为编辑模式
       isEditMode: false,
@@ -535,15 +549,42 @@ export default {
         form,
         serviceName,
         tableSummaryMap = {},
+        customTableSummaryArray = [
+        ],
         viewMode,
         formItems,
         env = 'prod',
         createdQuery = true,
         primaryKey,
         allowedCardMode = false,
-        cardModeConfig
+        cardModeConfig,
+        summaryUpdate
       } = params
       this.showSummary = Object.keys(tableSummaryMap).length > 0
+      if (this.showSummary) {
+        Object.keys(tableSummaryMap).forEach(item => {
+          this.summaryData.push({
+            key: item,
+            title: tableSummaryMap[item],
+            value: ' ',
+            loading: true,
+            success: false
+          })
+        })
+      }
+      if (customTableSummaryArray.length > 0) {
+        customTableSummaryArray.forEach(item => {
+          this.summaryData.push({
+            key: item.key,
+            title: item.title,
+            value: ' ',
+            loading: true,
+            success: false
+          })
+        })
+        this.showCustomSummary = true
+        this.customSummaryArray = customTableSummaryArray
+      }
       this.queryParams = queryParams
       this.tableColumns = JSON.parse(JSON.stringify(tableColumns))
       if (this.tableColumns.length === 0) {
@@ -562,6 +603,7 @@ export default {
       this.rowKey = this.getPrimaryKeyName()
       this.allowedCardMode = allowedCardMode
       this.cardModeConfig = cardModeConfig
+      this.summaryUpdate = summaryUpdate
       let totalWidth = 0
       for (let i = 0; i < this.tableColumns.length; i++) {
         const item = this.tableColumns[i]
@@ -979,11 +1021,49 @@ export default {
     },
     async retrieveSummaryData () {
       if (this.requestParameters.querySummary) {
-        this.summaryData = await querySummary(Object.assign(this.requestParameters, { userId: this.currUser?.id }), this.serviceName, this.env === 'dev')
+        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 => {
+                if (item.title === summary.title) {
+                  item.value = summary.value
+                  item.success = true
+                  item.loading = false
+                }
+              })
+            })
+          }
+        })
+      }
+      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) => {
+            this.summaryData.forEach(summary => {
+              if (item.key === summary.key) {
+                summary.value = res.value
+                summary.success = true
+                summary.loading = false
+              }
+            })
+          }).catch(e => {
+            this.summaryData.forEach(summary => {
+              if (item.key === summary.key) {
+                summary.value = 0
+                summary.success = false
+                summary.loading = false
+              }
+            })
+          })
+        })
       }
     },
     showDrawer () {
       if (this.summaryUpdate) {
+        this.summaryData.forEach(item => {
+          item.loading = true
+          item.success = false
+          item.value = ' '
+        })
         this.summaryDrawerVisible = true
       } else {
         this.$message.warning('请查询后再来查看')

package/src/pages/WorkflowDetail/WorkFlowDemo.vue

@@ -8,12 +8,23 @@ export default {
     this.$refs.workFlow.init({
       workflowId: '9'
     })
+  },
+  methods: {
+    /**
+     * 流程详情页成功
+     * @param note 备注信息
+     * @param form 表单信息
+     * @param workflowId
+     */
+    success ({ note, form, workflowId }) {
+      console.log('success', note, form, workflowId)
+    }
   }
 }
 </script>
 
 <template>
-  <WorkflowDetail ref="workFlow"></WorkflowDetail>
+  <WorkflowDetail ref="workFlow" @success="success"></WorkflowDetail>
 </template>
 
 <style scoped lang="less">

package/src/pages/WorkflowDetail/WorkflowDetail.vue

@@ -35,15 +35,19 @@
                 :taskName="details.f_task_name"
                 :details="details"
                 @refresh="stepChanged"
+                @success="success"
               />
             </a-tab-pane>
             <a-tab-pane key="2" tab="任务流转记录">
-              <workflow-log v-if="activeKey === '2'" :workflow-id="workflowId" />
+              <workflow-log v-if="activeKey === '2'" :workflow-id="workflowId"/>
             </a-tab-pane>
             <a-tab-pane key="4">
               <span slot="tab">
                 <span>任务留言</span>
-                <a-badge :count="messageList.length" :offset="[4, -4]" :number-style="{ backgroundColor: '#b2b2b2' }"></a-badge>
+                <a-badge
+                  :count="messageList.length"
+                  :offset="[4, -4]"
+                  :number-style="{ backgroundColor: '#b2b2b2' }"></a-badge>
               </span>
               <a-row>
                 <a-col :span="14">
@@ -116,8 +120,7 @@ export default {
     ...mapState('account', { currUser: 'user' }),
     ...mapState('setting', ['isMobile'])
   },
-  props: {
-  },
+  props: {},
   mounted () {
     // this.init()
   },
@@ -187,8 +190,9 @@ export default {
       this.activeKey = id
     },
     // 提交完成后事件
-    success () {
-      this.$emit('success')
+    success (res) {
+      this.visible = false
+      this.$emit('success', res)
     }
   }
 }

package/src/pages/WorkflowDetail/WorkflowPageDetail/WorkFlowHandle.vue

@@ -418,29 +418,23 @@ export default {
     },
     // 完工按钮
     async lastStepNextClick () {
-      await this.$refs.xAddForm.onSubmit()
-      if (!this.formValid) {
-        console.log('nothing')
-      } else {
-        return postByServiceName(workFlowViewApi.afterWorkFlowFinalStepSubmit, {
+      this.$refs.xAddForm.asyncSubmit().then((res) => {
+        this.submitForm(res)
+        postByServiceName(workFlowViewApi.afterWorkFlowFinalStepSubmit, {
           workflowId: this.workflowId
-        })
-          .then(
-            res => {
-              this.saveWorkflowLog('确认完工', '最后一步: ' + this.getStepNameByStepId(this.currentStepId), { notes: this.note.trim() })
-              this.$message.success('已完工！')
-              this.loading = true
-              this.loadingHistory = true
-              this.onClose()
-              this.init()
-              this.$emit('refresh')
-              this.$emit('success')
-            },
-            () => {
-              this.$message.error('提交失败！')
-            }
-          )
-      }
+        }).then(_res => {
+            this.saveWorkflowLog('确认完工', '最后一步: ' + this.getStepNameByStepId(this.currentStepId), { notes: this.note.trim() })
+            this.$message.success('已完工！')
+            this.loading = true
+            this.loadingHistory = true
+            this.onClose()
+            this.$emit('success', { note: this.note.trim(), form: res.realForm, workflowId: this.workflowId })
+          },
+          () => {
+            this.$message.error('提交失败！')
+          }
+        )
+      })
     },
     // 三个按钮点击后逻辑
     async nextClick () {
@@ -458,11 +452,9 @@ export default {
           }
         })
       })
-      await this.$refs.xAddForm.onSubmit()
-      if (!this.formValid) {
-        console.log('nothing')
-      } else {
-        return postByServiceName(workFlowViewApi.submitToNextStep, extraData)
+      this.$refs.xAddForm.asyncSubmit().then(res => {
+        this.submitForm(res)
+        postByServiceName(workFlowViewApi.submitToNextStep, extraData)
           .then(
             res => {
               const extra = {
@@ -483,7 +475,7 @@ export default {
               console.log(err)
             }
           )
-      }
+      })
     },
     async preClick () {
       const notes = this.note.trim()
@@ -516,11 +508,9 @@ export default {
       if (!extraData) {
         return
       }
-      await this.$refs.xAddForm.onSubmit()
-      if (!this.formValid) {
-        console.log('nothing')
-      } else {
-        return postByServiceName(workFlowViewApi.submitToNextStep, extraData)
+      this.$refs.xAddForm.asyncSubmit().then(res => {
+        this.submitForm(res)
+        postByServiceName(workFlowViewApi.submitToNextStep, extraData)
           .then(
             res => {
               const extra = {
@@ -541,7 +531,7 @@ export default {
               console.log(err)
             }
           )
-      }
+      })
     },
     // 获取当前步骤节点，连通的节点
     getDirection () {

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

@@ -83,9 +83,9 @@ routerResource.example = {
       {
           path: 'default',
           name: '示例页面',
-          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/XReportGrid/XReportDemo.vue'),
-          // component: () => import('@vue2-client/pages/WorkflowDetail/WorkFlowDemo.vue'),
+          component: () => import('@vue2-client/pages/WorkflowDetail/WorkFlowDemo.vue'),
           meta: {
               // 菜单中不显示
               invisible: true,

package/vue.config.js

@@ -11,11 +11,11 @@ const productionGzipExtensions = ['js', 'css']
 const isProd = process.env.NODE_ENV === 'production'
 
 // v4 产品演示
-const v3Server = 'http://192.168.11.160:31467/'
+const v3Server = 'http://aote-office.8866.org:31567'
 const gateway = 'http://192.168.50.67:31467'
 const testUpload = 'http://123.60.214.109:8406'
 const OSSServerDev = 'http://192.168.50.67:30351'
-const revenue = 'http://192.168.11.160:31467/'
+const revenue = 'http://aote-office.8866.org:31567'
 // const OSSServerProd = 'http://192.168.50.67:31351'
 // const testUploadLocal = 'http://127.0.0.1:9001'
 // v3 铜川