vue2-client 1.18.59 → 1.18.61

package/package.json

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

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

@@ -49,7 +49,7 @@
 </template>
 
 <script>
-import { commonApi, post } from '@vue2-client/services/api'
+import { post } from '@vue2-client/services/api'
 
 const departments = ['运维部', '项目部', '项目一部', '项目二部', '开发部', '售后部', '办公室', '管理员', '软件工程部', 'IC卡部', '销售部']
 
@@ -97,7 +97,13 @@ export default {
   watch: {},
   components: {},
   created () {
-    post(commonApi.getEmpTree, {}).then(res => {
+    let api
+    if (this.compatible === 'OA') {
+      api = '/api/af-system/logic/getEmpTree'
+    } else {
+      api = '/api/af-oa/logic/getEmpTree'
+    }
+    post(api, {}).then(res => {
       this.sourceTreeData = res
     })
   },

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

@@ -11,25 +11,19 @@ import XBadge from './common/XBadge'
 import Upload from './common/Upload'
 import JSONToTree from './common/JSONToTree'
 import FormGroupEdit from './common/FormGroupEdit'
-import FormGroupQuery from './common/FormGroupQuery'
 import AddressSearchCombobox from './common/AddressSearchCombobox'
 import AmapMarker from './common/AmapMarker'
 import PersonSetting from './common/PersonSetting'
 import XFormTable from './common/XFormTable'
 import XStepView from './common/XStepView'
 import Tree from './common/Tree'
-import CreateQuery from './common/CreateQuery'
-import CreateSimpleFormQuery from './common/CreateSimpleFormQuery'
 import XFormGroup from './common/XFormGroup'
 import XDescriptionsGroup from './common/XDescriptions/XDescriptionsGroup.vue'
 
 export default {
   AddressSearchCombobox,
   AmapMarker,
-  CreateQuery,
-  CreateSimpleFormQuery,
   FormGroupEdit,
-  FormGroupQuery,
   JSONToTree,
   PersonSetting,
   Tree,

package/src/base-client/components/ticket/TicketDetailsView/TicketDetailsView.vue

@@ -612,7 +612,11 @@
               this.disableCloseBtn = true
             }
             const categoryValue = this.details.category
-            this.details.category = this.$appdata.getDictionaryList('ticketCategoryMap')[categoryValue].label
+            this.$appdata.getDictByKeyAsync('ticketCategoryMap').then(
+              res => {
+                this.details.category = res[categoryValue].label
+              },
+            )
           }, err => {
             console.error(err)
           })

package/src/base-client/plugins/AppData.js

@@ -85,12 +85,17 @@ const GetAppDataService = {
       return processResult(result)
     }
   },
-  // 新版获取配置中心字典推荐使用 服务名默认为当前服务
-  getDictByKey (dictKey, serviceName = process.env.VUE_APP_SYSTEM_NAME, callback, isDev) {
-    getConfigByName(dictKey, undefined, result => {
-      callback(result.value)
-    }, isDev)
+  // 获取琉璃字典（Callback 版本）
+  getDictByKey(dictKey, serviceName, callback, isDev) {
+    this.getDictByKeyAsync(dictKey, serviceName, isDev).then(callback)
   },
+  // 获取琉璃字典（Promise 版本）
+  getDictByKeyAsync(dictKey, serviceName = process.env.VUE_APP_SYSTEM_NAME, isDev) {
+    return new Promise(resolve => {
+      getConfigByName(dictKey, serviceName, res => resolve(res.value), isDev)
+    })
+  },
+
   getParam (key, value, callback) {
     const str = localStorage.getItem(process.env.VUE_APP_BADGE_KEY)
     const object = JSON.parse(str)

package/src/main.js

@@ -4,7 +4,7 @@ import Router from 'vue-router'
 import Vuex from 'vuex'
 import { routerOptions, modules, i18n, message, bootstrap } from '../index'
 // import eventLogPlugin from '@/plugins/EventLogPlugin'
-import findParentData from '@/plugins/FindParentsData'
+import findParentData from '@vue2-client/plugins/FindParentsData'
 import { Modal } from 'ant-design-vue'
 
 import VueDraggableResizable from 'vue-draggable-resizable'

package/src/mock/user/routes.js

@@ -32,7 +32,7 @@ const router = [{
     // },
     // {
     //   router: 'system',
-    //   children: ['dictionaryManage', 'queryParamsManage', 'customerManage', 'safeguardSearchLog', 'runtime', 'createQuery']
+    //   children: ['dictionaryManage', 'queryParamsManage', 'customerManage', 'safeguardSearchLog', 'runtime']
     // },
     {
       router: 'antdv',

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

@@ -501,7 +501,6 @@ export default {
       stepsExtraInfo: [],
       // 控制基础信息页流程展示加载
       loading: true,
-      createQueryVisible: false,
       // 激活的步骤名
       activeStepName: '',
       stepsParse: undefined,
@@ -1123,8 +1122,14 @@ export default {
               continue
             }
             // 字典值处理
-            if (stepDefine.formType === 'select' && stepDefine.selectType === 'key') {
-              const dictList = this.$appdata.getDictionaryList(stepDefine.selectKey)
+            if (stepDefine.formType === 'select') {
+              let dictList
+              if (stepDefine.selectType === 'key') {
+                dictList = this.$appdata.getDictionaryList(stepDefine.selectKey)
+              } else if (stepDefine.selectType === 'config') {
+                const configName = stepDefine.selectKey.substring(7)
+                dictList = await this.$appdata.getDictByKeyAsync(configName)
+              }
               const dictItem = dictList.find(item => item.value === value)
               value = dictItem ? dictItem.label : value
             }

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

@@ -8,7 +8,7 @@
     <!--   上方流程显示   -->
     <a-card :bordered="false" :loading="loading" title="项目进度">
       <!--  项目进度流程  -->
-      <workflow-timeline
+      <work-flow-timeline
         :current-step-id="currentStepId"
         :active-step-id="activeStepId"
         :workflow-id="workflowId"
@@ -323,7 +323,6 @@ export default {
       loading: true,
       // 当前步骤子表定义
       currentStepSubTableDefine: null,
-      createQueryVisible: false,
       // 子表定义
       subTableDefine: {},
       subTableName: '',
@@ -783,17 +782,20 @@ export default {
             const stepDefine = this.targetStepDefine[i]
             if (key === stepDefine.key) {
               if (!['FilesId', 'Images'].includes(key)) {
+                let value = formData[key]
                 // 读取字典值
-                if (stepDefine.formType === 'select' && stepDefine.selectType === 'key') {
-                  for (const item of this.$appdata.getDictionaryList(stepDefine.selectKey)) {
-                    if (item.value === formData[key]) {
-                      formData[stepDefine.title] = item.label
-                      break
-                    }
+                if (stepDefine.formType === 'select') {
+                  let dictList
+                  if (stepDefine.selectType === 'key') {
+                    dictList = this.$appdata.getDictionaryList(stepDefine.selectKey)
+                  } else if (stepDefine.selectType === 'config') {
+                    const configName = stepDefine.selectKey.substring(7)
+                    dictList = await this.$appdata.getDictByKeyAsync(configName)
                   }
-                } else {
-                  formData[stepDefine.title] = formData[key]
+                  const dictItem = dictList.find(item => item.value === value)
+                  value = dictItem ? dictItem.label : value
                 }
+                formData[stepDefine.title] = value
               }
               if (key !== stepDefine.title) {
                 delete formData[key]

package/src/router/async/config.async.js

@@ -11,7 +11,6 @@ const routesConfig = [
   'XReportGrid',
   'example',
   'settings',
-  'createQuery',
   'root',
   'bigDashboard',
   {

package/src/services/api/common.js

@@ -41,8 +41,6 @@ const commonApi = {
   upload: 'resource/upload',
   // 文件实体操作
   fileEntity: 'entity/t_files',
-  // 获取所有员工及其部门的级联菜单数据
-  getEmpTree: '/api/af-system/logic/getEmpTree',
   // 获取表格列配置
   getColumnsJson: '/api/af-system/logic/getColumns',
   //  v4文件删除

package/src/services/api/index.js

@@ -1,5 +1,4 @@
 import { commonApi, getConfig, query, addOrModify, remove } from '@vue2-client/services/api/common'
-import { QueryParamsDetailsViewApi } from '@vue2-client/services/api/QueryParamsDetailsViewApi'
 import { DictionaryDetailsViewApi } from '@vue2-client/services/api/DictionaryDetailsViewApi'
 import { LogDetailsViewApi } from '@vue2-client/services/api/LogDetailsViewApi'
 import { manageApi } from '@vue2-client/services/api/manage'
@@ -11,7 +10,6 @@ export {
   DictionaryDetailsViewApi,
   LogDetailsViewApi,
   manageApi,
-  QueryParamsDetailsViewApi,
   get, post, postByServiceName,
   TicketDetailsViewApi
 }