vue2-client 1.8.82 → 1.8.84

package/CHANGELOG.md

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

package/package.json

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

@@ -441,7 +441,7 @@ export default {
         const configName = this.attr.keyName.substring(7)
         getConfigByName(configName, this.serviceName, res => {
           this.getDataCallback(res.value)
-        })
+        }, this.env === 'dev')
       } else {
         this.initRadioValue()
       }

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/services/api/common.js

@@ -39,27 +39,15 @@ 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) {
+/**
+ * 获取字典键参数
+ */
+export function getDictionaryParam (isDev) {
   let apiPre = '/api/'
   if (isDev) {
     apiPre = '/devApi/'
   }
-  return apiPre + serviceName + '/' + commonApi.parseConfig
-}
-
-/**
- * 获取字典键参数
- */
-export function getDictionaryParam () {
-  return post('/api/af-system/logic/getDictionaryParam', {})
+  return post(apiPre + 'af-system/logic/getDictionaryParam', {})
 }
 
 /**
@@ -68,20 +56,31 @@ export function getDictionaryParam () {
  * @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 +89,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 +105,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