vue2-client 1.8.71 → 1.8.73

package/CHANGELOG.md

@@ -1,7 +1,7 @@
 # Change Log
 > 所有关于本项目的变化都在该文档里。
 
-**1.8.66 - 1.8.71 -2024-3-5 @江超**
+**1.8.66 - 1.8.73 -2024-3-5 @江超**
 - 完善`XTable`在开发环境下的查询效果
 
 **1.8.65 -2024-3-5 @张振宇**

package/package.json

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

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

@@ -18,10 +18,11 @@
           :service-name="serviceName"
           mode="新增/修改"
           :get-data-params="getDataParams"
+          :env="env"
         />
       </a-row>
       <a-row :gutter="16" v-for="(groupItem, groupIndex) in groupJsonData" :key="groupIndex">
-        <a-card :title="groupItem.name" :bordered="false" size="small">
+        <a-card v-if="groupItem.groupItems.length > 0" :title="groupItem.name" :bordered="false" size="small">
           <x-form-item
             v-for="(item, index) in groupItem.groupItems"
             :key="index"
@@ -33,11 +34,12 @@
             :service-name="serviceName"
             mode="新增/修改"
             :get-data-params="getDataParams"
+            :env="env"
           />
         </a-card>
       </a-row>
       <a-row :gutter="16" v-for="(item, key) in simpleFormJsonData" :key="'row' + key">
-        <a-card :title="item.name" :bordered="false" size="small">
+        <a-card v-if="item.value.length > 0" :title="item.name" :bordered="false" size="small">
           <x-form-item
             v-for="(formItem, formItemIndex) in item.value"
             :key="key + formItemIndex"
@@ -49,6 +51,7 @@
             :service-name="serviceName"
             mode="新增/修改"
             :get-data-params="getDataParams"
+            :env="env"
           />
         </a-card>
       </a-row>
@@ -107,7 +110,9 @@ export default {
       // 是否处理表单key
       isKeyHandle: true,
       // 动态简易表单集合
-      simpleFormJsonData: {}
+      simpleFormJsonData: {},
+      // 当前环境
+      env: 'prod'
     }
   },
   computed: {
@@ -150,7 +155,10 @@ export default {
   methods: {
     init (params) {
       const {
-        configName, configContent, formItems, viewMode, isHandleFormKey = true, showSubmitBtn = true, serviceName, isTableTemp = false, isKeyHandle = true, modifyModelData = {}, businessType, title, fixedAddForm = {}, getDataParams = {}, simpleFormJsonData = {}
+        configName, configContent, formItems, viewMode, isHandleFormKey = true,
+        showSubmitBtn = true, serviceName, isTableTemp = false, isKeyHandle = true,
+        modifyModelData = {}, businessType, title, fixedAddForm = {}, getDataParams = {},
+        simpleFormJsonData = {}, env = 'prod'
       } = params
       this.loaded = false
       this.configName = configName
@@ -168,6 +176,7 @@ export default {
       this.title = title
       this.getDataParams = getDataParams
       this.simpleFormJsonData = simpleFormJsonData
+      this.env = env
       this.isTableTemp = isTableTemp
       this.isKeyHandle = isKeyHandle
       // 设置普通表单项的相关参数
@@ -371,7 +380,7 @@ export default {
         businessType: this.businessType,
         operator: this.currUser.name
       }
-      addOrModify(requestParameters, this.serviceName).then(data => {
+      addOrModify(requestParameters, this.serviceName, this.env === 'dev').then(data => {
         this.$message.success(this.businessType + '成功！')
         // commit
         this.$emit('afterSubmit', { type: this.businessType, id: data.id, form: requestParameters.form })

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

@@ -14,6 +14,7 @@
           :form="form"
           :service-name="serviceName"
           :get-data-params="getDataParams"
+          :env="env"
         />
         <div v-for="(groupItem, groupIndex) in groupJsonData" :key="'group-' + groupIndex">
           <x-form-item
@@ -23,6 +24,7 @@
             :form="form"
             :service-name="serviceName"
             :get-data-params="getDataParams"
+            :env="env"
           />
         </div>
         <div v-show="advanced">
@@ -33,6 +35,7 @@
             :form="form"
             :service-name="serviceName"
             :get-data-params="getDataParams"
+            :env="env"
           />
         </div>
         <a-col>
@@ -90,7 +93,9 @@ export default {
       // 是否显示
       visible: true,
       // 调用logic获取数据源的追加参数
-      getDataParams: {}
+      getDataParams: {},
+      // 当前环境
+      env: 'prod',
     }
   },
   computed: {
@@ -116,11 +121,12 @@ export default {
   methods: {
     init (params) {
       const {
-        formItems, serviceName, getDataParams = {}
+        formItems, serviceName, getDataParams = {}, env = 'prod'
       } = params
       this.loaded = false
       this.formItems = JSON.parse(JSON.stringify(formItems))
       this.serviceName = serviceName
+      this.env = env
       const formData = {}
       for (let i = 0; i < this.realJsonData.length; i++) {
         const item = this.realJsonData[i]

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

@@ -384,7 +384,14 @@ export default {
     getDataParams: {
       type: Object,
       default: undefined
-    }
+    },
+    // 环境
+    env: {
+      type: String,
+      default: () => {
+        return 'prod'
+      }
+    },
   },
   created () {
     this.init()
@@ -490,7 +497,7 @@ export default {
       })
     },
     // 获取数据
-    getData (value, callback) {
+    getData (value, callbackFun) {
       if (value !== '') {
         const logicName = this.attr.keyName
         const logic = logicName.substring(6)
@@ -498,8 +505,11 @@ export default {
         if (this.getDataParams && this.getDataParams[this.attr.model]) {
           Object.assign(value, this.getDataParams[this.attr.model])
         }
-        runLogic(logic, value, this.serviceName).then(res => {
-          callback(res)
+        runLogic(logic, value, this.serviceName, this.env === 'dev').then(res => {
+          callbackFun(res)
+        }).catch(e => {
+          callbackFun([])
+          console.error('获取数据失败：' + e)
         })
       }
     },

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

@@ -233,7 +233,8 @@ export default {
         this.$refs.xForm.init({
           formItems: res.formJson,
           serviceName: this.serviceName,
-          getDataParams: this.getDataParams
+          getDataParams: this.getDataParams,
+          env: this.env
         })
       }
       this.loading = false
@@ -313,7 +314,8 @@ export default {
         isTableTemp: this.isTableTemp,
         serviceName: this.serviceName,
         fixedAddForm: this.fixedAddForm,
-        getDataParams: this.getDataParams
+        getDataParams: this.getDataParams,
+        env: this.env
       })
     },
     /**
@@ -334,7 +336,8 @@ export default {
         serviceName: this.serviceName,
         fixedAddForm: this.fixedAddForm,
         getDataParams: this.getDataParams,
-        modifyModelData: modifyModelData
+        modifyModelData: modifyModelData,
+        env: this.env
       })
     },
     /**