vue2-client 1.5.19 → 1.5.21

package/CHANGELOG.md

@@ -1,7 +1,7 @@
 # Change Log
 > 所有关于本项目的变化都在该文档里。
 
-**1.5.14 - 1.5.19 -2022-12-12 @苗艳强**
+**1.5.14 - 1.5.21 -2022-12-13 @苗艳强**
 - 修复徽标显示问题
 - 修复fixedQueryForm问题
 - 修复修改时树形选择框不能回填问题
@@ -13,6 +13,8 @@
 - 修改查询配置
 - 修复清空查询缓存回调问题
 - 新增调用logic获取数据源可自定义追加参数
+- 修改省市区数据获取
+- 修复基础表单配置错误
 
 **1.5.11 - 1.5.13 -2022-12-05 @江超**
 - 优化了查询配置生成界面的样式

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vue2-client",
-  "version": "1.5.19",
+  "version": "1.5.21",
   "private": false,
   "scripts": {
     "serve": "vue-cli-service serve",

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

@@ -70,7 +70,7 @@ export default {
     return {
       open: false,
       tagData: {
-        divisionsForTree: this.$appdata.getDivisionsOhChinaForTree(),
+        divisionsForTree: [],
         // 市
         cityData: [],
         // 区
@@ -99,7 +99,9 @@ export default {
     }
   },
   mounted () {
-
+    this.$appdata.getDivisionsOhChinaForTree().then(res => {
+      this.tagData.divisionsForTree = res
+    })
   },
   model: {
     prop: 'value',

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

@@ -73,7 +73,8 @@
               </a-row>
             </div>
           </a-form-model-item>
-          <a-form-model-item label="接口插槽" prop="apiSlot">
+          <!-- 暂时不需要 -->
+          <!-- <a-form-model-item label="接口插槽" prop="apiSlot">
             <a-popover placement="right" title="说明">
               <template slot="content">
                 <p>通过插槽，你可以轻松扩展查询配置的默认业务，配置的插槽会根据类型在默认业务的前后执行，类似于切面</p>
@@ -100,10 +101,13 @@
                 <a-icon slot="addonAfter" type="close" @click="removeApiSlotItem(index)"/>
               </a-input>
             </div>
-          </a-form-model-item>
+          </a-form-model-item> -->
         </a-form-model>
         <create-simple-form-query-item ref="queryItem" @getColumn="getColumn" @itemHandle="itemHandle"/>
-        <a-button type="primary" @click="view">操作</a-button>
+        <a-space>
+          <a-button type="default" @click="view">预览</a-button>
+          <a-button type="primary" @click="submit">保存</a-button>
+        </a-space>
       </a-col>
       <a-col :lg="12" :md="12" :sm="24" :xl="6" :xs="24">
         <a-card :bordered="false" size="small" style="overflow: auto" title="预览">
@@ -117,7 +121,7 @@
     </a-row>
     <x-add-form
       ref="xAddForm"
-      @onSubmit="submit"/>
+    />
   </a-drawer>
 </template>
 
@@ -376,7 +380,8 @@ export default {
             post(commonApi.getColumnsJson, { queryObject: this.result }).then(res => {
               this.$refs.xAddForm.init({
                 formItems: res.formJson,
-                serviceName: res.serviceName
+                serviceName: res.serviceName,
+                viewMode: true
               })
               this.$refs.xAddForm.open({
                 businessType: '新增',

package/src/base-client/plugins/AppData.js

@@ -30,13 +30,18 @@ const GetAppDataService = {
       localStorage.setItem(process.env.VUE_APP_DICTIONARY_KEY, JSON.stringify(params))
       localStorage.setItem(process.env.VUE_APP_BADGE_KEY, JSON.stringify(badgeItemArray))
     })
-    // 获取省市区数据
-    localStorage.setItem(process.env.VUE_APP_DIVISIONSOHCHINA, JSON.stringify([]))
   },
   // 返回树形省市区
-  getDivisionsOhChinaForTree () {
-    const str = localStorage.getItem(process.env.VUE_APP_DIVISIONSOHCHINA)
-    return handleTree(JSON.parse(str), 'code', 'parentcode')
+  async getDivisionsOhChinaForTree () {
+    let list = this.getDivisionsOhChinaForList()
+    // 获取省市区数据
+    if (!list) {
+      await post(manageApi.getDivisionsOhChina, {}).then((res) => {
+        list = res
+        localStorage.setItem(process.env.VUE_APP_DIVISIONSOHCHINA, JSON.stringify(res))
+      })
+    }
+    return handleTree(list, 'code', 'parentcode')
   },
   // 返回列表省市区
   getDivisionsOhChinaForList () {