vue2-client 1.8.181 → 1.8.183

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vue2-client",
-  "version": "1.8.181",
+  "version": "1.8.183",
   "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

@@ -1,346 +1,346 @@
-<template>
-  <div>
-    <a-cascader
-      v-if="type === 'cascader'"
-      :options="tagData.divisionsForTree"
-      :placeholder="placeholder"
-      style="width: 100%;"
-      :size="size"
-    />
-    <a-select
-      ref="select"
-      :size="size"
-      v-model="valueView"
-      style="width: 100%;"
-      :dropdownMatchSelectWidth="false"
-      :dropdownStyle="dropdownStyle"
-      :placeholder="placeholder"
-      @blur="selectBlurHandle"
-      allow-clear
-      :getPopupContainer=" triggerNode => { return triggerNode.parentNode } "
-      :style="inputStyle">
-      <div slot="dropdownRender" @mousedown.prevent>
-        <a-tabs v-model="activeKey" :size="size">
-          <a-tab-pane
-            :tab="view.key"
-            v-for="(view,index) in viewArr"
-            :key="view.key"
-            v-if="contexts > index"
-            :disabled="tagData[view.value].length === 0">
-
-            <a-checkable-tag
-              :style="tagStyle"
-              v-for="item of tagData[view.value]"
-              :key="item.code"
-              @change="tagClick(view.key,item)">
-              <a-tooltip
-                placement="top"
-                :mouseEnterDelay="0.5"
-                :title="item.name"
-                :getPopupContainer=" triggerNode => { return triggerNode.parentElement } "
-              >
-                {{ item.name.length > 8 ?`${item.name.slice(0, 8)}...`:item.name }}
-              </a-tooltip>
-            </a-checkable-tag>
-          </a-tab-pane>
-        </a-tabs>
-      </div>
-    </a-select>
-  </div>
-</template>
-
-<script>
-import { mapState } from 'vuex'
-import { runLogic } from '@vue2-client/services/api/common'
-import { handleTree } from '@vue2-client/utils/util'
-
-const viewArr = [
-  {
-    key: '省/直辖市',
-    value: 'divisionsForTree',
-  }, {
-    key: '市',
-    value: 'cityData',
-  }, {
-    key: '区',
-    value: 'areaData',
-  }, {
-    key: '街道',
-    value: 'streetData',
-  }, {
-    key: '小区',
-    value: 'communityData',
-  }
-]
-export default {
-  name: 'CitySelect',
-  data () {
-    return {
-      open: false,
-      tagData: {
-        divisionsForTree: [],
-        // 市
-        cityData: [],
-        // 区
-        areaData: [],
-        // 街道
-        streetData: [],
-        // 小区
-        communityData: [],
-      },
-      // model: {
-      //   provinceModel: { name: '', code: '' },
-      //   cityModel: { name: '', code: '' },
-      //   areaModel: { name: '', code: '' },
-      //   streetModel: { name: '', code: '' }
-      // },
-      model: [
-        { name: '', code: '' },
-        { name: '', code: '' },
-        { name: '', code: '' },
-        { name: '', code: '' },
-        { name: '', code: '' }
-      ],
-      // 控制标签
-      activeKey: '省/直辖市',
-      // 遍历以渲染页面
-      viewArr,
-      // 框内显示值 valueView
-      valueView: undefined
-    }
-  },
-  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', {}, 'af-revenue').then(res => {
-          this.tagData.divisionsForTree = handleTree(res, 'code', 'parentcode')
-          if (this.value) {
-            this.setValue(this.value, res)
-          }
-        })
-      }
-    })
-  },
-  model: {
-    prop: 'value',
-    event: 'onChange'
-  },
-  computed: {
-    ...mapState('account', { currUser: 'user' })
-  },
-  props: {
-    // 页面渲染内容  默认 省市区街道 四个 所以是4  5 是到小区
-    contexts: {
-      type: Number,
-      default: 4
-    },
-    placeholder: {
-      type: String,
-      default: '请选择省市区'
-    },
-    // small lage 输入框大小
-    size: {
-      type: String,
-      default: undefined
-    },
-    // 类型 simple / undefined
-    // simple 就是用的 cascader  不穿就是用的 自己封装的
-    type: {
-      type: String,
-      default: undefined
-    },
-    // 框的样式
-    inputStyle: {
-      type: Object,
-      default: () => {
-      }
-    },
-    // 下拉框的样式
-    dropdownStyle: {
-      type: Object,
-      default: () => {
-        return {
-          width: '35rem',
-          padding: '1%'
-        }
-      }
-    },
-    // 标签的样式
-    tagStyle: {
-      type: Object,
-      default: () => {
-        return {
-          fontSize: '0.88rem',
-          width: '23%',
-          textAlign: 'left',
-          margin: '0.5%',
-          cursor: 'pointer'
-        }
-      }
-    },
-    // 用于v-model 绑定
-    value: {
-      type: String,
-      default: undefined
-    },
-    // 用于仅用于展示
-    defaultValue: {
-      type: String,
-      default: undefined
-    },
-    // 用于v-model 绑定 code :最后一级的code  address: 所有级拼接的地址
-    valueType: {
-      type: String,
-      default: 'code'
-    }
-  },
-  watch: {
-    value () {
-      if (!this.value && this.valueView) {
-        /// 兼容外层重置方法
-        this.model = [
-          { name: '', code: '' },
-          { name: '', code: '' },
-          { name: '', code: '' },
-          { name: '', code: '' },
-          { name: '', code: '' }
-        ]
-        this.getResultText(this.contexts)
-      }
-    }
-  },
-  methods: {
-    setValue (code, tree) {
-      const findNode = (code, tree) => {
-        for (let i = 0; i < tree.length; i++) {
-          if (tree[i].code === code) {
-            return tree[i]
-          } else if (tree[i].children && tree[i].children.length > 0) {
-            const node = findNode(code, tree[i].children)
-            if (node) {
-              return node
-            }
-          }
-        }
-      }
-
-      const findParent = (code, tree, parent = null) => {
-        for (let i = 0; i < tree.length; i++) {
-          if (tree[i].code === code) {
-            return parent
-          } else if (tree[i].children && tree[i].children.length > 0) {
-            const node = findParent(code, tree[i].children, tree[i])
-            if (node) {
-              return node
-            }
-          }
-        }
-      }
-
-      const node = findNode(code, tree)
-      if (node) {
-        this.model[this.contexts - 1].name = node.name
-        this.model[this.contexts - 1].code = node.code
-        let parent = findParent(code, tree)
-        for (let i = this.contexts - 2; i >= 0; i--) {
-          this.model[i].name = parent ? parent.name : null
-          this.model[i].code = parent ? parent.code : null
-          if (i < this.contexts - 1 && parent) {
-            parent = findParent(parent.code, tree)
-          }
-        }
-        this.getResultText(this.contexts)
-      }
-    },
-    tagClick (e, item) {
-      if (e === '省/直辖市') {
-        // 如果是同一个标签
-        if (this.model[0].name !== item.name) {
-          this.tagData.cityData = item.children
-          this.tagData.areaData = []
-          this.tagData.streetData = []
-          this.model[0].name = item.name
-          this.model[0].code = item.code
-          this.model[1] = { name: '', code: '' }
-          this.model[2] = { name: '', code: '' }
-          this.model[3] = { name: '', code: '' }
-        }
-        if (this.contexts !== 1) {
-          this.activeKey = '市'
-        }
-        this.getResultText(1)
-      } else if (e === '市') {
-        if (this.model[1].name !== item.name) {
-          this.tagData.areaData = item.children
-          this.tagData.streetData = []
-          this.model[1].name = item.name
-          this.model[1].code = item.code
-          this.model[2] = { name: '', code: '' }
-          this.model[3] = { name: '', code: '' }
-        }
-        if (this.contexts !== 2) {
-          this.activeKey = '区'
-        }
-        this.getResultText(2)
-      } else if (e === '区') {
-        if (this.model[2].name !== item.name) {
-          this.tagData.streetData = item.children || []
-          this.model[2].name = item.name
-          this.model[2].code = item.code
-          this.model[3] = { name: '', code: '' }
-        }
-        if (this.contexts !== 3) {
-          this.activeKey = '街道'
-        }
-        this.getResultText(3)
-      } else if (e === '街道') {
-        if (this.model[3].name !== item.name) {
-          this.tagData.communityData = item.children || []
-          this.model[3].name = item.name
-          this.model[3].code = item.code
-
-          this.model[4] = { name: '', code: '' }
-        }
-        if (this.contexts !== 4) {
-          this.activeKey = '小区'
-        }
-        this.getResultText(4)
-      } else if (e === '小区') {
-        if (this.model[4].name !== item.name) {
-          this.model[4].name = item.name
-          this.model[4].code = item.code
-        }
-        this.getResultText(5)
-      }
-    },
-    getResultText (tag) {
-      const address = []
-      let code = ''
-      for (let i = 0; i < this.contexts; i++) {
-        if (this.model[i].name && this.model[i].name !== '') {
-          address.push(this.model[i].name)
-        }
-        code = this.model[i].code ?? ''
-      }
-      this.valueView = address.length === 0 ? undefined : address.join('')
-      if (tag === this.contexts) {
-        this.$refs.select.blur()
-        // this.$emit('onChange', this.valueType === 'address' ? address.join('') : code)
-        this.$emit('onChange', code)
-      }
-    },
-    // 失去焦点回调
-    selectBlurHandle () {
-      console.log(this.model[this.contexts - 1])
-      if (!this.model[this.contexts - 1].code || this.model[this.contexts - 1].code === '') {
-        this.valueView = undefined
-      }
-    }
-  }
-}
-</script>
+<template>
+  <div>
+    <a-cascader
+      v-if="type === 'cascader'"
+      :options="tagData.divisionsForTree"
+      :placeholder="placeholder"
+      style="width: 100%;"
+      :size="size"
+    />
+    <a-select
+      ref="select"
+      :size="size"
+      v-model="valueView"
+      style="width: 100%;"
+      :dropdownMatchSelectWidth="false"
+      :dropdownStyle="dropdownStyle"
+      :placeholder="placeholder"
+      @blur="selectBlurHandle"
+      allow-clear
+      :getPopupContainer=" triggerNode => { return triggerNode.parentNode } "
+      :style="inputStyle">
+      <div slot="dropdownRender" @mousedown.prevent>
+        <a-tabs v-model="activeKey" :size="size">
+          <a-tab-pane
+            :tab="view.key"
+            v-for="(view,index) in viewArr"
+            :key="view.key"
+            v-if="contexts > index"
+            :disabled="tagData[view.value].length === 0">
+
+            <a-checkable-tag
+              :style="tagStyle"
+              v-for="item of tagData[view.value]"
+              :key="item.code"
+              @change="tagClick(view.key,item)">
+              <a-tooltip
+                placement="top"
+                :mouseEnterDelay="0.5"
+                :title="item.name"
+                :getPopupContainer=" triggerNode => { return triggerNode.parentElement } "
+              >
+                {{ item.name.length > 8 ?`${item.name.slice(0, 8)}...`:item.name }}
+              </a-tooltip>
+            </a-checkable-tag>
+          </a-tab-pane>
+        </a-tabs>
+      </div>
+    </a-select>
+  </div>
+</template>
+
+<script>
+import { mapState } from 'vuex'
+import { runLogic } from '@vue2-client/services/api/common'
+import { handleTree } from '@vue2-client/utils/util'
+
+const viewArr = [
+  {
+    key: '省/直辖市',
+    value: 'divisionsForTree',
+  }, {
+    key: '市',
+    value: 'cityData',
+  }, {
+    key: '区',
+    value: 'areaData',
+  }, {
+    key: '街道',
+    value: 'streetData',
+  }, {
+    key: '小区',
+    value: 'communityData',
+  }
+]
+export default {
+  name: 'CitySelect',
+  data () {
+    return {
+      open: false,
+      tagData: {
+        divisionsForTree: [],
+        // 市
+        cityData: [],
+        // 区
+        areaData: [],
+        // 街道
+        streetData: [],
+        // 小区
+        communityData: [],
+      },
+      // model: {
+      //   provinceModel: { name: '', code: '' },
+      //   cityModel: { name: '', code: '' },
+      //   areaModel: { name: '', code: '' },
+      //   streetModel: { name: '', code: '' }
+      // },
+      model: [
+        { name: '', code: '' },
+        { name: '', code: '' },
+        { name: '', code: '' },
+        { name: '', code: '' },
+        { name: '', code: '' }
+      ],
+      // 控制标签
+      activeKey: '省/直辖市',
+      // 遍历以渲染页面
+      viewArr,
+      // 框内显示值 valueView
+      valueView: undefined
+    }
+  },
+  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', {}, 'af-revenue').then(res => {
+          this.tagData.divisionsForTree = handleTree(res, 'code', 'parentcode')
+          if (this.value) {
+            this.setValue(this.value, res)
+          }
+        })
+      }
+    })
+  },
+  model: {
+    prop: 'value',
+    event: 'onChange'
+  },
+  computed: {
+    ...mapState('account', { currUser: 'user' })
+  },
+  props: {
+    // 页面渲染内容  默认 省市区街道 四个 所以是4  5 是到小区
+    contexts: {
+      type: Number,
+      default: 4
+    },
+    placeholder: {
+      type: String,
+      default: '请选择省市区'
+    },
+    // small lage 输入框大小
+    size: {
+      type: String,
+      default: undefined
+    },
+    // 类型 simple / undefined
+    // simple 就是用的 cascader  不穿就是用的 自己封装的
+    type: {
+      type: String,
+      default: undefined
+    },
+    // 框的样式
+    inputStyle: {
+      type: Object,
+      default: () => {
+      }
+    },
+    // 下拉框的样式
+    dropdownStyle: {
+      type: Object,
+      default: () => {
+        return {
+          width: '35rem',
+          padding: '1%'
+        }
+      }
+    },
+    // 标签的样式
+    tagStyle: {
+      type: Object,
+      default: () => {
+        return {
+          fontSize: '0.88rem',
+          width: '23%',
+          textAlign: 'left',
+          margin: '0.5%',
+          cursor: 'pointer'
+        }
+      }
+    },
+    // 用于v-model 绑定
+    value: {
+      type: String,
+      default: undefined
+    },
+    // 用于仅用于展示
+    defaultValue: {
+      type: String,
+      default: undefined
+    },
+    // 用于v-model 绑定 code :最后一级的code  address: 所有级拼接的地址
+    valueType: {
+      type: String,
+      default: 'code'
+    }
+  },
+  watch: {
+    value () {
+      if (!this.value && this.valueView) {
+        /// 兼容外层重置方法
+        this.model = [
+          { name: '', code: '' },
+          { name: '', code: '' },
+          { name: '', code: '' },
+          { name: '', code: '' },
+          { name: '', code: '' }
+        ]
+        this.getResultText(this.contexts)
+      }
+    }
+  },
+  methods: {
+    setValue (code, tree) {
+      const findNode = (code, tree) => {
+        for (let i = 0; i < tree.length; i++) {
+          if (tree[i].code === code) {
+            return tree[i]
+          } else if (tree[i].children && tree[i].children.length > 0) {
+            const node = findNode(code, tree[i].children)
+            if (node) {
+              return node
+            }
+          }
+        }
+      }
+
+      const findParent = (code, tree, parent = null) => {
+        for (let i = 0; i < tree.length; i++) {
+          if (tree[i].code === code) {
+            return parent
+          } else if (tree[i].children && tree[i].children.length > 0) {
+            const node = findParent(code, tree[i].children, tree[i])
+            if (node) {
+              return node
+            }
+          }
+        }
+      }
+
+      const node = findNode(code, tree)
+      if (node) {
+        this.model[this.contexts - 1].name = node.name
+        this.model[this.contexts - 1].code = node.code
+        let parent = findParent(code, tree)
+        for (let i = this.contexts - 2; i >= 0; i--) {
+          this.model[i].name = parent ? parent.name : null
+          this.model[i].code = parent ? parent.code : null
+          if (i < this.contexts - 1 && parent) {
+            parent = findParent(parent.code, tree)
+          }
+        }
+        this.getResultText(this.contexts)
+      }
+    },
+    tagClick (e, item) {
+      if (e === '省/直辖市') {
+        // 如果是同一个标签
+        if (this.model[0].name !== item.name) {
+          this.tagData.cityData = item.children
+          this.tagData.areaData = []
+          this.tagData.streetData = []
+          this.model[0].name = item.name
+          this.model[0].code = item.code
+          this.model[1] = { name: '', code: '' }
+          this.model[2] = { name: '', code: '' }
+          this.model[3] = { name: '', code: '' }
+        }
+        if (this.contexts !== 1) {
+          this.activeKey = '市'
+        }
+        this.getResultText(1)
+      } else if (e === '市') {
+        if (this.model[1].name !== item.name) {
+          this.tagData.areaData = item.children
+          this.tagData.streetData = []
+          this.model[1].name = item.name
+          this.model[1].code = item.code
+          this.model[2] = { name: '', code: '' }
+          this.model[3] = { name: '', code: '' }
+        }
+        if (this.contexts !== 2) {
+          this.activeKey = '区'
+        }
+        this.getResultText(2)
+      } else if (e === '区') {
+        if (this.model[2].name !== item.name) {
+          this.tagData.streetData = item.children || []
+          this.model[2].name = item.name
+          this.model[2].code = item.code
+          this.model[3] = { name: '', code: '' }
+        }
+        if (this.contexts !== 3) {
+          this.activeKey = '街道'
+        }
+        this.getResultText(3)
+      } else if (e === '街道') {
+        if (this.model[3].name !== item.name) {
+          this.tagData.communityData = item.children || []
+          this.model[3].name = item.name
+          this.model[3].code = item.code
+
+          this.model[4] = { name: '', code: '' }
+        }
+        if (this.contexts !== 4) {
+          this.activeKey = '小区'
+        }
+        this.getResultText(4)
+      } else if (e === '小区') {
+        if (this.model[4].name !== item.name) {
+          this.model[4].name = item.name
+          this.model[4].code = item.code
+        }
+        this.getResultText(5)
+      }
+    },
+    getResultText (tag) {
+      const address = []
+      let code = ''
+      for (let i = 0; i < this.contexts; i++) {
+        if (this.model[i].name && this.model[i].name !== '') {
+          address.push(this.model[i].name)
+        }
+        code = this.model[i].code ?? ''
+      }
+      this.valueView = address.length === 0 ? undefined : address.join('')
+      if (tag === this.contexts) {
+        this.$refs.select.blur()
+        // this.$emit('onChange', this.valueType === 'address' ? address.join('') : code)
+        this.$emit('onChange', code)
+      }
+    },
+    // 失去焦点回调
+    selectBlurHandle () {
+      console.log(this.model[this.contexts - 1])
+      if (!this.model[this.contexts - 1].code || this.model[this.contexts - 1].code === '') {
+        this.valueView = undefined
+      }
+    }
+  }
+}
+</script>

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

@@ -13,7 +13,7 @@
           v-for="(item, index) in realJsonData"
           :key="index"
           :attr="item"
-          :disabled="itemDisabled(item)"
+          :disabled="itemDisabled(item) || readonly(item)"
           :files="files"
           :form="form"
           :images="images"
@@ -62,7 +62,9 @@
         </a-card>
       </a-row>
     </a-form-model>
-    <a-button v-if="showSubmitBtn" :loading="loading" type="primary" @click="onSubmit()">提交</a-button>
+    <a-row type="flex" justify="end">
+      <a-button v-if="showSubmitBtn" :loading="loading" type="primary" @click="onSubmit()">提交</a-button>
+    </a-row>
   </div>
 </template>
 <script>
@@ -164,8 +166,8 @@ export default {
     formItemLayout () {
       return this.layout === 'horizontal'
         ? {
-          labelCol: { span: 4 },
-          wrapperCol: { span: 15 },
+          labelCol: { span: 4, offset: 2 },
+          wrapperCol: { span: 14 },
         }
         : {}
     },
@@ -235,7 +237,9 @@ export default {
       this.loaded = true
     },
     setFormProps (formData, item, groupItem) {
-      formData[item.model] = undefined
+      if (!formData[item.model]) {
+        formData[item.model] = undefined
+      }
       // 处理表单校验情况
       if (item.rule) {
         if (groupItem) {
@@ -340,6 +344,9 @@ export default {
       return (this.businessType === '新增' && value.addOrEdit === 'edit') ||
         (this.businessType === '修改' && value.addOrEdit === 'add')
     },
+    readonly (value) {
+      return value.addOrEdit === 'readonly'
+    },
     async onSubmit () {
       this.$refs.selectForm.validate(async valid => {
         // 验证未通过直接返回

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

@@ -1,24 +1,15 @@
 <template>
-  <div v-show="visible && realJsonData.length > 0" class="table-page-search-wrapper">
-    <a-form-model
-      v-if="loaded"
-      ref="form"
-      :model="form"
-      :rules="rules"
-      layout="inline">
-      <a-row :gutter="24">
-        <x-form-item
-          v-for="(item, index) in realJsonData.slice(0,7)"
-          :key="index"
-          :attr="item"
-          :form="form"
-          :service-name="serviceName"
-          :get-data-params="getDataParams"
-          :env="env"
-        />
-        <div v-for="(groupItem, groupIndex) in groupJsonData" :key="'group-' + groupIndex">
+  <div :style="{marginBottom: !visible ? '12px':''}">
+    <div v-show="visible && realJsonData.length > 0" class="table-page-search-wrapper">
+      <a-form-model
+        v-if="loaded"
+        ref="form"
+        :model="form"
+        :rules="rules"
+        layout="inline">
+        <a-row :gutter="24">
           <x-form-item
-            v-for="(item, index) in groupItem.groupItems"
+            v-for="(item, index) in realJsonData.slice(0,7)"
             :key="index"
             :attr="item"
             :form="form"
@@ -26,42 +17,53 @@
             :get-data-params="getDataParams"
             :env="env"
           />
-        </div>
-        <div v-show="advanced">
-          <x-form-item
-            v-for="(item, index) in realJsonData.slice(7)"
-            :key="'advanced'+index"
-            :attr="item"
-            :form="form"
-            :service-name="serviceName"
-            :get-data-params="getDataParams"
-            :env="env"
-          />
-        </div>
-        <a-col>
-          <span
-            :style="advanced && { float: 'right', overflow: 'hidden' } || {} "
-            class="table-page-search-submitButtons">
-            <template v-if="realJsonData.length >7">
-              <a @click="toggleAdvanced">
-                <span v-show="!advanced"><a-icon type="eye" :style="iconStyle"/>&nbsp;更多条件</span>
-                <span v-show="advanced"><a-icon type="eye-invisible" :style="iconStyle"/>&nbsp;收起更多</span>
-              </a>
-              <a-divider type="vertical"/>
-            </template>
-            <a-button
-              htmlType="submit"
-              type="primary"
-              @click="onSubmit">
-              <a-icon :style="iconStyle" type="search"/>查询
-            </a-button>
-            <a-button style="margin-left: 8px" @click="resetForm">重置</a-button>
-            <slot></slot>
-          </span>
-        </a-col>
-      </a-row>
-    </a-form-model>
-    <div class="next-divider-dashed" role="separator"></div>
+          <div v-for="(groupItem, groupIndex) in groupJsonData" :key="'group-' + groupIndex">
+            <x-form-item
+              v-for="(item, index) in groupItem.groupItems"
+              :key="index"
+              :attr="item"
+              :form="form"
+              :service-name="serviceName"
+              :get-data-params="getDataParams"
+              :env="env"
+            />
+          </div>
+          <div v-show="advanced">
+            <x-form-item
+              v-for="(item, index) in realJsonData.slice(7)"
+              :key="'advanced'+index"
+              :attr="item"
+              :form="form"
+              :service-name="serviceName"
+              :get-data-params="getDataParams"
+              :env="env"
+            />
+          </div>
+          <a-col>
+            <span
+              :style="advanced && { float: 'right', overflow: 'hidden' } || {} "
+              class="table-page-search-submitButtons">
+              <template v-if="realJsonData.length >7">
+                <a @click="toggleAdvanced">
+                  <span v-show="!advanced"><a-icon type="eye" :style="iconStyle"/>&nbsp;更多条件</span>
+                  <span v-show="advanced"><a-icon type="eye-invisible" :style="iconStyle"/>&nbsp;收起更多</span>
+                </a>
+                <a-divider type="vertical"/>
+              </template>
+              <a-button
+                htmlType="submit"
+                type="primary"
+                @click="onSubmit">
+                <a-icon :style="iconStyle" type="search"/>查询
+              </a-button>
+              <a-button style="margin-left: 8px" @click="resetForm">重置</a-button>
+              <slot></slot>
+            </span>
+          </a-col>
+        </a-row>
+      </a-form-model>
+      <div class="next-divider-dashed" role="separator"></div>
+    </div>
   </div>
 </template>
 <script>

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

@@ -306,6 +306,7 @@
     v-else-if="attr.type === 'treeSelect'"
     :flex="attr.flex">
     <x-tree-select
+      v-model="form[attr.model]"
       ref="xTreeSelect">
     </x-tree-select>
   </x-form-col>
@@ -421,9 +422,9 @@ export default {
         const value = newVal[this.attr.model]
         const isEmpty = !value || !value.toString()
         // 查询表单点击重置按钮时清空树形选择框选中状态
-        if (this.$refs.XTreeSelect && this.attr.type === 'treeSelect' && isEmpty) {
-          this.$refs.xTreeSelect.setValue(undefined)
-        }
+        // if (this.$refs.xTreeSelect && this.attr.type === 'treeSelect' && isEmpty) {
+        //   this.$refs.xTreeSelect.setValue(undefined)
+        // }
       },
       deep: true
     }

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

@@ -4,7 +4,7 @@
       <!-- 树形选择框 -->
       <a-form-model-item v-if="loaded" :ref="model" :label="name" :prop="model">
         <a-tree-select
-          v-model="value"
+          v-model="localValue"
           :disabled="disabled"
           :tree-data="getTreeData()"
           :tree-checkable="mode === '查询' && queryType !== 'RIGHT_LIKE'"
@@ -29,6 +29,21 @@ import XFormCol from '@vue2-client/base-client/components/common/XFormCol'
 export default {
   name: 'XTreeSelect',
   components: { XFormCol },
+  model: {
+    prop: 'value',
+    event: 'onChange'
+  },
+  props: ['value'],
+  watch: {
+    value (newVal) {
+      if (newVal.length && !newVal[0]) {
+        this.localValue = undefined
+      }
+      if (!newVal) {
+        this.localValue = undefined
+      }
+    },
+  },
   data () {
     return {
       // 内容加载是否完成
@@ -47,8 +62,7 @@ export default {
       mode: '查询',
       // 是否禁用
       disabled: false,
-      // 选中值
-      value: undefined
+      localValue: this.value
     }
   },
   methods: {
@@ -107,7 +121,8 @@ export default {
           label = node.label + '.' + label
           node = node.$parent
         }
-        this.form[this.model] = label
+        // this.form[this.model] = label
+        this.$emit('onChange', label)
       } else {
         // 如果选中值含'-'，代表是由多个数据源组成的树，需要重新组织查询或新增/编辑时的表单
         if ((value instanceof Array && value.length > 0 && value[0].indexOf('-') !== -1) || (typeof value === 'string' && value.indexOf('-') !== -1)) {
@@ -137,11 +152,13 @@ export default {
             treeDatas[name] = values
           }
           // 移除默认的表单项，将组织好后的表单项合并进表单
-          this.form[this.model] = undefined
-          Object.assign(this.form, treeDatas)
+          // this.form[this.model] = undefined
+          // Object.assign(this.form, treeDatas)
+          this.$emit('onChange', treeDatas)
         } else {
           // 从单一数据源组成的树可以直接赋值
-          this.form[this.model] = value
+          // this.form[this.model] = value
+          this.$emit('onChange', value)
         }
       }
     },

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

@@ -1,6 +1,6 @@
 <template>
-  <a-row type="flex" :gutter="48">
-    <a-col :span="6" v-if="xTreeConfigName">
+  <a-row type="flex" :gutter="16">
+    <a-col :span="6" v-if="xTreeConfigName" :style="{ maxWidth: '300px' }">
       <x-tree
         :config-name="xTreeConfigName"
         :env="env"
@@ -9,7 +9,7 @@
         ref="xtree"
       ></x-tree>
     </a-col>
-    <a-col :span="xTreeConfigName?18:24">
+    <a-col :span="xTreeConfigName ? 18 : 24" :style="{ flex: xTreeConfigName ? '1' : 'none' }">
       <a-skeleton :loading="loading" :paragraph="{ rows: 4 }"/>
       <div v-show="!loading">
         <template v-if="!loadError">
@@ -31,7 +31,6 @@
           </div>
           <x-form
             ref="xForm"
-            style="margin-bottom: 14px;"
             @onSubmit="onSearchSubmit">
             <slot name="formBtnExpand"></slot>
           </x-form>

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

@@ -173,16 +173,20 @@ defineExpose({
           <span>{{ config.title }}</span>
         </a-col>
       </a-row>
-      <a-input-search
-        v-if="config.search"
-        style="margin-bottom: 8px"
-        placeholder="请输入搜索关键字"
-        @change="onChange"/>
+      <a-row v-if="config.search">
+        <div class="content-search">
+          <a-input
+            placeholder="请输入搜索关键字"
+            @change="onChange">
+            <a-icon slot="prefix" type="search"/>
+          </a-input>
+        </div>
+      </a-row>
     </div>
     <div
       class="tree_main"
       :style="{
-        maxHeight:config.search?'calc(100vh - 200px - 5rem)':'calc(100vh - 200px - 3rem)'
+        maxHeight:config.search?'calc(100vh - 200px - 5.6rem)':'calc(100vh - 200px - 3rem)'
       }">
       <a-spin :spinning="spinning">
         <a-tree
@@ -221,10 +225,22 @@ defineExpose({
 .tree_title {
   background-color: #E0E5EB;
   border-radius: 8px 8px 0 0;
+
+  .content-search {
+    background-color: rgb(224, 229, 235);
+    height: 2.6rem;
+    padding: 0 10px;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    border-top: 1px solid rgba(0, 0, 0, 0.05);
+    margin: auto 0;
+  }
 }
 
 .tree_main {
-  width: 97%;
+  margin-top: 1rem;
+  width: 100%;
   display: inline-block;
   overflow-y: auto;
 
@@ -288,7 +304,7 @@ defineExpose({
   }
 
   :deep(.ant-tree li) {
-    padding-left: 4px;
+    padding-left: 2px;
   }
 
   :deep(.ant-tree ul) {