vue2-client 1.8.237 → 1.8.239

package/package.json

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

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

@@ -26,42 +26,46 @@
         </a-button>
       </a-input-group>
     </div>
-    <a-modal :visible="visible" title="地址选择" @ok="selected" @cancel="visible=false" :zIndex="m_index">
-      <div id="addressSearchCombobox_map">
-        <div class="certain-category-search-wrapper">
-          <a-auto-complete
-            style="right: 0px;width: 90%;z-index:2;margin-top:2%;"
-            :disabled="!mapAutocomplete"
-            class="certain-category-search"
-            dropdown-class-name="certain-category-search-dropdown"
-            option-label-prop="value"
-            placeholder="输入地址关键字搜索"
-            @search="fetchFunction"
-            @select="onSelect"
-          >
-            <a-spin v-if="searching" slot="notFoundContent" size="small"/>
-            <template slot="dataSource">
-              <a-select-opt-group v-for="group in option" :key="group.title">
-                <span
-                  slot="label">
-                  <a-icon type="bank"/> {{ group.title }}
-                </span>
-                <a-select-option v-for="address in group.children" :key="address.label + ' <' + address.value + '>'">
-                  <p class="addressName">
-                    <a-icon type="environment"/>
-                    <span v-html="highLight(address.label, address.word)"></span></p>
-                  <p v-if="address.address !== '[]'" class="addressRemark">
-                    {{ address.address }}
-                  </p>
-                </a-select-option>
-              </a-select-opt-group>
-            </template>
-            <a-input>
-              <a-icon slot="suffix" class="certain-category-icon" type="search"/>
-            </a-input>
-          </a-auto-complete>
-        </div>
+    <a-modal
+      v-model="visible"
+      title="地址选择"
+      @ok="selected"
+      :zIndex="m_index"
+      :destroyOnClose="true">
+      <div class="certain-category-search-wrapper">
+        <a-auto-complete
+          style="right: 0px;width: 90%;z-index:2;margin-top:2%;"
+          :disabled="!mapAutocomplete"
+          class="certain-category-search"
+          dropdown-class-name="certain-category-search-dropdown"
+          option-label-prop="value"
+          placeholder="输入地址关键字搜索"
+          @search="fetchFunction"
+          @select="onSelect"
+        >
+          <a-spin v-if="searching" slot="notFoundContent" size="small"/>
+          <template slot="dataSource">
+            <a-select-opt-group v-for="group in option" :key="group.title">
+              <span
+                slot="label">
+                <a-icon type="bank"/> {{ group.title }}
+              </span>
+              <a-select-option v-for="address in group.children" :key="address.label + ' <' + address.value + '>'">
+                <p class="addressName">
+                  <a-icon type="environment"/>
+                  <span v-html="highLight(address.label, address.word)"></span></p>
+                <p v-if="address.address !== '[]'" class="addressRemark">
+                  {{ address.address }}
+                </p>
+              </a-select-option>
+            </a-select-opt-group>
+          </template>
+          <a-input>
+            <a-icon slot="suffix" class="certain-category-icon" type="search"/>
+          </a-input>
+        </a-auto-complete>
       </div>
+      <div id="addressSearchCombobox_map"/>
       <a-descriptions
         bordered
         class="asc_descriptions"
@@ -278,7 +282,6 @@ export default {
   },
   watch: {
     'visible' (val) {
-      console.log('val', val)
       if (val) {
         GetGDMap(this.gaode_secret_key, this.gaode_key).then(aMap => {
           this.initMap(aMap)
@@ -304,6 +307,14 @@ export default {
               this.divisions.township = addressComponent.township
               this.divisions.towncode = addressComponent.towncode
               this.divisions.street = addressComponent.street
+              // 试着获取小区
+              if (positionResult?.regeocode?.aois && positionResult?.regeocode?.aois.length) {
+                // 取第一个当做小区
+                this.divisions.area = positionResult?.regeocode?.aois[0]?.name
+              } else if (positionResult?.regeocode?.pois && positionResult?.regeocode?.pois.length) {
+                // 取第一个当做小区
+                this.divisions.area = positionResult?.regeocode?.pois[0]?.name
+              }
               this.divisions.str =
                 `${addressComponent.province}${addressComponent.city}${addressComponent.district}${addressComponent.township}`
             }
@@ -323,12 +334,8 @@ export default {
   }
 }
 </script>
-<style>
-.asc_descriptions .ant-descriptions-item-content {
-  width: 80%;
-}
-</style>
-<style lang="less">
+
+<style lang="less" scoped>
 #addressSearchCombobox_map {
   margin: 1% 0;
   width: 100%;
@@ -336,6 +343,15 @@ export default {
   text-align: center
 }
 
+.asc_descriptions .ant-descriptions-item-content {
+  width: 80%;
+}
+
+.certain-category-search-wrapper {
+  margin-bottom: -4rem;
+  text-align: center;
+}
+
 #addressSearchCombobox {
 
   .certain-category-search-dropdown .ant-select-dropdown-menu-item-group-title {

package/src/base-client/components/common/AddressSearchCombobox/demo.vue

@@ -1,35 +1,36 @@
-<script>
-
-import AddressSearchCombobox from '@vue2-client/base-client/components/common/AddressSearchCombobox/index'
-
-export default {
-  name: 'Demo',
-  components: { AddressSearchCombobox },
-  data () {
-    return {
-      visible: false,
-      searchResult: {}
-    }
-  },
-  methods: {
-    addressSearchComboboxSelect (res) {
-      console.log('===', res)
-    }
-  }
-}
-</script>
-
-<template>
-  <div>
-    <address-search-combobox
-      v-model="searchResult"
-      :resultKeys="{ address: 'f_address', coords: `f_address_lng_lat` }"
-      searchResultType="Object"
-      @onSelect="addressSearchComboboxSelect"
-    ></address-search-combobox>
-  </div>
-</template>
-
-<style scoped lang="less">
-
-</style>
+<script>
+
+import AddressSearchCombobox from '@vue2-client/base-client/components/common/AddressSearchCombobox/index'
+
+export default {
+  name: 'Demo',
+  components: { AddressSearchCombobox },
+  data () {
+    return {
+      visible: false,
+      searchResult: {}
+    }
+  },
+  methods: {
+    addressSearchComboboxSelect (res) {
+      console.log('===', res)
+    }
+  }
+}
+</script>
+
+<template>
+  <div>
+    <address-search-combobox
+      v-model="searchResult"
+      :resultKeys="{ address: 'f_address', coords: `f_address_lng_lat` }"
+      searchResultType="Object"
+      @onSelect="addressSearchComboboxSelect"
+      @onDivisionsChange="addressSearchComboboxSelect"
+    ></address-search-combobox>
+  </div>
+</template>
+
+<style scoped lang="less">
+
+</style>

package/src/base-client/components/common/LowCodeComponent/LowCodePageOrganization.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <a-button @click="addComponent">添加组件</a-button>
+    <a-button @click="addComponent">添加页面</a-button>
     <a-tree
       v-if="showTree"
       defaultExpandAll
@@ -18,6 +18,7 @@
             <a-menu @click="({ key: menuKey }) => onContextMenuClick(treeKey, menuKey)">
               <a-menu-item key="copy">复制</a-menu-item>
               <a-menu-item key="paste" :disabled="copyCache === undefined">粘贴</a-menu-item>
+              <a-menu-item key="rename" :disabled="treeKey.length > 2">重命名</a-menu-item>
               <a-menu-item key="delete">删除</a-menu-item>
             </a-menu>
           </template>
@@ -64,6 +65,22 @@
         </template>
       </a-form>
     </a-modal>
+    <!--  页面容器重命名弹框  -->
+    <a-modal
+      title="页面容器重命名"
+      width="60%"
+      :z-index="1001"
+      :destroyOnClose="true"
+      @ok="handleRenameModalOk"
+      @cancel="() => { showRenameModal = false }"
+      :visible="showRenameModal">
+      <a-form :label-col="{ span: 7 }" :wrapper-col="{ span: 12 }">
+        <!--    新名称    -->
+        <a-form-item label="新名称">
+          <a-input v-model="pageNewName"/>
+        </a-form-item>
+      </a-form>
+    </a-modal>
   </div>
 </template>
 
@@ -78,6 +95,12 @@ export default {
     }
   },
   methods: {
+    // 重命名弹框确认
+    handleRenameModalOk () {
+      this.$emit('renamePage', this.renamePageId, this.pageNewName)
+      this.renamePageId = undefined
+      this.showRenameModal = false
+    },
     // 根据id返回类型
     determineLevel (id) {
       if (id.length === 2) {
@@ -236,6 +259,11 @@ export default {
 
         // 其余操作均不合法
         this.$message.error('该操作不合法！')
+      } else if (menuKey === 'rename') {
+        const page = lowcodeUtils.getConfig(treeKey, this.config)
+        this.renamePageId = page.id
+        this.pageNewName = page.title
+        this.showRenameModal = true
       }
     },
     // 处理架构树点击事件
@@ -343,7 +371,10 @@ export default {
       treeData: [],
       showTree: false,
       showModal: false,
+      showRenameModal: false,
       copyCache: undefined,
+      pageNewName: undefined,
+      renamePageId: undefined,
       addComponentTemp: { type: 'page' }
     }
   }

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

@@ -81,6 +81,7 @@ export default {
       type: String,
       default: undefined
     },
+    // outerContainerIndex，是为了XReport，返回外侧行的Index，每一行都有可能有图片，所以要知道是哪一个Index发出的事件
     outerContainerIndex: {
       type: [String, Number],
       default: undefined
@@ -96,10 +97,13 @@ export default {
     } else {
       this.uploadedFileList = list
     }
+    // 第三个参数‘created’，是因为XReport，有些图片上传需要外界自己控制上传下载的逻辑
+    // 如果在组件加载完成就emit的话，外侧组件会以为图片已经更新，会调用后端，造成性能浪费
+    // 所以外侧需要一个标识来判断，该emit事件是不是初始化的时候发出的
     if (this.outerContainerIndex !== undefined) {
-      this.$emit('setFiles', this.uploadedFileList.filter(item => item.status === 'done'), this.outerContainerIndex)
+      this.$emit('setFiles', this.uploadedFileList.filter(item => item.status === 'done'), this.outerContainerIndex, 'created')
     } else {
-      this.$emit('setFiles', this.uploadedFileList.filter(item => item.status === 'done').map(item => item.id))
+      this.$emit('setFiles', this.uploadedFileList.filter(item => item.status === 'done').map(item => item.id), undefined, 'created')
     }
   },
   methods: {

package/src/base-client/components/common/XDescriptions/lowcodeEditorRegister.js

@@ -1,21 +1,23 @@
-export const XDescriptionsConfig = {
-  type: 'XDescriptions',
-  properties: {
-    title: {
-      type: 'string'
-    },
-    content: {
-      type: 'object'
-    },
-    configName: {
-      type: 'string'
-    },
-    serviceName: {
-      type: 'string'
-    },
-    getRealData: {
-      type: 'boolean'
-    }
-  },
-  selfEvent: []
-}
+export const XDescriptionsConfig = {
+  type: 'XDescriptions',
+  properties: {
+    title: {
+      type: 'string',
+      title: '',
+      desc: ''
+    },
+    content: {
+      type: 'object'
+    },
+    configName: {
+      type: 'string'
+    },
+    serviceName: {
+      type: 'string'
+    },
+    getRealData: {
+      type: 'boolean'
+    }
+  },
+  selfEvent: []
+}

package/src/base-client/components/common/XFormGroup/demo.vue

@@ -1,40 +1,40 @@
-<script>
-import XFormGroup from '@vue2-client/base-client/components/common/XFormGroup/XFormGroup.vue'
-import { getConfigByNameAsync } from '@vue2-client/services/api/common'
-
-export default {
-  name: 'Demo',
-  components: { XFormGroup },
-  created () {
-    getConfigByNameAsync('addUserGeneralInfoFrom', 'af-revenue').then(res => {
-      this.$refs.xFormGroupDemo.init({
-        ...res,
-        serviceName: 'af-revenue',
-        showLeftTab: true,
-      })
-    })
-  },
-  methods: {
-    submitForm () {
-      this.$refs.xFormGroupDemo.onSubmit().then(res => {
-        console.log('所有表单的结果', res)
-      })
-    }
-  }
-}
-</script>
-
-<template>
-  <a-modal
-    :visible="true"
-    :bodyStyle="{height:'70vh'}"
-    title="测试表单组"
-    @ok="submitForm"
-    width="85vw">
-    <x-form-group ref="xFormGroupDemo"></x-form-group>
-  </a-modal>
-</template>
-
-<style scoped lang="less">
-
-</style>
+<script>
+import XFormGroup from '@vue2-client/base-client/components/common/XFormGroup/XFormGroup.vue'
+import { getConfigByNameAsync } from '@vue2-client/services/api/common'
+
+export default {
+  name: 'Demo',
+  components: { XFormGroup },
+  created () {
+    getConfigByNameAsync('addUserGeneralInfoFrom', 'af-revenue').then(res => {
+      this.$refs.xFormGroupDemo.init({
+        ...res,
+        serviceName: 'af-revenue',
+        showLeftTab: true,
+      })
+    })
+  },
+  methods: {
+    submitForm () {
+      this.$refs.xFormGroupDemo.onSubmit().then(res => {
+        console.log('所有表单的结果', res)
+      })
+    }
+  }
+}
+</script>
+
+<template>
+  <a-modal
+    :visible="true"
+    :bodyStyle="{height:'70vh'}"
+    title="测试表单组"
+    @ok="submitForm"
+    width="85vw">
+    <x-form-group ref="xFormGroupDemo"></x-form-group>
+  </a-modal>
+</template>
+
+<style scoped lang="less">
+
+</style>