vue2-client 1.8.302 → 1.8.303

package/.env

@@ -14,6 +14,6 @@ VUE_APP_SINGLEVALUE_KEY=admin.singlevalue
 VUE_APP_DIVISIONSOHCHINA=admin.divisionsohchina
 VUE_APP_WEB_CONFIG_KEY=admin.webconfig
 VUE_APP_API_BASE_URL=http://123.60.214.109:8405
-VUE_APP_SYSTEM_NAME=af-revenue
+VUE_APP_SYSTEM_NAME=af-system
 VUE_APP_LOGIN_VERSION=V4
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vue2-client",
-  "version": "1.8.302",
+  "version": "1.8.303",
   "private": false,
   "scripts": {
     "serve": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service serve --no-eslint",
@@ -52,6 +52,7 @@
     "vue-video-player": "^5.0.2",
     "vue-virtual-scroller": "^1.1.2",
     "vuedraggable": "^2.24.3",
+    "vue-draggable-resizable": "^2",
     "vuex": "^3.6.2",
     "xlsx": "0.18.5"
   },

package/src/base-client/components/common/XDescriptions/XDescriptionsGroup.vue

@@ -14,9 +14,9 @@
     <a-col :span="showLeftTab ? 20 : 24" ref="descriptionsGroupContext" class="descriptionsGroupContext">
       <div
         class="descriptions-item"
-        :ref="`descriptions-item-${index}`"
-        :key="index"
-        v-for="(realDataItem, index) in realData">
+        :ref="`descriptions-item-${realDataIndex}`"
+        :key="realDataIndex"
+        v-for="(realDataItem, realDataIndex) in realData">
         <template v-if="!loadError">
           <!--    带有子的详情      -->
           <template

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

@@ -750,6 +750,15 @@ export default {
             }
           }
         }
+      } else {
+        this.attr.flex = {
+          xs: 24,
+          sm: 24,
+          md: 24,
+          lg: 12,
+          xl: 8,
+          xxl: 8
+        }
       }
       if (this.attr.keyName && this.attr.keyName.indexOf('logic@') !== -1) {
         this.getData({}, res => this.getDataCallback(res))

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

@@ -31,6 +31,7 @@ export default {
     prop: 'value',
     event: 'onChange'
   },
+  // eslint-disable-next-line vue/require-prop-types
   props: ['value', 'attr'],
   watch: {
     value (newVal) {

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

@@ -1,15 +1,28 @@
 <template>
-  <a-row type="flex" :gutter="16">
-    <a-col :span="6" v-if="xTreeConfigName" :style="{ maxWidth: '300px' }">
+  <a-row type="flex" :gutter="{ xs: 8, sm: 10, md: 12, lg: 16 }">
+    <a-col
+      :xs="14"
+      :sm="14"
+      :md="12"
+      :lg="9"
+      :xl="6"
+      v-if="xTreeConfigName"
+      :style="{ maxWidth: '450px'}">
       <x-tree
         :config-name="xTreeConfigName"
         :env="env"
         @action="action"
+        @btnFuncClick="treeBtnFuncClick"
         @treeOnChecked="treeOnChecked"
         ref="xtree"
       ></x-tree>
     </a-col>
-    <a-col :span="xTreeConfigName ? 18 : 24" :style="{ flex: xTreeConfigName ? '1' : 'none' }">
+    <a-col
+      :xs="xTreeConfigName ? 10 : 24"
+      :sm="xTreeConfigName ? 10 : 24"
+      :md="xTreeConfigName ? 12 : 24"
+      :lg="xTreeConfigName ? 15 : 24"
+      :xl="xTreeConfigName ? 18 : 24">
       <a-skeleton :loading="loading" :paragraph="{ rows: 4 }"/>
       <a-row style="height: 12px" v-if="xTreeConfigName"></a-row>
       <div v-show="!loading">
@@ -385,6 +398,9 @@ export default {
     treeOnChecked (checkedKeys, deepNodes, deepKeys) {
       this.$emit('treeOnChecked', checkedKeys, deepNodes, deepKeys)
     },
+    treeBtnFuncClick (index, func) {
+      this.$emit('treeBtnFuncClick', index, func)
+    },
     /**
      * 新增按钮事件
      */

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

@@ -95,8 +95,8 @@
               </a>
               <a-menu slot="overlay" style="min-width: 60px">
                 <a-menu-item
-                  v-for="(action_item, index) in item.actionArr"
-                  :key="index"
+                  v-for="(action_item, actionIndex) in item.actionArr"
+                  :key="actionIndex"
                   v-if="!action_item.customFunction || executeStrFunction( action_item.customFunction,[record,index])">
                   <a
                     style="text-align: center"

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

@@ -1,6 +1,6 @@
 <script setup>
 import { getConfigByName, runLogic } from '@vue2-client/services/api/common'
-import { reactive, ref, watch, defineExpose } from 'vue'
+import { reactive, ref, watch, defineExpose, nextTick } from 'vue'
 import executeStrFunction from '@vue2-client/utils/runEvalFunction'
 import debounce from 'lodash.debounce'
 
@@ -17,6 +17,12 @@ const _treeData = ref([])
 const filteredTreeData = ref([])
 // 定义最深一层的 数据
 const deepestNodes = ref([])
+// 定义激活的按钮
+const activeButtonIndex = ref({})
+// 是否全选
+const checkall = ref(false)
+// 选了但没有全选
+const indeterminate = ref(false)
 // 替换字段
 let _replaceFields = reactive({ children: 'children', title: 'title', key: 'key' })
 // 暂存查询信息
@@ -43,6 +49,24 @@ const props = defineProps({
     default: () => ({ children: 'children', title: 'title', key: 'key' })
   }
 })
+// maxHeight:config.search?'calc(100vh - 200px - 5.6rem)':
+// 定义一个计算属性
+function heightStore () {
+  if (config.search) {
+    if (config.tabBtn && config.tabBtn.length > 0) {
+      return ['7rem', 'calc(100vh - 200px - 7.6rem)']
+    } else {
+      return ['5rem', 'calc(100vh - 200px - 5.6rem)']
+    }
+  } else {
+    if (config.tabBtn && config.tabBtn.length > 0) {
+      return ['5rem', 'calc(100vh - 200px - 5rem)']
+    } else {
+      return ['3rem', 'calc(100vh - 200px - 3rem)']
+    }
+  }
+}
+
 // 监听 checkbox 选中 的变化
 watch(checkedKeys, (checkedKeys) => {
   // 筛选出最底层的数据 返回
@@ -55,6 +79,14 @@ watch(checkedKeys, (checkedKeys) => {
       deepKeys.push(node[_replaceFields.key])
     }
   })
+  nextTick(() => {
+    if (deepNodes.length === 0) {
+      checkall.value = false
+      indeterminate.value = false
+    } else {
+      indeterminate.value = !checkall.value
+    }
+  })
   emit('treeOnChecked', checkedKeys, deepNodes, deepKeys)
 }, { immediate: true })
 //
@@ -91,12 +123,11 @@ function onSelect (keys, e) {
 async function getData (param = {}) {
   spinning.value = true
   const currentUser = JSON.parse(localStorage.getItem(process.env.VUE_APP_USER_KEY))
-  searchInfo.value = Object.assign(param, {
+  await runLogic(config.treeData.substring(6), Object.assign(param, {
     orgId: currentUser.orgid,
     userId: currentUser.id,
     depId: currentUser.f_department_id
-  })
-  await runLogic(config.treeData.substring(6), searchInfo.value, config.serviceName, props.env === 'dev').then(res => {
+  }), config.serviceName, props.env === 'dev').then(res => {
     _treeData.value = res
     deepestNodes.value = getDeepestNodes(_treeData.value)
     spinning.value = false
@@ -168,8 +199,35 @@ function getDeepestNodes (treeData) {
   return deepestNodes
 }
 
-function getPopupContainer (trigger) {
-  return trigger.parentElement
+function onCheckAllChange (e) {
+  checkedKeys.value = e.target.checked ? deepestNodes.value.map(node => node[_replaceFields.key]).filter(item => item !== 'noCatch') : []
+  nextTick(() => {
+    checkall.value = e.target.checked
+    indeterminate.value = false
+  })
+}
+
+async function btnFuncClick (index) {
+  activeButtonIndex.value = Object.assign({}, activeButtonIndex.value, { [index]: !!!activeButtonIndex.value[index] })
+  // 组织参数
+  // 把activeButtonIndex.value groupType 相同的其他值改成 false
+  Object.keys(activeButtonIndex.value).forEach((key) => {
+    if (key != index && config.tabBtn[key].groupType === config.tabBtn[index].groupType) {
+      activeButtonIndex.value[key] = false
+    }
+  })
+  const param = {}
+  // 循环执行已经激活的自定义方法
+  Object.keys(activeButtonIndex.value).forEach((key) => {
+    if (activeButtonIndex.value[key]) {
+      const item = config.tabBtn[key]
+      if (item.customFunction) {
+       Object.assign(param, executeStrFunction(item.customFunction, [param]))
+      }
+    }
+  })
+  // 获取到 param 执行 getData
+ await getData(param)
 }
 
 // 使用 defineExpose 暴露方法
@@ -181,7 +239,7 @@ defineExpose({
 
 <template>
   <div id="XTreeWarp">
-    <div class="tree_title" :style="{height:config.search?'5rem':'3rem'}" v-if="config.title">
+    <div class="tree_title" v-if="config.title">
       <a-row style="font-size: medium;line-height: 3rem">
         <a-col :offset="2">
           <span>{{ config.title }}</span>
@@ -189,6 +247,13 @@ defineExpose({
       </a-row>
       <a-row v-if="config.search">
         <div class="content-search">
+          <a-checkbox
+            class="checkbox"
+            :indeterminate="indeterminate"
+            :checked="checkall"
+            @change="onCheckAllChange">
+          </a-checkbox>
+          &nbsp;
           <a-input
             placeholder="请输入搜索关键字"
             @change="onChange">
@@ -197,10 +262,22 @@ defineExpose({
         </div>
       </a-row>
     </div>
+    <a-row v-if="config.tabBtn && config.tabBtn.length > 0">
+      <div class="content-search" style="padding-top:7px;padding-left: 10px">
+        <a-space>
+          <a-button
+            v-for="(item,index) in config.tabBtn"
+            @click="btnFuncClick(index,item.customFunction)"
+            :class="{ 'active-button': activeButtonIndex[index] }"
+            :key="index">{{ item.name }}
+          </a-button>
+        </a-space>
+      </div>
+    </a-row>
     <div
       class="tree_main"
       :style="{
-        maxHeight:config.search?'calc(100vh - 200px - 5.6rem)':'calc(100vh - 200px - 3rem)'
+        maxHeight:heightStore()[1]
       }">
       <a-spin :spinning="spinning">
         <a-tree
@@ -216,12 +293,12 @@ defineExpose({
         >
           <template slot="title" slot-scope="item">
             <span @click="nodeItemClick(item)">
-              <a-tooltip placement="right" :title="item[_replaceFields.title]" :get-popup-container="getPopupContainer">
+              <a-tooltip placement="right" :title="item[_replaceFields.title]">
                 {{
                   item.dataRef[replaceFields.children] && item.dataRef[replaceFields.children].length > 0 ?
                     item[_replaceFields.title]
                     : config.deepNodeMaxWidth && item[_replaceFields.title].length > config.deepNodeMaxWidth ? item[_replaceFields.title].substring(0, config.deepNodeMaxWidth) + '...' : item[_replaceFields.title]
-                }}{{ item.hasOwnProperty('count')?' ('+item.count+')':'' }}
+                }}{{ item.hasOwnProperty('count') ? ' (' + item.count + ')' : '' }}
               </a-tooltip>
             </span>
             <a-space style="float:right;margin-right: .2rem">
@@ -257,12 +334,21 @@ defineExpose({
   }
 }
 
+.active-button {
+  border-color: @primary-color !important;
+  color: @primary-color !important;
+}
+
+.ant-btn:focus {
+  color: rgba(0, 0, 0, 0.65);
+  background-color: #fff;
+  border-color: #d9d9d9
+}
+
 .tree_main {
-  margin-top: 1rem;
   width: 100%;
   display: inline-block;
   overflow-y: auto;
-
   //:deep(.ant-tree-child-tree){
   //  .ant-space-item {
   //    display: none;

package/src/pages/Example/index.vue

@@ -1,425 +1,33 @@
 <template>
-  <a-card :bordered="false" :bodyStyle="{paddingLeft:0,paddingTop:0,borderRadius:'8px'}">
-    <x-form-table
-      title="地址管理"
-      :queryParamsName="queryParamsName"
-      :x-tree-config-name="xTreeConfigName"
-      serviceName="af-revenue"
-      @addArea="addArea"
-      @editArea="editArea"
-      @delArea="delArea"
-      @addAddress="addAddress"
-      @editAddress="editAddress"
-      @delAddress="delAddress"
-      @treeOnChecked="treeOnChecked"
-      :fixedQueryForm="fixedQueryForm"
-      ref="xformtable"
-      @action="toDetail">
-      <template slot="button" slot-scope="{selectedRowKeys, selectedRows}">
-        <a-button v-if="selectedRowKeys.length > 0 " type="primary" @click="asigAddress(selectedRowKeys, selectedRows)">
-          地址分配
-        </a-button>
-      </template>
-      <template #importExcelSlot>
-        <div style="margin-top: 8px">* 导入的内容必须放在第一个工作表中</div>
-        <div style="margin-top: 8px">* 导入的内容表头以及字段顺序必须和模板一致</div>
-        <div style="margin-top: 8px">* 当导入模板中地址编号字段不为空时，会根据地址编号更新地址信息</div>
-      </template>
-    </x-form-table>
-    <!--  新增小区  -->
-    <a-modal
-      v-model="addAreaFlag"
-      :footer="null"
-      :dialog-style="{ top: '5rem'}"
-      :z-index="1001"
-      :title="addAreaMsg"
-      :destroyOnClose="true">
-      <x-add-native-form ref="xForm" @onSubmit="addAreaSubmit"/>
-    </a-modal>
-    <!--  修改小区  -->
-    <a-modal
-      v-model="editAreaFlag"
-      :footer="null"
-      :dialog-style="{ top: '30px' }"
-      :z-index="1001"
-      :title="editAreaMsg"
-      :destroyOnClose="true">
-      <x-add-native-form ref="xEditForm" @onSubmit="editAreaSubmit"/>
-    </a-modal>
-    <!--  添加地址  -->
-    <a-modal
-      v-model="addAddressFlag"
-      :dialog-style="{ top: '30px' }"
-      :z-index="1001"
-      @ok="addressSubmit"
-      @cancel="addAddressFlag=false"
-      :title="addAddressMsg"
-      :destroyOnClose="true">
-      <a-form-model :model="form" :label-col="labelCol" :wrapper-col="wrapperCol">
-        <a-form-model-item label="旧地址" v-if="form.old_address">
-          <a-input :value="form.old_address" readonly disabled/>
-        </a-form-model-item>
-        <a-form-model-item label="地址类型">
-          <a-radio-group v-model="form.f_address_type">
-            <a-radio :value="item.value" v-for="(item, index) in addressModel" :key="index">
-              {{ item.label }}
-            </a-radio>
-          </a-radio-group>
-        </a-form-model-item>
-        <a-form-model-item label="详细地址">
-          <div v-for="(item, index) in formItems" :key="index" style="display: inline;white-space: nowrap">
-            <a-input v-model="addressData[item.value]" style="display: inline;" :style="{width:inputWidth}"/>
-            <span>{{ item.label }}</span>
-          </div>
-        </a-form-model-item>
-      </a-form-model>
-    </a-modal>
-    <!--  地址分配  -->
-    <a-modal
-      v-model="asigAddressFlag"
-      :dialog-style="{ top: '30px' }"
-      :z-index="1001"
-      @ok="asigAddressSubmit"
-      @cancel="asigAddressFlag=false"
-      :title="asigAddressMsg"
-      :destroyOnClose="true">
-      <a-form-model :model="asigAddressModel" :label-col="labelCol" :wrapper-col="wrapperCol">
-        <a-form-model-item label="选择小区">
-          <CitySelect v-model="asigAddressModel.f_residential_area_id" :contexts="5"></CitySelect>
-        </a-form-model-item>
-      </a-form-model>
-    </a-modal>
-  </a-card>
+  <div id="test">
+    <!--  修改 import 路径展示不同的组件 Demo  -->
+    <demo></demo>
+  </div>
 </template>
 
 <script>
-import XFormTable from '@vue2-client/base-client/components/common/XFormTable/XFormTable'
-import FilePreview from '@vue2-client/components/FilePreview'
-import XAddNativeForm from '@vue2-client/base-client/components/common/XAddNativeForm/XAddNativeForm.vue'
-import CitySelect from '@vue2-client/base-client/components/common/CitySelect'
-import { getConfigByName, runLogic } from '@vue2-client/services/api/common'
-import { getRealKeyData } from '@vue2-client/utils/formatter'
-import { mapState } from 'vuex'
+import XReport from '@vue2-client/base-client/components/common/XReport'
+// import Demo from '@vue2-client/base-client/components/common/XFormGroup/demo.vue'
+// import Demo from '@vue2-client/base-client/components/common/XDescriptions/demo.vue'
+// import Demo from '@vue2-client/base-client/components/common/AddressSearchCombobox/demo.vue'
+import Demo from '@vue2-client/base-client/components/common/XFormTable/demo.vue'
 
 export default {
-  name: 'AddressManage',
+  name: 'Example',
   components: {
-    XAddNativeForm,
-    FilePreview,
-    CitySelect,
-    XFormTable
+    Demo,
+    XReport
+  },
+  mounted () {
   },
   data () {
     return {
-      // 选中的编号
-      selectNo: undefined,
-      // 查询配置文件名
-      queryParamsName: 'address_management',
-      // 查询配置左侧tree
-      xTreeConfigName: 'addressType',
-      // 是否显示详情抽屉
-      detailVisible: false,
-      // 添加小区 flag
-      addAreaFlag: false,
-      addAreaMsg: '',
-      // 修改小区 flag
-      editAreaFlag: false,
-      editAreaMsg: '',
-      // 添加地址 flag
-      addAddressFlag: false,
-      addAddressMsg: '',
-      // 地址分配 flag
-      asigAddressFlag: false,
-      asigAddressMsg: '',
-      asigAddressModel: {},
-      labelCol: { span: 4 },
-      wrapperCol: { span: 20 },
-      fixedQueryForm: {},
-      // 列表选中的数据
-      // eslint-disable-next-line vue/no-reserved-keys
-      _selectedRowKeys: [],
-      addressModel: [
-        {
-          expression: '{f_building}楼号{f_unit}单元{f_floor}楼层{f_room}门牌号',
-          label: '城市',
-          value: '城市'
-        },
-        {
-          expression: '{f_building}组{f_unit}号',
-          label: '乡镇',
-          value: '乡镇'
-        },
-        {
-          expression: '{f_address}',
-          label: '自定义',
-          value: '自定义'
-        }
-      ],
-      formItems: [],
-      form: {
-        f_address_type: '',
-        f_iscity: ''
-      },
-      addressData: {}
-    }
-  },
-  watch: {
-    'form.f_address_type' (newVal, oldVal) {
-      this.onAddressTypeChange(newVal, oldVal)
     }
   },
-  computed: {
-    inputWidth () {
-      return this.formItems.length ? `${65 / this.formItems.length}%` : '75%'
-    },
-    ...mapState('account', { currUser: 'user' }),
-  },
   methods: {
-    asigAddress (selectedRowKeys, selectedRows) {
-      // 获取地址模式配置
-      this._selectedRowKeys = selectedRowKeys
-      this.asigAddressFlag = true
-      this.asigAddressMsg = `为 ${selectedRowKeys.length} 条地址信息重新分配小区`
-    },
-    asigAddressSubmit () {
-      if (this.asigAddressModel.f_residential_area_id) {
-        if (this.asigAddressModel.f_residential_area_id.indexOf('area') === -1) {
-          this.$message.error('请选择小区')
-          return
-        }
-      }
-      runLogic('asigAddres', {
-        selectedRowKeys: this._selectedRowKeys.join(','),
-        f_residential_area_id: this.asigAddressModel.f_residential_area_id.replace('area', '')
-      }, 'af-revenue').then(res => {
-        if (res) {
-          this.$message.success('分配成功')
-          this.asigAddressFlag = false
-          this.$refs.xformtable.refreshTable(true)
-        }
-      })
-    },
-    toDetail (record, id) {
-      this.selectNo = id + ''
-      this.detailVisible = true
-    },
-    // 选中左侧树查询逻辑
-    treeOnChecked (checkedKeys, deepNodes, deepKeys) {
-      if (deepKeys && deepKeys.length) {
-        this.fixedQueryForm.tua_f_residential_area_id = deepKeys.map(h => h.replace('area', ''))
-        this.$refs.xformtable.refreshTable(true)
-      } else {
-        this.fixedQueryForm = {}
-      }
-    },
-    delAddress (record, id) {
-      const that = this
-      if (record.tu_f_userinfo_code) {
-        this.$message.error('已关联用户禁止删除')
-        return
-      }
-      this.$confirm({
-        title: '确认要删除小区吗？',
-        content: '注意：删除数据后不可恢复。',
-        onOk () {
-          // 获取小区详情之后 通过配置文件获取表单 进行修改
-          runLogic('delAddress', { id: id }, 'af-revenue').then(res => {
-            that.$refs.xformtable.refreshTable(true)
-          })
-        },
-        onCancel () {
-        },
-      })
-    },
-    editAddress (record, a, b, c) {
-      getConfigByName('addressTypeDic', 'af-revenue', (res) => {
-        // 地址模式赋值
-        if (res.value?.length) {
-          this.addressModel = res.value
-        }
-        record = getRealKeyData(record)
-        // 赋值默认地址模式
-        record.old_address = record.f_address
-        this.form = Object.assign({}, record)
-        this.addressData = Object.assign({}, record)
-        if (!this.form.f_address_type) {
-          this.form.f_address_type = this.addressModel[0].value
-        }
-        // 根据小区信息赋值
-        this.addAddressFlag = true
-        this.addAddressMsg = '修改地址'
-      })
-    },
-    onAddressTypeChange (newVal, oldVal) {
-      console.log(newVal, oldVal)
-      const selectedModel = this.addressModel.find(item => item.value === this.form.f_address_type)
-      // 暂存 oldFormItems
-      const oldFormItems = this.formItems
-      if (selectedModel) {
-        const matches = selectedModel.expression.match(/{(.*?)}([^{}]*)(?={|$)/g)
-        this.formItems = matches.map(item => {
-          const value = item.match(/{(.*?)}/)[1]
-          const label = item.replace(/{.*?}/, '').trim()
-          return {
-            label: label || (value === 'f_address' ? '' : value), // 如果存在后面的文字，就使用后面的文字作为 label，否则使用原来的值
-            value: `${value}`
-          }
-        })
-        // 把 oldFormItems 存在， formitem 中不存在的赋值为 undefined
-        oldFormItems.forEach(item => {
-          if (!this.formItems.find(newItem => newItem.value === item.value)) {
-            this.addressData[item.value] = ''
-          }
-        })
-      }
-    },
-    generateAddressString () {
-      const selectedModel = this.addressModel.find(item => item.value === this.form.f_address_type)
-      if (selectedModel) {
-        let addressString = selectedModel.expression
-        this.formItems.forEach(item => {
-          const value = this.addressData[item.value]
-          addressString = addressString.replace(`{${item.value}}`, value)
-        })
-        return addressString
-      }
-      return ''
-    },
-    addressSubmit () {
-      runLogic('addAddress', Object.assign(this.form, this.addressData, {
-        f_address: this.generateAddressString()
-      }, {
-        orgid: this.currUser.orgid,
-      }), 'af-revenue').then(res => {
-        if (res) {
-          this.$message.success(`${this.addAddressMsg}成功`)
-          this.addAddressFlag = false
-          this.$refs.xformtable.refreshTable(true)
-        }
-      })
-    },
-    addAddress (record) {
-      // 获取地址模式配置
-      getConfigByName('addressTypeDic', 'af-revenue', (res) => {
-        // 地址模式赋值
-        if (res.value?.length) {
-          this.addressModel = res.value
-        }
-        // 赋值默认地址模式
-        this.form.f_address_type = this.addressModel[0].value
-        // 根据小区信息赋值
-        this.form.f_residential_area = record.name
-        this.form.f_residential_area_id = record.code.replace('area', '')
-        this.addAddressFlag = true
-        this.addAddressMsg = record.name + ' 添加地址'
-        this.onAddressTypeChange()
-      })
-    },
-    delArea (record) {
-      const that = this
-      this.$confirm({
-        title: '确认要删除小区吗？',
-        content: '注意：删除数据后不可恢复。',
-        onOk () {
-          // 获取小区详情之后 通过配置文件获取表单 进行修改
-          runLogic('delArea', { id: record.code.replace('area', '') }, 'af-revenue').then(res => {
-            that.$refs.xformtable.$refs.xtree.reLoad()
-          })
-        },
-        onCancel () {
-        },
-      })
-    },
-    editArea (record) {
-      this.editAreaFlag = true
-      this.editAreaMsg = record.describe + ' 修改小区'
-      // 获取小区详情之后 通过配置文件获取表单 进行修改
-      runLogic('getAreaMsg', { id: record.code.replace('area', '') }, 'af-revenue').then(areaRes => {
-        if (areaRes.length === 0) {
-          this.$message.error('获取小区信息失败')
-        } else {
-          console.log(areaRes)
-          if (!areaRes[0].f_pcd_id) {
-            areaRes[0].f_pcd_id = record.parentcode
-          }
-          getConfigByName('editAreaForm', 'af-revenue', (res) => {
-            this.$refs.xEditForm.init({
-              formItems: res.formJson,
-              title: '添加小区',
-              modifyModelData: {
-                data: areaRes[0]
-              },
-              fixedAddForm: {
-                id: areaRes[0].id
-              }
-            })
-          })
-        }
-      })
-    },
-    editAreaSubmit (areaMsg) {
-      runLogic('editArea', {
-        id: areaMsg.realForm.id,
-        residential_area: areaMsg.realForm.residential_area,
-        area_address: areaMsg.realForm.area_address,
-        linkname: areaMsg.realForm.linkname,
-        pcd_id: areaMsg.realForm.pcd_id,
-        comments: areaMsg.realForm.comments,
-        operatorid: areaMsg.currUserId,
-        operator: areaMsg.currUserName,
-        pcd: areaMsg.realForm.pcd,
-        orgid: areaMsg.orgId
-      }, 'af-revenue').then(
-        res => {
-          if (res) {
-            this.$message.success('修改成功')
-            this.editAreaFlag = false
-            this.$refs.xformtable.$refs.xtree.reLoad()
-          }
-        }
-      )
-    },
-    addArea (record) {
-      this.addAreaFlag = true
-      this.addAreaMsg = '添加小区'
-      getConfigByName('addAreaForm', 'af-revenue', (res) => {
-        this.$refs.xForm.init({
-          formItems: res.formJson,
-          title: '添加小区',
-          businessType: '新增',
-          fixedAddForm: {
-            f_pcd: record.describe,
-            f_pcd_id: record.code
-          }
-        })
-      })
-    },
-    addAreaSubmit (areaMsg) {
-      runLogic('addArea', {
-        residential_area: areaMsg.realForm.residential_area,
-        area_address: areaMsg.realForm.area_address,
-        linkname: areaMsg.realForm.linkname,
-        pcd_id: areaMsg.realForm.pcd_id,
-        comments: areaMsg.realForm.comments,
-        operatorid: areaMsg.currUserId,
-        operator: areaMsg.currUserName,
-        pcd: areaMsg.realForm.pcd,
-        orgid: areaMsg.orgId
-      }, 'af-revenue').then(
-        res => {
-          if (res) {
-            this.$message.success('添加成功')
-            this.addAreaFlag = false
-            this.$refs.xformtable.$refs.xtree.reLoad()
-          }
-        }
-      )
-    }
   }
 }
 </script>
 <style scoped>
-:deep(.ant-tree-node-selected) {
-  background-color: transparent !important;
-}
+
 </style>

package/src/theme/default/style.less

@@ -33,8 +33,8 @@
 
 // 美化滚动条
 ::-webkit-scrollbar{
-  width: 7px;
-  height: 7px;
+  width: 7px !important;
+  height: 7px !important;
 }
 
 ::-webkit-scrollbar-thumb {

package/src/theme/global.less

@@ -42,6 +42,7 @@ ol {
 .table-alert {
   margin-bottom: 16px;
 }
+
 // 数据列表 操作
 .table-operator {
   margin-bottom: 18px;
@@ -83,6 +84,7 @@ ol {
           white-space: pre;
         }
       }
+
       .ant-form-item-control {
         height: 32px;
         line-height: 32px;
@@ -108,6 +110,11 @@ ol {
   }
 }
 
+.ant-checkbox-inner, .ant-checkbox-input, .ant-checkbox {
+  width: 20px;
+  height: 20px;
+}
+
 .ant-layout-footer {
   display: none;
 }
@@ -116,11 +123,13 @@ ol {
   .ant-table {
     width: 100%;
     overflow-x: auto;
+
     &-thead > tr,
     &-tbody > tr {
       > th,
       > td {
         white-space: pre;
+
         > span {
           display: block;
         }