vue2-client 1.8.81 → 1.8.82

package/CHANGELOG.md

@@ -1,6 +1,11 @@
 # Change Log
 > 所有关于本项目的变化都在该文档里。
 
+**1.8.82 -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.82",
   "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)
         })
       } 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/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')
 // 数据检索