vue2-client 1.8.175 → 1.8.178

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vue2-client",
-  "version": "1.8.175",
+  "version": "1.8.178",
   "private": false,
   "scripts": {
     "serve": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service serve --no-eslint",
@@ -38,6 +38,7 @@
     "jspdf": "^2.5.1",
     "lodash.clonedeep": "^4.5.0",
     "lodash.get": "^4.4.2",
+    "lodash.debounce": "^4",
     "mockjs": "^1.1.0",
     "nprogress": "^0.2.0",
     "qs": "^6.11.2",

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

@@ -50,6 +50,10 @@
 </template>
 
 <script>
+import { mapState } from 'vuex'
+import { runLogic } from '@vue2-client/services/api/common'
+import { handleTree } from '@vue2-client/utils/util'
+
 const viewArr = [
   {
     key: '省/直辖市',
@@ -63,6 +67,9 @@ const viewArr = [
   }, {
     key: '街道',
     value: 'streetData',
+  }, {
+    key: '小区',
+    value: 'communityData',
   }
 ]
 export default {
@@ -78,6 +85,8 @@ export default {
         areaData: [],
         // 街道
         streetData: [],
+        // 小区
+        communityData: [],
       },
       // model: {
       //   provinceModel: { name: '', code: '' },
@@ -89,6 +98,7 @@ export default {
         { name: '', code: '' },
         { name: '', code: '' },
         { name: '', code: '' },
+        { name: '', code: '' },
         { name: '', code: '' }
       ],
       // 控制标签
@@ -99,21 +109,35 @@ export default {
       valueView: undefined
     }
   },
-  mounted () {
-    this.$appdata.getDivisionsOhChinaForTree().then(res => {
-      this.tagData.divisionsForTree = res
+  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: {},
+  computed: {
+    ...mapState('account', { currUser: 'user' })
+  },
   props: {
-    // 页面渲染内容  默认 省市区街道 四个 所以是4
+    // 页面渲染内容  默认 省市区街道 四个 所以是4  5 是到小区
     contexts: {
       type: Number,
-      default: 3
+      default: 4
     },
     placeholder: {
       type: String,
@@ -164,14 +188,75 @@ export default {
       type: String,
       default: undefined
     },
+    // 用于仅用于展示
+    defaultValue: {
+      type: String,
+      default: undefined
+    },
     // 用于v-model 绑定 code :最后一级的code  address: 所有级拼接的地址
     valueType: {
       type: String,
-      default: 'address'
+      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)
+      }
     }
   },
-  watch: {},
   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 === '省/直辖市') {
         // 如果是同一个标签
@@ -215,10 +300,22 @@ export default {
         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) {
@@ -230,14 +327,16 @@ export default {
         }
         code = this.model[i].code ?? ''
       }
-      this.valueView = this.valueType === 'address' ? address.join('/') : 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', 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
       }

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

@@ -5,8 +5,8 @@
       ref="selectForm"
       :zIndex="1001"
       :model="form"
-      :labelCol="{ span: 4 }"
-      :wrapperCol="{ span: 14 }"
+      v-bind="formItemLayout"
+      :layout="layout"
       :rules="rules">
       <a-row :gutter="16">
         <x-form-item
@@ -19,6 +19,7 @@
           :images="images"
           :service-name="serviceName"
           mode="新增/修改"
+          :layout="layout"
           :get-data-params="getDataParams"
           :env="env"
         />
@@ -118,7 +119,9 @@ export default {
       // 待修改的数据集
       modifyModelData: {},
       // 当前环境
-      env: 'prod'
+      env: 'prod',
+      // 表单模式 horizontal | vertical | inline
+      layout: 'horizontal'
     }
   },
   computed: {
@@ -158,6 +161,14 @@ export default {
         return item.addOrEdit === 'version'
       })
     },
+    formItemLayout () {
+      return this.layout === 'horizontal'
+        ? {
+          labelCol: { span: 4 },
+          wrapperCol: { span: 15 },
+        }
+        : {}
+    },
     ...mapState('account', { currUser: 'user' })
   },
   methods: {
@@ -166,9 +177,10 @@ export default {
         configName, configContent, formItems, viewMode, isHandleFormKey = true,
         showSubmitBtn = true, serviceName, isTableTemp = false, isKeyHandle = true,
         modifyModelData = {}, businessType, title, fixedAddForm = {}, getDataParams = {},
-        simpleFormJsonData = {}, env = 'prod'
+        simpleFormJsonData = {}, env = 'prod', layout = 'horizontal'
       } = params
       this.loaded = false
+      this.layout = layout
       this.configName = configName
       this.configContent = configContent
       if (typeof formItems === 'string') {
@@ -403,7 +415,9 @@ export default {
             businessType: this.businessType,
             serviceName: this.serviceName,
             realForm: realForm,
-            currUserName: this.currUser.name
+            currUserName: this.currUser.name,
+            currUserId: this.currUser.id,
+            orgId: this.currUser.orgid
           })
         } else {
           this.defaultSubmit(realForm)

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

@@ -277,7 +277,7 @@
     v-else-if="attr.type === 'citySelect'"
     :flex="attr.flex">
     <a-form-model-item :ref="attr.model" :label="attr.name" :prop="attr.prop ? attr.prop : attr.model">
-      <citySelect v-model="form[attr.model]" ></citySelect>
+      <citySelect ref="citySelect" v-model="form[attr.model]" :contexts="attr.contexts" :value-type="attr.valueType" :default-value="form[attr.model]"></citySelect>
     </a-form-model-item>
   </x-form-col>
   <!-- 地点搜索框 -->
@@ -393,6 +393,11 @@ export default {
       type: Object,
       default: undefined
     },
+    // 布局
+    layout: {
+      type: String,
+      default: 'horizontal'
+    },
     // 环境
     env: {
       type: String,
@@ -425,7 +430,7 @@ export default {
   },
   methods: {
     init () {
-      if (this.mode === '新增/修改' && !this.attr.flex) {
+      if (this.mode === '新增/修改' && !this.attr.flex && this.layout === 'horizontal') {
         this.attr.flex = {
           xs: 24,
           sm: 24,

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

@@ -1,70 +1,87 @@
 <template>
-  <div>
-    <a-skeleton :loading="loading" :paragraph="{ rows: 4 }" />
-    <div v-show="!loading">
-      <template v-if="!loadError">
-        <x-add-form
-          ref="xAddForm"
-          @afterSubmit="onAddOrEditSubmitAfterSubmit"
-        >
-          <template slot="groupFormItems" slot-scope="{form, model, rules, modifyModelData}">
-            <slot name="groupFormItems" :form="form" :model="model" :rules="rules" :modifyModelData="modifyModelData"></slot>
-          </template>
-        </x-add-form>
-        <div v-if="crudTitle" class="crud_title">
-          {{ crudTitle }}
-        </div>
-        <x-form
-          ref="xForm"
-          style="margin-bottom: 14px;"
-          @onSubmit="onSearchSubmit">
-          <slot name="formBtnExpand"></slot>
-        </x-form>
-        <x-table
-          ref="xTable"
-          :fixedQueryForm="fixedQueryForm"
-          :queryParamsName="queryParamsName"
-          :query-params-json="queryParamsJson"
-          :show-pagination="showPagination"
-          @add="add"
-          @edit="edit"
-          @afterDelete="afterDelete"
-          @action="action"
-          @selectRow="selectRow"
-          @afterQuery="afterQuery"
-          @tempTableEdit="tempTableEdit">
-          <template slot="leftButton" slot-scope="{selectedRowKeys, selectedRows}">
-            <slot name="leftButton" :selectedRowKeys="selectedRowKeys" :selectedRows="selectedRows"></slot>
-          </template>
-          <template slot="button" slot-scope="{selectedRowKeys, selectedRows}">
-            <slot name="button" :selectedRowKeys="selectedRowKeys" :selectedRows="selectedRows"></slot>
-          </template>
-          <template slot="rightBtnExpand" slot-scope="{selectedRowKeys, selectedRows}">
-            <slot name="rightBtnExpand" :selectedRowKeys="selectedRowKeys" :selectedRows="selectedRows"></slot>
-            <a-tooltip title="收起查询条件">
-              <a-button @click="toggleIsFormShow">
-                <a-icon :style="iconStyle" type="vertical-align-top"/>
-              </a-button>
-            </a-tooltip>
-          </template>
-          <!-- 底部插槽 -->
-          <template slot="footer" slot-scope="{selectedRowKeys, selectedRows}">
-            <slot name="footer" :selectedRowKeys="selectedRowKeys" :selectedRows="selectedRows"></slot>
-          </template>
-        </x-table>
-      </template>
-      <template v-else>
-        <a-empty>
-          <span slot="description"> 页面配置不存在请联系系统管理员， </span>
-        </a-empty>
-      </template>
-    </div>
-  </div>
+  <a-row type="flex" :gutter="48">
+    <a-col :span="6" v-if="xTreeConfigName">
+      <x-tree
+        :config-name="xTreeConfigName"
+        :env="env"
+        @action="action"
+        @treeOnChecked="treeOnChecked"
+        ref="xtree"
+      ></x-tree>
+    </a-col>
+    <a-col :span="xTreeConfigName?18:24">
+      <a-skeleton :loading="loading" :paragraph="{ rows: 4 }"/>
+      <div v-show="!loading">
+        <template v-if="!loadError">
+          <x-add-form
+            ref="xAddForm"
+            @afterSubmit="onAddOrEditSubmitAfterSubmit"
+          >
+            <template slot="groupFormItems" slot-scope="{form, model, rules, modifyModelData}">
+              <slot
+                name="groupFormItems"
+                :form="form"
+                :model="model"
+                :rules="rules"
+                :modifyModelData="modifyModelData"></slot>
+            </template>
+          </x-add-form>
+          <div v-if="crudTitle" class="crud_title">
+            {{ crudTitle }}
+          </div>
+          <x-form
+            ref="xForm"
+            style="margin-bottom: 14px;"
+            @onSubmit="onSearchSubmit">
+            <slot name="formBtnExpand"></slot>
+          </x-form>
+          <x-table
+            ref="xTable"
+            :fixedQueryForm="fixedQueryForm"
+            :queryParamsName="queryParamsName"
+            :query-params-json="queryParamsJson"
+            :show-pagination="showPagination"
+            @add="add"
+            @edit="edit"
+            @afterDelete="afterDelete"
+            @action="action"
+            @selectRow="selectRow"
+            @afterQuery="afterQuery"
+            @tempTableEdit="tempTableEdit">
+            <template slot="leftButton" slot-scope="{selectedRowKeys, selectedRows}">
+              <slot name="leftButton" :selectedRowKeys="selectedRowKeys" :selectedRows="selectedRows"></slot>
+            </template>
+            <template slot="button" slot-scope="{selectedRowKeys, selectedRows}">
+              <slot name="button" :selectedRowKeys="selectedRowKeys" :selectedRows="selectedRows"></slot>
+            </template>
+            <template slot="rightBtnExpand" slot-scope="{selectedRowKeys, selectedRows}">
+              <slot name="rightBtnExpand" :selectedRowKeys="selectedRowKeys" :selectedRows="selectedRows"></slot>
+              <a-tooltip title="收起查询条件">
+                <a-button @click="toggleIsFormShow">
+                  <a-icon :style="iconStyle" type="vertical-align-top"/>
+                </a-button>
+              </a-tooltip>
+            </template>
+            <!-- 底部插槽 -->
+            <template slot="footer" slot-scope="{selectedRowKeys, selectedRows}">
+              <slot name="footer" :selectedRowKeys="selectedRowKeys" :selectedRows="selectedRows"></slot>
+            </template>
+          </x-table>
+        </template>
+        <template v-else>
+          <a-empty>
+            <span slot="description"> 页面配置不存在请联系系统管理员， </span>
+          </a-empty>
+        </template>
+      </div>
+    </a-col>
+  </a-row>
 </template>
 <script>
 import XForm from '@vue2-client/base-client/components/common/XForm'
 import XAddForm from '@vue2-client/base-client/components/common/XAddForm'
 import XTable from '@vue2-client/base-client/components/common/XTable'
+import XTree from '@vue2-client/base-client/components/common/XTree'
 import XImportExcel from '@vue2-client/base-client/components/common/XImportExcel'
 import { getConfigByName, getConfigByLogic, parseConfig } from '@vue2-client/services/api/common'
 import { mapState } from 'vuex'
@@ -74,6 +91,7 @@ export default {
   components: {
     XTable,
     XForm,
+    XTree,
     XAddForm,
     XImportExcel
   },
@@ -120,6 +138,11 @@ export default {
       type: Object,
       default: null
     },
+    // xTree 配置
+    xTreeConfigName: {
+      type: String,
+      default: null
+    },
     // 业务逻辑名称, 通过logic获取表单表格配置
     logicName: {
       type: String,
@@ -128,7 +151,8 @@ export default {
     // 执行logic传递的参数
     logicParam: {
       type: Object,
-      default: () => {}
+      default: () => {
+      }
     },
     // 固定新增表单
     fixedAddForm: {
@@ -250,7 +274,7 @@ export default {
           serviceName: this.serviceName,
           env: this.env,
           form: this.$refs.xForm.form
-      })
+        })
       }
       this.loading = false
     },
@@ -309,10 +333,14 @@ export default {
      * @param record 本条数据
      * @param id 数据标识
      * @param actionType 操作类型
+     * @param fun 向上级传递的事件
      */
     action (record, id, actionType, fun = 'action') {
       this.$emit(fun, record, id, actionType)
     },
+    treeOnChecked (checkedKeys, deepNodes, deepKeys) {
+      this.$emit('treeOnChecked', checkedKeys, deepNodes, deepKeys)
+    },
     /**
      * 新增按钮事件
      */

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

@@ -1,75 +1,301 @@
 <script setup>
+import { getConfigByName, runLogic } from '@vue2-client/services/api/common'
+import { computed, reactive, ref, watch, defineExpose } from 'vue'
+import executeStrFunction from '@vue2-client/utils/runEvalFunction'
+import store from '@vue2-client/store/modules/account'
+import debounce from 'lodash.debounce'
+
+const config = reactive({})
+// 是否加载中
+const spinning = ref(false)
+// 选中的 key
+const checkedKeys = ref([])
+// 定义 tree 数据
+const _treeData = ref([])
+// 存储搜索结果的树数据
+const filteredTreeData = ref([])
+// 定义最深一层的 数据
+const deepestNodes = ref([])
+// 替换字段
+let _replaceFields = reactive({ children: 'children', title: 'title', key: 'key' })
+// 当前用户信息
+const currentUser = computed(() => store.state.user)
+// 暂存查询信息
+const searchInfo = ref({})
 const props = defineProps({
   // 树数据
   // example: [{ title: '标题', key: '1', children: []}]
   treeData: {
     type: Array,
-    required: true
+    required: false
+  },
+  configName: {
+    type: String,
+    required: false
+  },
+  env: {
+    type: String,
+    default: 'prod'
   },
   replaceFields: {
     type: Object,
     default: () => ({ children: 'children', title: 'title', key: 'key' })
   }
 })
+// 监听 checkbox 选中 的变化
+watch(checkedKeys, (checkedKeys) => {
+  // 筛选出最底层的数据 返回
+  const deepNodes = []
+  const deepKeys = []
+  checkedKeys.forEach(key => {
+    const node = deepestNodes.value.find(node => node[_replaceFields.key] === key)
+    if (node) {
+      deepNodes.push(node)
+      deepKeys.push(node[_replaceFields.key])
+    }
+  })
+  emit('treeOnChecked', checkedKeys, deepNodes, deepKeys)
+}, { immediate: true })
+//
+// watch(() => props.replaceFields, (newReplaceFields) => {
+//   if (newReplaceFields) {
+//     Object.assign(_replaceFields, newReplaceFields)
+//   }
+// }, { immediate: true })
+// 如果有configName 要先获取配置
+if (props.treeData && props.treeData.length > 0) {
+  _treeData.value = props.treeData
+  deepestNodes.value = getDeepestNodes(_treeData.value)
+}
+if (props.replaceFields) {
+  _replaceFields = props.replaceFields
+}
+if (props.configName) {
+  getConfigByName(props.configName, undefined, (x) => {
+    Object.assign(config, x)
+    Object.assign(_replaceFields, x.replaceFields)
+    if (x.treeData.indexOf('logic@') >= 0) {
+      // 如果数据源是 logic
+      getData()
+    }
+  })
+}
 
 const emit = defineEmits(['onSelect'])
 
 function onSelect (keys, e) {
   emit('onSelect', keys, e)
 }
+
+async function getData (param = {}) {
+  spinning.value = true
+  searchInfo.value = Object.assign(param, {
+    org_id: currentUser.value.orgid,
+    user_id: currentUser.value.id,
+    dep_id: currentUser.value.f_department_id
+  })
+  await runLogic(config.treeData.substring(6), searchInfo.value, config.serviceName, props.env === 'dev').then(res => {
+    _treeData.value = res
+    deepestNodes.value = getDeepestNodes(_treeData.value)
+    spinning.value = false
+  }).catch(e => {
+    console.error('获取数据失败：' + e)
+  })
+}
+
+function reLoad () {
+  getData(searchInfo.value)
+}
+
+const debouncedSearch = debounce((value) => {
+  console.log('Search:', value)
+  // 在这里执行你的搜索逻辑
+  if (value) {
+    filteredTreeData.value = searchInTree(_treeData, value)
+  } else {
+    filteredTreeData.value = []
+  }
+}, 233)
+
+function onChange (e) {
+  const searchInput = e.target.value
+  debouncedSearch(searchInput)
+}
+
+function searchInTree (tree, keyword) {
+  return tree.reduce((acc, node) => {
+    if (node.title.includes(keyword)) {
+      acc.push(node)
+    } else if (node.children) {
+      const childResults = searchInTree(node.children, keyword)
+      if (childResults.length > 0) {
+        acc.push({
+          ...node,
+          children: childResults
+        })
+      }
+    }
+    return acc
+  }, [])
+}
+
+function action (record, func) {
+  emit('action', record, record[_replaceFields.key], null, func)
+}
+
+function getDeepestNodes (treeData) {
+  const deepestNodes = []
+
+  function traverse (node) {
+    if (!node[_replaceFields.children] || node[_replaceFields.children].length === 0) {
+      deepestNodes.push(node)
+    } else {
+      node[_replaceFields.children].forEach(child => traverse(child))
+    }
+  }
+
+  treeData.forEach(node => traverse(node))
+  return deepestNodes
+}
+
+// 使用 defineExpose 暴露方法
+defineExpose({
+  reLoad
+})
+
 </script>
 
 <template>
-  <div class="tree_main">
-    <a-directory-tree
-      :tree-data="props.treeData"
-      @select="onSelect"
-      :replaceFields="props.replaceFields"
-      :default-selected-keys="props.treeData.length > 0 ? [props.treeData[0][replaceFields.key]] : null"
-      :default-expand-all="true"
-    ></a-directory-tree>
+  <div id="XTreeWarp">
+    <div class="tree_title" :style="{height:config.search?'5rem':'3rem'}" v-if="config.title">
+      <a-row style="font-size: medium;line-height: 3rem">
+        <a-col :offset="2">
+          <span>{{ config.title }}</span>
+        </a-col>
+      </a-row>
+      <a-input-search
+        v-if="config.search"
+        style="margin-bottom: 8px"
+        placeholder="请输入搜索关键字"
+        @change="onChange"/>
+    </div>
+    <div
+      class="tree_main"
+      :style="{
+        maxHeight:config.search?'calc(100vh - 200px - 5rem)':'calc(100vh - 200px - 3rem)'
+      }">
+      <a-spin :spinning="spinning">
+        <a-tree
+          v-model="checkedKeys"
+          :tree-data="filteredTreeData && filteredTreeData.length> 0?filteredTreeData: _treeData"
+          :checkable="config.checkable"
+          :blockNode="true"
+          :replaceFields="_replaceFields"
+          :default-selected-keys="_treeData && _treeData.length > 0 ? [_treeData[0][_replaceFields.key]] : null"
+          :default-expand-all="true"
+          @select="onSelect"
+        >
+          <template slot="title" slot-scope="item">
+            <span>{{
+              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]
+            }}</span>
+            <a-space style="float:right;margin-right: .2rem">
+              <a-icon
+                v-for="icon in config.btn"
+                @click="action(item, icon.func)"
+                :key="icon.func"
+                v-if="executeStrFunction( icon.customFunction,[item])"
+                :type="icon.icon"
+                :style="{color:icon.color}"></a-icon>
+            </a-space>
+          </template>
+        </a-tree>
+      </a-spin>
+    </div>
   </div>
 </template>
 
 <style lang="less" scoped>
+.tree_title {
+  background-color: #E0E5EB;
+  border-radius: 8px 8px 0 0;
+}
+
 .tree_main {
-  :deep(.ant-tree li .ant-tree-node-content-wrapper){
+  width: 97%;
+  display: inline-block;
+  overflow-y: auto;
+
+  //:deep(.ant-tree-child-tree){
+  //  .ant-space-item {
+  //    display: none;
+  //  }
+  //
+  //  &:hover {
+  //    .ant-space-item {
+  //      display: block;
+  //    }
+  //  }
+  //}
+
+  :deep(.ant-tree li .ant-tree-node-content-wrapper) {
     color: #000000e0;
   }
+
+  :deep(.ant-tree-checkbox) {
+    top: .5rem !important;
+  }
+
+  :deep(.ant-tree-node-content-wrapper ) {
+    display: inline;
+  }
+
   :deep(.ant-tree li span.ant-tree-switcher, .ant-tree li span.ant-tree-iconEle) {
     color: #0000004d;
+
     i {
       font-size: 16px !important;
       line-height: 40px;
     }
   }
-  :deep(.ant-tree.ant-tree-directory > li span.ant-tree-node-content-wrapper::before, .ant-tree.ant-tree-directory .ant-tree-child-tree > li span.ant-tree-node-content-wrapper::before){
+
+  :deep(.ant-tree.ant-tree-directory > li span.ant-tree-node-content-wrapper::before, .ant-tree.ant-tree-directory .ant-tree-child-tree > li span.ant-tree-node-content-wrapper::before) {
     height: 40px;
     border-radius: 6px;
   }
-  :deep(.ant-tree.ant-tree-directory > li.ant-tree-treenode-selected > span.ant-tree-node-content-wrapper::before){
+
+  :deep(.ant-tree.ant-tree-directory > li.ant-tree-treenode-selected > span.ant-tree-node-content-wrapper::before) {
     background: #e6f7ff;
   }
-  :deep(.ant-tree.ant-tree-directory .ant-tree-child-tree > li.ant-tree-treenode-selected > span.ant-tree-node-content-wrapper::before){
+
+  :deep(.ant-tree.ant-tree-directory .ant-tree-child-tree > li.ant-tree-treenode-selected > span.ant-tree-node-content-wrapper::before) {
     background: #e6f7ff;
   }
-  :deep(.ant-tree.ant-tree-directory .ant-tree-child-tree > li.ant-tree-treenode-selected > span.ant-tree-switcher){
+
+  :deep(.ant-tree.ant-tree-directory .ant-tree-child-tree > li.ant-tree-treenode-selected > span.ant-tree-switcher) {
     color: #0000004d;
   }
-  :deep(.ant-tree.ant-tree-directory > li span.ant-tree-node-content-wrapper.ant-tree-node-selected, .ant-tree.ant-tree-directory .ant-tree-child-tree > li span.ant-tree-node-content-wrapper.ant-tree-node-selected){
+
+  :deep(.ant-tree.ant-tree-directory > li span.ant-tree-node-content-wrapper.ant-tree-node-selected, .ant-tree.ant-tree-directory .ant-tree-child-tree > li span.ant-tree-node-content-wrapper.ant-tree-node-selected) {
     color: #000000e0;
   }
-  :deep(.ant-tree li .ant-tree-node-content-wrapper){
+
+  :deep(.ant-tree li .ant-tree-node-content-wrapper) {
     line-height: 40px;
     height: 40px;
   }
+
   :deep(.ant-tree li) {
     padding-left: 4px;
   }
+
   :deep(.ant-tree ul) {
     padding-left: 10px;
   }
-  :deep(.ant-tree-icon__customize){
+
+  :deep(.ant-tree-icon__customize) {
     display: none;
   }
 }

package/src/utils/formatter.js

@@ -65,4 +65,16 @@ function formatConfig (obj, dep) {
   return `${prefix}${str}${subfix}`
 }
 
-module.exports = { formatConfig }
+function getRealKeyData (data) {
+  const obj = {}
+  Object.keys(data).forEach(k => {
+    if (k.indexOf('_') >= 0) {
+      obj[k.substring(k.indexOf('_') + 1)] = data[k]
+    } else {
+      obj[k] = data[k]
+    }
+  })
+  return obj
+}
+
+module.exports = { formatConfig, getRealKeyData }

package/vue.config.js

@@ -42,6 +42,16 @@ module.exports = {
       //   target: testUpload,
       //   changeOrigin: true
       // },
+      '/api/af-revenue/logic/openapi/': {
+        pathRewrite: { '^/api/af-revenue/logic/openapi/': '/logic/' },
+        target: 'http://127.0.0.1:9026',
+        changeOrigin: true
+      },
+      '/api/af-revenue': {
+        pathRewrite: { '^/api/af-revenue/': '/' },
+        target: 'http://127.0.0.1:9026',
+        changeOrigin: true
+      },
       '/api': {
         // v3用
         // pathRewrite: { '^/api/af-system/': '/rs/', '^/api/af-iot/': '/rs/' },