vue2-client 1.9.28 → 1.9.29

package/package.json

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

package/src/base-client/components/common/XForm/XFormItem.vue

@@ -24,6 +24,7 @@
           @change="attr.dataChangeFunc && debouncedDataChangeFunc()"
           :suffix="attr.inputSuffix && mode !== '新增' ? attr.inputSuffix : ''"
           @blur="attr.inputOnBlurFunc && emitFunc(attr.inputOnBlurFunc,attr)"
+          @keyup.enter="attr.inputOnEnterFunc && emitFunc(attr.inputOnEnterFunc, attr)"
           :placeholder="attr.placeholder ? attr.placeholder : '请输入'+attr.name.replace(/\s*/g, '')"
           :ref="`${attr.model}input`"/>
         <a-button
@@ -49,6 +50,7 @@
         :disabled="disabled && !readOnly"
         style="width:100%"
         @blur="attr.inputOnBlurFunc && emitFunc(attr.inputOnBlurFunc,attr)"
+        @keyup.enter="attr.inputOnEnterFunc && emitFunc(attr.inputOnEnterFunc, attr)"
         :suffix="attr.inputSuffix && mode !== '新增' ? attr.inputSuffix : ''"
         :placeholder="attr.placeholder ? attr.placeholder : '请输入'+attr.name.replace(/\s*/g, '')"
         :ref="`${attr.model}input`"/>
@@ -61,6 +63,7 @@
         :suffix="attr.inputSuffix && mode !== '新增' ? attr.inputSuffix : ''"
         style="width:100%"
         @blur="attr.inputOnBlurFunc && emitFunc(attr.inputOnBlurFunc,attr)"
+        @keyup.enter="attr.inputOnEnterFunc && emitFunc(attr.inputOnEnterFunc, attr)"
         :placeholder="attr.placeholder ? attr.placeholder : '请输入'+attr.name.replace(/\s*/g, '')"
         :ref="`${attr.model}input`"/>
 

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

@@ -1,40 +1,40 @@
-<script>
-import XFormGroup from '@vue2-client/base-client/components/common/XFormGroup/XFormGroup.vue'
-import { getConfigByNameAsync } from '@vue2-client/services/api/common'
-
-export default {
-  name: 'Demo',
-  components: { XFormGroup },
-  created () {
-    getConfigByNameAsync('addUserGeneralInfoFrom', 'af-revenue').then(res => {
-      this.$refs.xFormGroupDemo.init({
-        ...res,
-        serviceName: 'af-revenue',
-        showLeftTab: true,
-      })
-    })
-  },
-  methods: {
-    submitForm () {
-      this.$refs.xFormGroupDemo.onSubmit().then(res => {
-        console.log('所有表单的结果', res)
-      })
-    }
-  }
-}
-</script>
-
-<template>
-  <a-modal
-    :visible="true"
-    :bodyStyle="{height:'70vh'}"
-    title="测试表单组"
-    @ok="submitForm"
-    width="85vw">
-    <x-form-group ref="xFormGroupDemo"></x-form-group>
-  </a-modal>
-</template>
-
-<style scoped lang="less">
-
-</style>
+<script>
+import XFormGroup from '@vue2-client/base-client/components/common/XFormGroup/XFormGroup.vue'
+import { getConfigByNameAsync } from '@vue2-client/services/api/common'
+
+export default {
+  name: 'Demo',
+  components: { XFormGroup },
+  created () {
+    getConfigByNameAsync('addUserGeneralInfoFrom', 'af-revenue').then(res => {
+      this.$refs.xFormGroupDemo.init({
+        ...res,
+        serviceName: 'af-revenue',
+        showLeftTab: true,
+      })
+    })
+  },
+  methods: {
+    submitForm () {
+      this.$refs.xFormGroupDemo.onSubmit().then(res => {
+        console.log('所有表单的结果', res)
+      })
+    }
+  }
+}
+</script>
+
+<template>
+  <a-modal
+    :visible="true"
+    :bodyStyle="{height:'70vh'}"
+    title="测试表单组"
+    @ok="submitForm"
+    width="85vw">
+    <x-form-group ref="xFormGroupDemo"></x-form-group>
+  </a-modal>
+</template>
+
+<style scoped lang="less">
+
+</style>

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

@@ -72,6 +72,7 @@
             @action="action"
             @selectRow="selectRow"
             @afterQuery="afterQuery"
+            @columnClick="columnClick"
             @tempTableEdit="tempTableEdit"
             @editButtonStateDataClick="editButtonStateDataClick"
             @importExcelOk="importExcelOk">
@@ -304,6 +305,9 @@ export default {
     runLogic,
     getConfigByNameAsync,
     getConfigByName,
+    columnClick (key, value, record) {
+      this.$emit('columnClick', key, value, record)
+    },
     importExcelOk () {
       this.$emit('importExcelOk')
     },
@@ -359,7 +363,6 @@ export default {
         this.$refs.xTable.init({
           formItems: res.formJson,
           primaryKey: res.primaryKey,
-          tableEdit: res.tableEdit,
           createdQuery: res.createdQuery,
           queryParams: setQueryParams ? res : null,
           tableColumns: res.columnJson,
@@ -375,6 +378,7 @@ export default {
           form: this.$refs.xForm.form,
           allowedCardMode: res.allowedCardMode,
           cardModeConfig: res.cardModeConfig,
+          createdEditMode: res.createdEditMode,
           summaryUpdate: true
         })
       }

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

@@ -3,10 +3,10 @@
     <x-form-table
       title="示例表单查询"
       :queryParamsName="queryParamsName"
-      :x-tree-config-name="xTreeConfigName"
       :fixedAddForm="fixedAddForm"
       service-name="af-revenue"
       @action="action"
+      @columnClick="columnClick"
       ref="xFormTable">
     </x-form-table>
     <a-drawer
@@ -25,20 +25,16 @@
 </template>
 
 <script>
-import XFormTable from '@vue2-client/base-client/components/common/XFormTable/XFormTable.vue'
-import { mapState } from 'vuex'
 
+import { microDispatch } from '@vue2-client/utils/microAppUtils'
 export default {
   name: 'Demo',
-  components: {
-    XFormTable
-  },
   data () {
     return {
       // 查询配置文件名
-      queryParamsName: 'address_management',
+      queryParamsName: 'UserFilesListCRUD',
       // 查询配置左侧tree
-      xTreeConfigName: 'addressType',
+      // xTreeConfigName: 'addressType',
       // 新增表单固定值
       fixedAddForm: {},
       // 是否显示详情抽屉
@@ -47,12 +43,10 @@ export default {
       record: {}
     }
   },
-  created () {
-  },
-  mounted () {
-    console.log('==当前登录人', this.currUser)
-  },
   methods: {
+    columnClick (key, value, record) {
+      microDispatch({ type: 'v3route', path: '/bingliguanli/dianzibingliluru', props: { selected: arguments[0].his_f_admission_id } })
+    },
     action (record, id, actionType) {
       this.detailVisible = true
       console.log('触发了详情操作', record, id, actionType)

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/XTable.vue

@@ -134,6 +134,10 @@
           <span v-else-if="item.slotType === 'index'" :key="'index-' + c_index">
             {{ index + 1 }}
           </span>
+          <!--    行链接      -->
+          <span v-else-if="item.slotType === 'link'" :key="'link-' + c_index">
+            <a @click="columnClick(item.dataIndex,text,record)">{{ text }}</a>
+          </span>
           <!-- 文本溢出省略(ellipsis) -->
           <span v-else-if="item.slotType === 'ellipsis'" :key="'ellipsis-' + c_index">
             <ellipsis :length="item.slotValue" tooltip>{{ text === '' ? '--' : text }}</ellipsis>
@@ -231,7 +235,10 @@
               </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'}"/>
+              <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>
@@ -458,6 +465,9 @@ export default {
     window.removeEventListener('resize', this.handleResize)
   },
   methods: {
+    columnClick (key, value, record) {
+      this.$emit('columnClick', key, value, record)
+    },
     getFromItem (model) {
       const aa = this.formItems.find(item => item.model === model && item.editRow)
       if (aa) {
@@ -549,12 +559,12 @@ export default {
         form,
         serviceName,
         tableSummaryMap = {},
-        customTableSummaryArray = [
-        ],
+        customTableSummaryArray = [],
         viewMode,
         formItems,
         env = 'prod',
         createdQuery = true,
+        createdEditMode = false,
         primaryKey,
         allowedCardMode = false,
         cardModeConfig,
@@ -604,6 +614,7 @@ export default {
       this.allowedCardMode = allowedCardMode
       this.cardModeConfig = cardModeConfig
       this.summaryUpdate = summaryUpdate
+      this.isEditMode = createdEditMode
       let totalWidth = 0
       for (let i = 0; i < this.tableColumns.length; i++) {
         const item = this.tableColumns[i]

package/src/pages/DynamicStatistics/FavoriteList.vue

@@ -1,51 +1,51 @@
-<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 () {
-      console.warn(123)
-      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 () {
+      console.warn(123)
+      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

@@ -84,8 +84,8 @@ routerResource.example = {
           path: 'default',
           name: '示例页面',
           // component: () => import('@vue2-client/base-client/components/common/XAddNativeForm/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/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'),
           meta: {
               // 菜单中不显示

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)
+}