vue2-client 1.8.289 → 1.8.291

package/package.json

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

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

@@ -39,9 +39,10 @@
                 :title="item.name"
                 :getPopupContainer=" triggerNode => { return triggerNode.parentElement } "
               >
-                {{ item.name.length > 8 ?`${item.name.slice(0, 8)}...`:item.name }}
+                {{ item?.name?.length > 8 ? `${item.name.slice(0, 8)}...` : item.name }}
               </a-tooltip>
             </a-checkable-tag>
+            <a-empty v-if="tagData[view.value].length === 0" :img="Empty.PRESENTED_IMAGE_SIMPLE"></a-empty>
           </a-tab-pane>
         </a-tabs>
       </div>
@@ -53,6 +54,7 @@
 import { mapState } from 'vuex'
 import { runLogic } from '@vue2-client/services/api/common'
 import { handleTree } from '@vue2-client/utils/util'
+import { Empty } from 'ant-design-vue'
 
 const viewArr = [
   {
@@ -76,6 +78,7 @@ export default {
   name: 'CitySelect',
   data () {
     return {
+      Empty,
       open: false,
       tagData: {
         divisionsForTree: [],
@@ -110,21 +113,12 @@ export default {
     }
   },
   async mounted () {
-   await this.$appdata.getDivisionsOhChinaForTree().then(res => {
-      if (res) {
-        this.tagData.divisionsForTree = res
-        if (this.value) {
-          this.setValue(this.value, res)
-        }
-      } else {
-        runLogic('getOperatingAreas', {
-          orgId: this.currUser.orgid
-        }, 'af-revenue').then(res => {
-          this.tagData.divisionsForTree = handleTree(res, 'code', 'parentcode')
-          if (this.value) {
-            this.setValue(this.value, res)
-          }
-        })
+    runLogic('getOperatingAreas', {
+      orgId: this.currUser.orgid
+    }, 'af-revenue').then(res => {
+      this.tagData.divisionsForTree = handleTree(res, 'code', 'parentcode')
+      if (this.value) {
+        this.setValue(this.value, res)
       }
     })
   },

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

@@ -4,9 +4,13 @@
       v-if="uploadStyle === 'simple'"
       :accept="model.accept?.join('')"
       :customRequest="uploadFiles"
+      :multiple="model.acceptCount && model.acceptCount>1"
       :file-list="uploadedFileList"
       :remove="deleteFileItem">
-      <a-button style="margin-top: 2%"> <a-icon type="upload" /> 上传 </a-button>
+      <a-button style="margin-top: 2%">
+        <a-icon type="upload"/>
+        上传
+      </a-button>
     </a-upload>
     <a-upload-dragger
       v-else-if="model.type === 'file'"
@@ -29,6 +33,7 @@
     <a-upload
       v-else
       :accept="model.accept?.join('')"
+      :multiple="model.acceptCount && model.acceptCount>1"
       :customRequest="uploadFiles"
       :file-list="uploadedFileList"
       :remove="deleteFileItem"
@@ -198,11 +203,15 @@ export default {
             switch (that.compatible) {
               case 'V3':
                 fileDelete({ id: file.id, f_state: '删除' })
-                  .then(res => {}).catch(e => { })
+                  .then(res => {
+                  }).catch(e => {
+                })
                 break
               case 'V4':
                 fileDeleteV4({ id: file.id, resDeleteMode: 'server' })
-                  .then(res => {}).catch(e => { })
+                  .then(res => {
+                  }).catch(e => {
+                })
                 break
             }
           }

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

@@ -280,5 +280,10 @@ export default {
 <style lang="less" scoped>
 :deep(.ant-form-inline .ant-form-item) {
   margin-right: 0px;
+  margin-top: 0px;
+  margin-bottom: 12px;
+}
+:deep(.table-page-search-wrapper .table-page-search-submitButtons) {
+  margin-top: 0px;
 }
 </style>

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

@@ -11,6 +11,7 @@
     </a-col>
     <a-col :span="xTreeConfigName ? 18 : 24" :style="{ flex: xTreeConfigName ? '1' : 'none' }">
       <a-skeleton :loading="loading" :paragraph="{ rows: 4 }"/>
+      <a-row style="height: 12px" v-if="xTreeConfigName"></a-row>
       <div v-show="!loading">
         <template v-if="!loadError">
           <x-add-form
@@ -59,7 +60,7 @@
             </template>
             <template slot="rightBtnExpand" slot-scope="{selectedRowKeys, selectedRows}">
               <slot name="rightBtnExpand" :selectedRowKeys="selectedRowKeys" :selectedRows="selectedRows"></slot>
-              <a-tooltip title="收起查询条件">
+              <a-tooltip title="收起查询条件" placement="bottom">
                 <a-button @click="toggleIsFormShow">
                   <a-icon :style="iconStyle" :type="toggleIsFormIcon"/>
                 </a-button>

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

@@ -41,12 +41,12 @@
         <span :style="{ float: 'right', overflow: 'hidden', marginBottom: '8px' }">
           <a-button-group>
             <slot name="rightBtnExpand" :selectedRowKeys="selectedRowKeys" :selectedRows="selectedRows"></slot>
-            <a-tooltip title="重新查询">
+            <a-tooltip title="重新查询" placement="bottom">
               <a-button @click="refresh(true)">
                 <a-icon :style="iconStyle" type="reload"/>
               </a-button>
             </a-tooltip>
-            <a-tooltip title="列展示/排序">
+            <a-tooltip title="列展示/排序" placement="bottom">
               <table-setting v-if="columnSelectLoaded" v-model="tableColumns"/>
             </a-tooltip>
           </a-button-group>