vue2-client 1.8.81 → 1.8.83

package/CHANGELOG.md

@@ -1,6 +1,11 @@
 # Change Log
 > 所有关于本项目的变化都在该文档里。
 
+**1.8.82 - 1.8.83 -2024-3-7 @江超**
+- 删除过时组件
+- XFormItem的下拉框数据源现在支持从配置中心获取了
+- 待解决：XTable显示来自配置中心的字典徽标
+
 **1.8.79 -2024-3-6 @江超**
 - 增加实体保存的方法
 

package/package.json

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

@@ -35,17 +35,25 @@
         <template v-if="attr.keys">
           <a-select-option
             v-for="(item,index) in attr.keys"
-            :key="index"
+            :key="index.value"
             :value="item.value">
             {{ item.label }}
           </a-select-option>
         </template>
         <template v-else>
-          <template v-if="attr.keyName.indexOf('logic@') !== -1">
+          <template v-if="attr.keyName.indexOf('logic@') !== -1 || attr.keyName.indexOf('config@') !== -1">
             <a-select-option
               v-for="(item,index) in option"
-              :key="index"
-              :value="item.value">{{ item.label }}
+              :key="index.value"
+              :value="item.value">
+              <template v-if="attr.keyName.indexOf('config@') !== -1 && item.status">
+                <!-- 徽标(badge) -->
+                <a-badge v-if="item.status !== 'gary'" :color="item.status" :text="item.label"/>
+                <a-badge v-else color="#D9D9D9" :text="item.label"/>
+              </template>
+              <template v-else>
+                {{ item.label }}
+              </template>
             </a-select-option>
           </template>
           <template v-else>
@@ -111,7 +119,7 @@
           </a-select-option>
         </template>
         <template v-else>
-          <template v-if="attr.keyName.indexOf('logic@') !== -1">
+          <template v-if="attr.keyName.indexOf('logic@') !== -1 || attr.keyName.indexOf('config@') !== -1">
             <a-select-option
               v-for="(item,index) in option"
               :key="index"
@@ -163,7 +171,7 @@
           </a-radio>
         </template>
         <template v-else>
-          <template v-if="attr.keyName.indexOf('logic@') !== -1">
+          <template v-if="attr.keyName.indexOf('logic@') !== -1 || attr.keyName.indexOf('config@') !== -1">
             <a-radio v-for="(item,index) in option" :key="index" :value="item.value">
               {{ item.label }}
             </a-radio>
@@ -313,7 +321,7 @@ import AddressSearchCombobox from '@vue2-client/base-client/components/common/Ad
 import Upload from '@vue2-client/base-client/components/common/Upload'
 import moment from 'moment'
 import XTreeSelect from '@vue2-client/base-client/components/common/XForm/XTreeSelect'
-import { runLogic } from '@vue2-client/services/api/common'
+import { getConfigByName, runLogic } from '@vue2-client/services/api/common'
 
 export default {
   name: 'XFormItem',
@@ -428,26 +436,32 @@ export default {
         }
       }
       if (this.attr.keyName && this.attr.keyName.indexOf('logic@') !== -1) {
-        this.getData({}, res => {
-          this.option = res
-          if (this.attr.type === 'treeSelect') {
-            this.$refs.xTreeSelect.init({
-              option: this.option,
-              form: this.form,
-              queryType: this.attr.queryType,
-              name: this.attr.name,
-              model: this.attr.model,
-              mode: this.mode,
-              disabled: this.disabled
-            })
-          } else if (this.attr.type === 'radio') {
-            this.initRadioValue()
-          }
-        })
+        this.getData({}, res => this.getDataCallback(res))
+      } else if (this.attr.keyName && this.attr.keyName.indexOf('config@') !== -1) {
+        const configName = this.attr.keyName.substring(7)
+        getConfigByName(configName, this.serviceName, res => {
+          this.getDataCallback(res.value)
+        }, this.env === 'dev')
       } else {
         this.initRadioValue()
       }
     },
+    getDataCallback (res) {
+      this.option = res
+      if (this.attr.type === 'treeSelect') {
+        this.$refs.xTreeSelect.init({
+          option: this.option,
+          form: this.form,
+          queryType: this.attr.queryType,
+          name: this.attr.name,
+          model: this.attr.model,
+          mode: this.mode,
+          disabled: this.disabled
+        })
+      } else if (this.attr.type === 'radio') {
+        this.initRadioValue()
+      }
+    },
     initRadioValue () {
       const model = this.attr.model
       if (this.mode === '新增/修改' && this.attr.type === 'radio' && !this.form[model]) {

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

@@ -205,7 +205,7 @@ export default {
     getConfig () {
       getConfigByName(this.queryParamsName, this.serviceName, (res) => {
         this.updateComponents(res)
-      })
+      }, this.env === 'dev')
     },
     getConfigBySource () {
       parseConfig(this.queryParamsJson, 'CRUD_FORM', this.serviceName, this.env === 'dev').then(res => {
@@ -215,7 +215,7 @@ export default {
     getColumnJsonByLogic () {
       getConfigByLogic(this.logicName, this.logicParam, this.serviceName, (res) => {
         this.updateComponents(res, true)
-      })
+      }, this.env === 'dev')
     },
     /**
      * 更新子组件

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

@@ -10,12 +10,8 @@ import XCard from './common/XCard'
 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 CreateQuery from './common/CreateQuery'
-// import CreateSimpleFormQuery from './common/CreateSimpleFormQuery'
 import PersonSetting from './common/PersonSetting'
 import XFormTable from './common/XFormTable'
 import XStepView from './common/XStepView'
@@ -34,8 +30,6 @@ export default {
   XBadge,
   Upload,
   JSONToTree,
-  FormGroupEdit,
-  FormGroupQuery,
   AddressSearchCombobox,
   AmapMarker,
   // CreateQuery,

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

@@ -33,8 +33,6 @@ routerResource.submitTicket = () => import('@vue2-client/pages/system/ticket')
 routerResource.ServiceReview = () => import('@vue2-client/pages/ServiceReview')
 // 系统设置
 routerResource.settings = () => import('@vue2-client/pages/system/settings')
-// 查询配置生成工具
-routerResource.createQuery = () => import('@vue2-client/pages/CreateQueryPage')
 // AMIS示例页面
 routerResource.amisDemo = () => import('@vue2-client/pages/AMisDemo/AMisDemo')
 // 数据检索

package/src/services/api/common.js

@@ -39,49 +39,37 @@ const commonApi = {
   getColumnsJson: '/api/af-system/logic/getColumns',
 }
 
-export function getConfigUrl (serviceName = process.env.VUE_APP_SYSTEM_NAME) {
-  return '/api/' + serviceName + '/' + commonApi.getConfig
-}
-
-export function getNativeConfigUrl (serviceName = process.env.VUE_APP_SYSTEM_NAME) {
-  return '/api/' + serviceName + '/' + commonApi.getNativeConfig
-}
-
-export function parseConfigUrl (serviceName = process.env.VUE_APP_SYSTEM_NAME, isDev) {
-  let apiPre = '/api/'
-  if (isDev) {
-    apiPre = '/devApi/'
-  }
-  return apiPre + serviceName + '/' + commonApi.parseConfig
-}
-
-/**
- * 获取字典键参数
- */
-export function getDictionaryParam () {
-  return post('/api/af-system/logic/getDictionaryParam', {})
-}
-
 /**
  * 根据配置名获取配置内容
  * @param content 已有的配置内容
  * @param configName 配置名称
  * @param serviceName 命名空间名称
  * @param callback 回调函数
+ * @param isDev 是否为开发环境
  */
-export function getConfig (content, configName, serviceName = process.env.VUE_APP_SYSTEM_NAME, callback) {
+export function getConfig (content, configName, serviceName = process.env.VUE_APP_SYSTEM_NAME, callback, isDev) {
   if (content) {
     return content
   }
-  indexedDB.getByWeb(configName, getConfigUrl(serviceName), { configName: configName }, callback)
+  let apiPre = '/api/'
+  if (isDev) {
+    apiPre = '/devApi/'
+  }
+  const getConfigUrl = apiPre + commonApi.getConfig
+  indexedDB.getByWeb(configName, getConfigUrl, { configName: configName }, callback)
 }
 
-export function getConfigByName (configName, serviceName = process.env.VUE_APP_SYSTEM_NAME, callback) {
-  return getConfig(undefined, configName, serviceName, callback)
+export function getConfigByName (configName, serviceName = process.env.VUE_APP_SYSTEM_NAME, callback, isDev) {
+  return getConfig(undefined, configName, serviceName, callback, isDev)
 }
 
-export function getNativeConfig (configName, serviceName = process.env.VUE_APP_SYSTEM_NAME) {
-  return post(getNativeConfigUrl(serviceName), { configName: configName })
+export function getNativeConfig (configName, serviceName = process.env.VUE_APP_SYSTEM_NAME, isDev) {
+  let apiPre = '/api/'
+  if (isDev) {
+    apiPre = '/devApi/'
+  }
+  const getConfigUrl = apiPre + commonApi.getNativeConfig
+  return post(getConfigUrl, { configName: configName })
 }
 
 /**
@@ -90,9 +78,14 @@ export function getNativeConfig (configName, serviceName = process.env.VUE_APP_S
  * @param parameter Logic调用参数
  * @param serviceName 命名空间名称
  * @param callback 回调函数
+ * @param isDev 是否是开发环境
  */
-export function getConfigByLogic (logicName, parameter, serviceName = process.env.VUE_APP_SYSTEM_NAME, callback) {
-  indexedDB.getByWeb(`${logicName}_${JSON.stringify(parameter)}`, '/api/' + serviceName + '/logic/' + logicName,
+export function getConfigByLogic (logicName, parameter, serviceName = process.env.VUE_APP_SYSTEM_NAME, callback, isDev) {
+  let apiPre = '/api/'
+  if (isDev) {
+    apiPre = '/devApi/'
+  }
+  indexedDB.getByWeb(`${logicName}_${JSON.stringify(parameter)}`, apiPre + serviceName + '/logic/' + logicName,
     parameter, callback)
 }
 
@@ -101,10 +94,14 @@ export function getConfigByLogic (logicName, parameter, serviceName = process.en
  * @param configContent 原配置内容
  * @param configType 配置类型
  * @param serviceName 命名空间名称
- * @package isDev 是否是开发环境
+ * @param isDev 是否是开发环境
  */
 export function parseConfig (configContent, configType, serviceName = process.env.VUE_APP_SYSTEM_NAME, isDev) {
-  const url = parseConfigUrl(serviceName, isDev)
+  let apiPre = '/api/'
+  if (isDev) {
+    apiPre = '/devApi/'
+  }
+  const url = apiPre + serviceName + '/' + commonApi.parseConfig
   return post(url, {
     configType: configType,
     configContent: configContent