vue2-client 1.19.11 → 1.19.13

package/package.json

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

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

@@ -78,7 +78,7 @@ export default {
     },
     serviceName: {
       type: String,
-      default: 'af-system'
+      default: process.env.VUE_APP_SYSTEM_NAME
     },
     // 业务类型
     businessType: {

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

@@ -62,7 +62,7 @@ export default {
     // 服务名
     serviceName: {
       type: String,
-      default: 'af-system'
+      default: process.env.VUE_APP_SYSTEM_NAME
     }
   },
   data () {

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

@@ -118,26 +118,7 @@
           </a-select-option>
         </template>
         <template v-else-if="attr.keyName">
-          <template
-            v-if="
-              attr.keyName.indexOf('logic@') !== -1 ||
-              attr.keyName.indexOf('config@') !== -1 ||
-              attr.keyName.indexOf('search@') !== -1 ||
-              attr.keyName.indexOf('search@') !== -1
-            "
-          >
-            <a-select-option v-for="(item, index) in option" :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-if="attr.keyName.indexOf('async ') !== -1 || attr.keyName.indexOf('function ') !== -1">
+          <template v-if="attr.keyName.indexOf('async ') !== -1 || attr.keyName.indexOf('function ') !== -1">
             <a-select-option v-for="(item, index) in optionForFunc" :key="index.value" :value="item.value + ''">
               <template>
                 {{ item.label }}
@@ -145,19 +126,20 @@
             </a-select-option>
           </template>
           <template v-else>
-            <a-select-option
-              v-for="item in dictMap[attr.keyName] || []"
-              :key="item.value"
-              :value="item.value + ''"
-            >
-              <!-- 徽标(badge) -->
-              <x-badge
-                :badge-key="attr.keyName"
-                :replaceText="item.label"
-                :value="item.value"
-                :service-name="serviceName"
-                :env="env"
-              />
+            <a-select-option v-for="(item, index) in option" :key="index.value" :value="item.value + ''">
+              <template
+                v-if="
+                  attr.keyName.indexOf('logic@') !== -1 ||
+                  attr.keyName.indexOf('config@') !== -1 ||
+                  attr.keyName.indexOf('search@') !== -1
+                ">
+                {{ item.label }}
+              </template>
+              <template v-else-if="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>
             </a-select-option>
           </template>
         </template>
@@ -240,19 +222,7 @@
           </a-select-option>
         </template>
         <template v-else-if="attr.keyName">
-          <template
-            v-if="
-              attr.keyName.indexOf('logic@') !== -1 ||
-              attr.keyName.indexOf('config@') !== -1 ||
-              attr.keyName.indexOf('search@') !== -1 ||
-              attr.keyName.indexOf('search@') !== -1
-            "
-          >
-            <a-select-option v-for="(item, index) in option" :key="index" :value="item.value">
-              {{ item.label }}
-            </a-select-option>
-          </template>
-          <template v-else-if="attr.keyName.indexOf('async ') !== -1 || attr.keyName.indexOf('function ') !== -1">
+          <template v-if="attr.keyName.indexOf('async ') !== -1 || attr.keyName.indexOf('function ') !== -1">
             <a-select-option v-for="(item, index) in optionForFunc" :key="index.value" :value="item.value + ''">
               <template>
                 {{ item.label }}
@@ -260,11 +230,7 @@
             </a-select-option>
           </template>
           <template v-else>
-            <a-select-option
-              v-for="item in dictMap[attr.keyName] || []"
-              :key="item.value"
-              :value="item.value + ''"
-            >
+            <a-select-option v-for="(item, index) in option" :key="index" :value="item.value">
               {{ item.label }}
             </a-select-option>
           </template>
@@ -321,23 +287,9 @@
           </a-radio>
         </template>
         <template v-else-if="attr.keyName">
-          <template
-            v-if="
-              attr.keyName.indexOf('logic@') !== -1 ||
-              attr.keyName.indexOf('config@') !== -1 ||
-              attr.keyName.indexOf('search@') !== -1 ||
-              attr.keyName.indexOf('search@') !== -1
-            "
-          >
-            <a-radio v-for="(item, index) in option" :key="index" :value="item.value">
-              {{ item.label }}
-            </a-radio>
-          </template>
-          <template v-else>
-            <a-radio v-for="(item, index) in dictMap[attr.keyName] || []" :key="index" :value="item.value">
-              {{ item.label }}
-            </a-radio>
-          </template>
+          <a-radio v-for="(item, index) in option" :key="index" :value="item.value">
+            {{ item.label }}
+          </a-radio>
         </template>
       </a-radio-group>
     </a-form-model-item>
@@ -705,7 +657,7 @@ import PersonSetting from '@vue2-client/base-client/components/common/PersonSett
 import AddressSearchCombobox from '@vue2-client/base-client/components/common/AddressSearchCombobox'
 import Upload from '@vue2-client/base-client/components/common/Upload'
 import moment from 'moment'
-import { getConfigByName, runLogic, getConfigByNameAsync } from '@vue2-client/services/api/common'
+import { runLogic, getConfigByNameAsync } from '@vue2-client/services/api/common'
 import * as util from '@vue2-client/utils/util'
 import XTreeSelect from '@vue2-client/base-client/components/common/XForm/XTreeSelect'
 import { searchToListOption, searchToOption } from '@vue2-client/services/v3Api'
@@ -764,8 +716,7 @@ export default {
       rowChoosePopoverVisible: false,
       // 行选择器CRUD固定查询值
       rowChooseFixedQueryValue: undefined,
-      bindOther: {},
-      dictMap: {}
+      bindOther: {}
     }
   },
   props: {
@@ -816,7 +767,7 @@ export default {
     },
     serviceName: {
       type: String,
-      default: undefined
+      default: process.env.VUE_APP_SYSTEM_NAME
     },
     // 调用logic获取数据源的追加参数
     getDataParams: {
@@ -873,10 +824,6 @@ export default {
   },
   async created() {
     this.init()
-    if (this.attr.keyName) {
-      const key = this.attr.keyName
-      this.dictMap[key] = await this.$appdata.getDictByKeyAsync(key)
-    }
     if (
       this.attr.keyName &&
       (this.attr?.keyName?.toString().indexOf('async ') !== -1 ||
@@ -1366,7 +1313,7 @@ export default {
       }
       if (this.attr.keyName && typeof this.attr.keyName === 'string') {
         if (this.attr.keyName.indexOf('logic@') !== -1) {
-          this.getData({serviceName:process.env.VUE_APP_SYSTEM_NAME}, res => this.getDataCallback(res))
+          this.getData({serviceName: process.env.VUE_APP_SYSTEM_NAME}, res => this.getDataCallback(res))
         } else if (this.attr.keyName.indexOf('search@') !== -1) {
           // `tool.getFullTree(this.getRights().where(row.getType()==$organization$))`
           // 判断是否根据角色查询
@@ -1392,21 +1339,18 @@ export default {
             // 其他资源通用逻辑
             searchToOption(searchData, res => this.getDataCallback(res))
           }
-        } else if (this.attr.keyName.indexOf('config@') !== -1) {
-          const configName = this.attr.keyName.substring(7)
-          // 处理得到 “undefined” 字符串的问题
-          if (configName && configName !== 'undefined') {
-            getConfigByName(
-              configName,
-              this.serviceName,
-              res => {
-                this.getDataCallback(res.value)
-              },
-              this.env === 'dev'
-            )
-          }
         } else if (this.attr.keyName.indexOf('async ') !== -1 || this.attr.keyName.indexOf('function ') !== -1) {
           this.updateOptions()
+        } else {
+          let configName
+          if (this.attr.keyName.indexOf('config@') !== -1) {
+            configName = this.attr.keyName.substring(7)
+          } else {
+            configName = this.attr.keyName
+          }
+          if (configName && configName !== 'undefined') {
+            this.$appdata.getDictByKey(configName, this.serviceName, res => this.getDataCallback(res), this.env === 'dev')
+          }
         }
       } else if (this.attr.keys) {
         // 对静态配置的keys也进行预处理

package/src/base-client/components/common/XReport/XReportDemo.vue

@@ -5,7 +5,7 @@
       ref="main"
       :use-oss-for-img="false"
       config-name="用户户内通气点火工艺流程"
-      server-name="af-system"
+      :server-name="process.env.VUE_APP_SYSTEM_NAME"
       :show-img-in-cell="true"
       :edit-mode="false"
       :show-save-button="false"

package/src/base-client/components/common/XReport/XReportDesign.vue

@@ -154,7 +154,7 @@ export default {
     // 命名空间
     serverName: {
       type: String,
-      default: 'af-system'
+      default: process.env.VUE_APP_SYSTEM_NAME
     },
     // 是否只能展示不可编辑
     displayOnly: {

package/src/base-client/components/common/XReport/XReportJsonRender.vue

@@ -181,7 +181,7 @@ export default {
     // 命名空间
     serverName: {
       type: String,
-      default: 'af-system'
+      default: process.env.VUE_APP_SYSTEM_NAME
     },
     // 是否展示标题
     showTitle: {

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

@@ -492,7 +492,7 @@ export default {
     // 命名空间
     serverName: {
       type: String,
-      default: 'af-system'
+      default: process.env.VUE_APP_SYSTEM_NAME
     },
     // 原始配置
     configData: {

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

@@ -72,7 +72,7 @@ export default {
     // 命名空间
     serverName: {
       type: String,
-      default: 'af-system'
+      default: process.env.VUE_APP_SYSTEM_NAME
     },
     // 环境
     env: {

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

@@ -243,7 +243,7 @@ export default {
     // 命名空间
     serverName: {
       type: String,
-      default: 'af-system'
+      default: process.env.VUE_APP_SYSTEM_NAME
     },
     // 环境
     env: {

package/src/pages/system/ticket/index.vue

@@ -240,7 +240,7 @@
             ref="searchTable"
             v-if="tabActiveKey === 'workHistory'"
             :fixed-query-form="fixedQueryForm"
-            serviceName="af-system"
+            serviceName="af-oa"
             :queryParamsName="queryParamsName"
             title="已提交工单"
             @action="toDetail">