Ver código fonte

Merge branch 'ui-refactor-phase-2' of guanli/ngfrontend into develop

bill001 2 semanas atrás
pai
commit
aaa13ae4c5

+ 71 - 3
src/ui-refactor/views/account/__tests__/SponsorNetwork.spec.js

@@ -14,6 +14,17 @@ jest.mock('@/api/user', () => ({ fetchNetworkStats: jest.fn() }))
 jest.mock('@/utils/request', () => jest.fn())
 jest.mock('@/utils/request', () => jest.fn())
 jest.mock('@/components/TreeChart/index.vue', () => ({}))
 jest.mock('@/components/TreeChart/index.vue', () => ({}))
 jest.mock('@/utils/usersInfo', () => ({}))
 jest.mock('@/utils/usersInfo', () => ({}))
+jest.mock('echarts/core', () => ({
+  use: jest.fn(),
+  registerLayout: jest.fn(),
+  init: jest.fn(() => ({
+    on: jest.fn(), resize: jest.fn(), setOption: jest.fn(), dispose: jest.fn(), dispatchAction: jest.fn(),
+    getModel: () => ({ getSeriesByIndex: () => ({ getData: () => ({ each: () => {}, getItemGraphicEl: () => null }) }) })
+  }))
+}))
+jest.mock('echarts/charts', () => ({ TreeChart: {}}))
+jest.mock('echarts/components', () => ({ TooltipComponent: {}}))
+jest.mock('echarts/renderers', () => ({ CanvasRenderer: {}}))
 Vue.use(ElementUI)
 Vue.use(ElementUI)
 Vue.prototype.$t = key => key
 Vue.prototype.$t = key => key
 Vue.prototype.$message = jest.fn()
 Vue.prototype.$message = jest.fn()
@@ -44,6 +55,7 @@ function loadComponent(filename) {
 }
 }
 
 
 const SponsorNetwork = loadComponent(path.resolve(__dirname, '../components/network/SponsorNetwork.vue'))
 const SponsorNetwork = loadComponent(path.resolve(__dirname, '../components/network/SponsorNetwork.vue'))
+const networkLayout = jest.requireMock('echarts/core').registerLayout.mock.calls[0][1]
 const legacy = file => loadComponent(path.resolve(process.cwd(), 'src/views/atlas', file))
 const legacy = file => loadComponent(path.resolve(process.cwd(), 'src/views/atlas', file))
 const root = { USER_ID: 'root', USER_NAME: 'NG00001', REAL_NAME: '', DEC_LV_NAME: 'Silver', EMP_LV_NAME: 'Gold', PERIOD_AT: 173, TOP_NETWORK_DEEP: 3, listPeriodNum: [173], children: null, leaf: false }
 const root = { USER_ID: 'root', USER_NAME: 'NG00001', REAL_NAME: '', DEC_LV_NAME: 'Silver', EMP_LV_NAME: 'Gold', PERIOD_AT: 173, TOP_NETWORK_DEEP: 3, listPeriodNum: [173], children: null, leaf: false }
 const child = { ...root, USER_ID: 'child', USER_NAME: 'NG00002', REAL_NAME: 'Preview Member', PERIOD_AT: 164 }
 const child = { ...root, USER_ID: 'child', USER_NAME: 'NG00002', REAL_NAME: 'Preview Member', PERIOD_AT: 164 }
@@ -68,6 +80,9 @@ function view(vm) {
 function toggle(vm, id) {
 function toggle(vm, id) {
   return vm.$refs.tree.getNode(id)
   return vm.$refs.tree.getNode(id)
 }
 }
+function diagram(vm) {
+  return vm.$children.find(child => child.$options.name === 'SponsorNetworkChart')
+}
 function setInput(vm, id, value) {
 function setInput(vm, id, value) {
   const input = vm.$el.querySelector(id)
   const input = vm.$el.querySelector(id)
   input.value = value
   input.value = value
@@ -96,6 +111,12 @@ describe('Sponsor Network UI reuses both original network scripts', () => {
     expect(request).toHaveBeenCalledWith({ url: '/v1/user/network-stats', method: 'get' })
     expect(request).toHaveBeenCalledWith({ url: '/v1/user/network-stats', method: 'get' })
   })
   })
 
 
+  it('leaves the original and other ECharts tree layouts untouched', () => {
+    const original = { id: 'original-tree', getData: jest.fn() }
+    networkLayout({ eachSeriesByType: (type, visit) => { expect(type).toBe('tree'); visit(original) } })
+    expect(original.getData).not.toHaveBeenCalled()
+  })
+
   it('loads and maps the four backend statistics, keeping decimals and zero values', async() => {
   it('loads and maps the four backend statistics, keeping decimals and zero values', async() => {
     const vm = instance()
     const vm = instance()
     await settle()
     await settle()
@@ -224,15 +245,17 @@ describe('Sponsor Network UI reuses both original network scripts', () => {
     expect(atlasApi.fetchSponsorNetworkList).toHaveBeenCalledTimes(1)
     expect(atlasApi.fetchSponsorNetworkList).toHaveBeenCalledTimes(1)
     expect(atlasApi.fetchSponsorNetwork).toHaveBeenCalledTimes(1)
     expect(atlasApi.fetchSponsorNetwork).toHaveBeenCalledTimes(1)
     atlasApi.fetchSponsorNetwork.mockResolvedValue({ data: { allData: [{ ...leaf }], periodNum: 174 }})
     atlasApi.fetchSponsorNetwork.mockResolvedValue({ data: { allData: [{ ...leaf }], periodNum: 174 }})
-    const childNode = toggle(extended, 'child')
-    extended.toggleNode(childNode.data, childNode)
+    expect(extended.$el.querySelector('.ng-network-tree')).toBeNull()
+    diagram(extended).handleClick({ componentType: 'series', data: extended.treeData.children[0], name: child.USER_NAME, collapsed: false })
     await settle()
     await settle()
     expect(atlasApi.fetchSponsorNetwork).toHaveBeenLastCalledWith({ id: 'child', deep: 5, periodNum: null })
     expect(atlasApi.fetchSponsorNetwork).toHaveBeenLastCalledWith({ id: 'child', deep: 5, periodNum: null })
     expect(extended.treeData.children[0].children[0].USER_ID).toBe('leaf')
     expect(extended.treeData.children[0].children[0].USER_ID).toBe('leaf')
     expect(extended.listPeriodNum).toBe(174)
     expect(extended.listPeriodNum).toBe(174)
-    expect(extended.$el.textContent).toContain('Preview Leaf')
+    expect(diagram(extended).members.map(member => member.REAL_NAME)).toContain('Preview Leaf')
+    const renderer = diagram(extended).chart
     vm.$el.querySelectorAll('input[type=radio]')[0].click()
     vm.$el.querySelectorAll('input[type=radio]')[0].click()
     await settle()
     await settle()
+    expect(renderer.dispose).toHaveBeenCalledTimes(1)
     expect(view(vm)).not.toBe(normal)
     expect(view(vm)).not.toBe(normal)
     expect(view(vm).mainUserName).toBe('')
     expect(view(vm).mainUserName).toBe('')
     expect(atlasApi.fetchMainUserInfo).toHaveBeenCalledTimes(3)
     expect(atlasApi.fetchMainUserInfo).toHaveBeenCalledTimes(3)
@@ -244,4 +267,49 @@ describe('Sponsor Network UI reuses both original network scripts', () => {
     expect(atlasApi.fetchSponsorNetwork).toHaveBeenCalledTimes(3)
     expect(atlasApi.fetchSponsorNetwork).toHaveBeenCalledTimes(3)
     expect(fetchNetworkStats).toHaveBeenCalledTimes(4)
     expect(fetchNetworkStats).toHaveBeenCalledTimes(4)
   })
   })
+
+  it('renders Ex with ECharts top-down cards and keeps loaded-node toggles local to the chart', async() => {
+    atlasApi.fetchSponsorNetwork.mockResolvedValue({ data: { allData: [{ ...child, children: [{ ...leaf }] }], periodNum: 173 }})
+    const vm = instance()
+    await settle()
+    vm.$el.querySelectorAll('input[type=radio]')[1].click()
+    await settle()
+    const extended = view(vm)
+    const chart = diagram(extended)
+    const options = chart.chart.setOption.mock.calls.slice(-1)[0][0]
+    const series = options.series[0]
+    expect(series).toEqual(expect.objectContaining({ type: 'tree', orient: 'TB', edgeShape: 'polyline', roam: true, expandAndCollapse: true }))
+    expect(series.data[0].label.backgroundColor).toBe('#202259')
+    expect(series.data[0].children[0].children[0].USER_ID).toBe('leaf')
+    const label = series.label.formatter({ data: child, collapsed: false })
+    expect(label).toContain('Period: 164')
+    expect(label).not.toContain('PCV')
+    const count = atlasApi.fetchSponsorNetwork.mock.calls.length
+    const button = chart.$el.querySelector('button')
+    button.click()
+    await Vue.nextTick()
+    expect(chart.chart.dispatchAction).toHaveBeenLastCalledWith({ type: 'treeExpandAndCollapse', seriesIndex: 0, dataIndex: 1 })
+    button.click()
+    await Vue.nextTick()
+    expect(atlasApi.fetchSponsorNetwork).toHaveBeenCalledTimes(count)
+    chart.handleClick({ componentType: 'series', data: leaf })
+    expect(atlasApi.fetchSponsorNetwork).toHaveBeenCalledTimes(count)
+  })
+
+  it('keeps Ex names as text and empty child lists non-fetching', async() => {
+    atlasApi.fetchSponsorNetwork.mockResolvedValue({ data: { allData: [{ ...child, REAL_NAME: '<img src=x onerror=alert(1)>', children: [] }], periodNum: 173 }})
+    const vm = instance()
+    await settle()
+    vm.$el.querySelectorAll('input[type=radio]')[1].click()
+    await settle()
+    const extended = view(vm)
+    const chart = diagram(extended)
+    const data = extended.treeData.children[0]
+    const tooltip = chart.tooltip({ data })
+    expect(tooltip.textContent).toContain('<img src=x onerror=alert(1)>')
+    expect(tooltip.querySelector('img')).toBeNull()
+    const count = atlasApi.fetchSponsorNetwork.mock.calls.length
+    chart.handleClick({ componentType: 'series', data })
+    expect(atlasApi.fetchSponsorNetwork).toHaveBeenCalledTimes(count)
+  })
 })
 })

+ 252 - 0
src/ui-refactor/views/account/components/network/SponsorNetworkChart.vue

@@ -0,0 +1,252 @@
+<template>
+  <div class="ng-network-chart">
+    <ul class="ng-network-keyboard" aria-label="Loaded network members">
+      <li v-for="(member, index) in members" :key="member.USER_ID">
+        <button v-if="!member.leaf" type="button" @click="activateNode(member, index + 1)">
+          Expand or collapse {{ member.USER_NAME }} · {{ member.REAL_NAME }}
+        </button>
+        <span v-else>{{ member.USER_NAME }} · {{ member.REAL_NAME }}</span>
+      </li>
+    </ul>
+    <div ref="viewport" class="ng-network-chart-scroll" tabindex="0" role="region" aria-label="Sponsor Network Ex. Drag to pan, scroll to zoom.">
+      <div ref="canvas" :style="{ width: chartWidth + 'px', height: chartHeight + 'px' }" />
+    </div>
+  </div>
+</template>
+
+<script>
+import * as echarts from 'echarts/core'
+import { TreeChart } from 'echarts/charts'
+import { TooltipComponent } from 'echarts/components'
+import { CanvasRenderer } from 'echarts/renderers'
+
+echarts.use([TreeChart, TooltipComponent, CanvasRenderer])
+
+// 仅调整新图的横向间距,避免 ECharts 默认把不同分支的间距加倍。
+echarts.registerLayout(2000, model => {
+  model.eachSeriesByType('tree', series => {
+    if (series.id !== 'ng-sponsor-network-ex') return
+    const root = series.getData().tree.root.children[0]
+    let column = 0
+    const place = node => {
+      const children = node.isExpand ? node.children : []
+      children.forEach(place)
+      const x = children.length
+        ? (children[0].getLayout().x + children[children.length - 1].getLayout().x) / 2
+        : column++ * 216
+      node.setLayout({ x }, true)
+    }
+    place(root)
+    const offset = (series.layoutInfo.width - (column - 1) * 216) / 2
+    root.eachNode(node => {
+      if (node.getLayout()) node.setLayout({ x: node.getLayout().x + offset }, true)
+    })
+  })
+})
+
+export default {
+  name: 'SponsorNetworkChart',
+  props: {
+    treeData: { type: Object, required: true }
+  },
+  data() {
+    return { viewportWidth: 0 }
+  },
+  computed: {
+    layout() {
+      const members = []
+      let leaves = 0
+      let depth = 1
+      const visit = (node, level) => {
+        members.push(node)
+        depth = Math.max(depth, level)
+        if (node.children && node.children.length) node.children.forEach(child => visit(child, level + 1))
+        else leaves++
+      }
+      visit(this.treeData, 1)
+      return { members, leaves, depth }
+    },
+    members() {
+      return this.layout.members
+    },
+    chartWidth() {
+      return Math.max(this.viewportWidth, (this.layout.leaves - 1) * 216 + 224)
+    },
+    chartHeight() {
+      return (this.layout.depth - 1) * 172 + 140
+    }
+  },
+  watch: {
+    treeData: { deep: true, handler: 'draw' }
+  },
+  mounted() {
+    this.chart = echarts.init(this.$refs.canvas)
+    this.chart.on('click', this.handleClick)
+    this.draw()
+    if (window.ResizeObserver) {
+      this.resizeObserver = new window.ResizeObserver(this.resizeChart)
+      this.resizeObserver.observe(this.$refs.viewport)
+    }
+    window.addEventListener('resize', this.resizeChart)
+  },
+  beforeDestroy() {
+    if (this.resizeObserver) this.resizeObserver.disconnect()
+    window.removeEventListener('resize', this.resizeChart)
+    this.chart.dispose()
+    this.chart = null
+  },
+  methods: {
+    resizeChart() {
+      this.viewportWidth = this.$refs.viewport.clientWidth
+      this.$nextTick(() => {
+        if (this.chart) {
+          this.chart.resize()
+          this.centerRoot()
+        }
+      })
+    },
+    draw() {
+      this.viewportWidth = this.$refs.viewport.clientWidth
+      this.$nextTick(() => {
+        if (!this.chart) return
+        this.chart.resize()
+        const rich = {
+          code: { color: '#1683a3', fontSize: 11, fontWeight: 700, width: 164, lineHeight: 22, align: 'left' },
+          member: { fontSize: 13, fontWeight: 700, width: 164, lineHeight: 24, align: 'left' },
+          rank: { color: '#202259', backgroundColor: '#edf1f5', borderRadius: 8, padding: [2, 5], fontSize: 10, align: 'left' },
+          period: { color: '#606266', backgroundColor: '#edf1f5', borderRadius: 8, padding: [2, 5], fontSize: 10, align: 'left' },
+          gap: { width: 5, align: 'left' },
+          // 右对齐定位整个标记,自动字宽和对称内边距让符号保持居中。
+          toggle: { color: '#fff', backgroundColor: '#1683a3', borderRadius: 9, height: 18, padding: [0, 5], align: 'right', fontSize: 13 },
+          leaf: { color: '#606266', backgroundColor: '#e4e9ee', borderRadius: 9, height: 18, padding: [0, 7], align: 'right' }
+        }
+        this.chart.setOption({
+          textStyle: { fontFamily: window.getComputedStyle(this.$el).fontFamily },
+          tooltip: {
+            trigger: 'item',
+            confine: true,
+            formatter: this.tooltip,
+            borderColor: '#d9e1e9',
+            textStyle: { color: '#25292c', fontSize: 12 },
+            extraCssText: 'line-height:1.8;max-width:280px;overflow-wrap:anywhere'
+          },
+          series: [{
+            id: 'ng-sponsor-network-ex',
+            type: 'tree',
+            orient: 'TB',
+            layout: 'orthogonal',
+            edgeShape: 'polyline',
+            edgeForkPosition: '50%',
+            top: 70,
+            bottom: 70,
+            left: 112,
+            right: 112,
+            roam: true,
+            scaleLimit: { min: 0.5, max: 3 },
+            initialTreeDepth: -1,
+            expandAndCollapse: true,
+            symbol: 'rect',
+            symbolSize: [188, 90],
+            itemStyle: { color: 'transparent', borderWidth: 0 },
+            lineStyle: { color: '#d0dae5', width: 1.2 },
+            label: {
+              position: 'inside',
+              align: 'center',
+              verticalAlign: 'middle',
+              width: 164,
+              height: 70,
+              padding: [10, 12],
+              borderRadius: 12,
+              backgroundColor: '#fff',
+              borderColor: '#d9e1e9',
+              borderWidth: 1,
+              color: '#25292c',
+              overflow: 'truncate',
+              formatter: this.label,
+              rich
+            },
+            data: [{
+              ...this.treeData,
+              label: {
+                color: '#fff', backgroundColor: '#202259', borderColor: '#202259',
+                rich: { ...rich, code: { ...rich.code, color: '#82d9ee' }}
+              }
+            }],
+            emphasis: { disabled: true },
+            animationDuration: 0,
+            animationDurationUpdate: 200
+          }]
+        }, true)
+        this.centerRoot()
+      })
+    },
+    centerRoot() {
+      const series = this.chart.getModel().getSeriesByIndex(0)
+      if (!series) return
+      const root = series.getData().getItemGraphicEl(1)
+      if (root) this.$refs.viewport.scrollLeft = Math.max(0, root.transformCoordToGlobal(0, 0)[0] - this.viewportWidth / 2)
+    },
+    label({ data, collapsed }) {
+      // 接口文本不能被当成 ECharts 富文本标记;详情仍显示完整原文。
+      const text = value => String(value == null ? '—' : value).replace(/\{/g, '{').replace(/\}/g, '}').replace(/[\r\n]/g, ' ')
+      const hasChildren = data.children && data.children.length > 0
+      const canExpand = hasChildren || (!data.leaf && data.children == null)
+      const toggle = canExpand ? '{toggle|' + (hasChildren && !collapsed ? '−' : '+') + '}' : '{leaf|·}'
+      return '{code|' + text(data.USER_NAME) + '}\n{member|' + text(data.REAL_NAME || 'Member ' + data.USER_NAME) + '}\n' +
+        '{rank|' + text(data.DEC_LV_NAME) + '}{gap| }{period|Period: ' + text(data.PERIOD_AT) + '}' + toggle
+    },
+    tooltip({ data }) {
+      const content = document.createElement('div')
+      const fields = { 'Member ID': data.USER_NAME, Name: data.REAL_NAME, Level: data.DEC_LV_NAME, Highest: data.EMP_LV_NAME, Period: data.PERIOD_AT }
+      Object.keys(fields).forEach(label => {
+        const row = document.createElement('div')
+        row.textContent = label + ': ' + (fields[label] == null || fields[label] === '' ? '—' : fields[label])
+        content.appendChild(row)
+      })
+      return content
+    },
+    handleClick(event) {
+      if (event.componentType === 'series') this.$emit('click-node', event)
+    },
+    activateNode(data, dataIndex) {
+      this.chart.dispatchAction({ type: 'treeExpandAndCollapse', seriesIndex: 0, dataIndex })
+      this.$emit('click-node', { data, name: data.USER_NAME, collapsed: false })
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.ng-network-chart {
+  position: relative;
+}
+
+.ng-network-chart-scroll {
+  overflow: auto;
+}
+
+.ng-network-chart-scroll:focus-visible {
+  outline: 2px solid #1683a3;
+  outline-offset: 2px;
+}
+
+.ng-network-keyboard {
+  position: absolute;
+  width: 1px;
+  height: 1px;
+  overflow: hidden;
+  clip-path: inset(50%);
+}
+
+.ng-network-keyboard:focus-within {
+  z-index: 2;
+  width: 100%;
+  height: auto;
+  max-height: 200px;
+  margin: 0;
+  padding: 12px 24px;
+  overflow: auto;
+  background: #fff;
+  clip-path: none;
+}
+</style>

+ 58 - 9
src/ui-refactor/views/account/components/network/SponsorNetworkTree.vue

@@ -1,14 +1,19 @@
 <template>
 <template>
   <div v-loading="loading" class="ng-network-view">
   <div v-loading="loading" class="ng-network-view">
-    <el-form :inline="true" label-position="left" @submit.native.prevent="getMainData()">
-      <el-form-item label="Top Member" :for="'ng-network-member-' + extended">
+    <el-form
+      :inline="true"
+      :label-position="extended ? 'top' : 'left'"
+      :class="{ 'ng-network-form': extended }"
+      @submit.native.prevent="getMainData()"
+    >
+      <el-form-item label="Top Member" :for="'ng-network-member-' + extended" :class="{ 'ng-network-search': extended }">
         <el-input
         <el-input
           :id="'ng-network-member-' + extended"
           :id="'ng-network-member-' + extended"
           v-model="mainUserName"
           v-model="mainUserName"
           placeholder="Member ID"
           placeholder="Member ID"
         />
         />
       </el-form-item>
       </el-form-item>
-      <el-form-item label="Spread Depth" :for="'ng-network-depth-' + extended">
+      <el-form-item label="Spread Depth" :for="'ng-network-depth-' + extended" :class="{ 'ng-network-depth': extended }">
         <el-input-number
         <el-input-number
           :id="'ng-network-depth-' + extended"
           :id="'ng-network-depth-' + extended"
           v-model="expandDeep"
           v-model="expandDeep"
@@ -24,8 +29,19 @@
       </el-form-item>
       </el-form-item>
     </el-form>
     </el-form>
 
 
+    <div v-if="extended && treeChartShow" class="ng-network-diagram-view">
+      <template v-if="networkNodes.length">
+        <div class="ng-network-diagram-caption">
+          <span class="ng-network-diagram-root">{{ networkNodes[0].USER_NAME }} · {{ networkNodes[0].REAL_NAME || 'Member ' + networkNodes[0].USER_NAME }}</span>
+          <span>Click a node to expand or collapse · Drag to pan · Scroll to zoom</span>
+        </div>
+        <sponsor-network-chart :tree-data="networkNodes[0]" @click-node="getNodeData" />
+      </template>
+      <p v-else class="ng-network-diagram-empty">No network records to display.</p>
+    </div>
+
     <el-tree
     <el-tree
-      v-if="!extended || treeChartShow"
+      v-if="!extended"
       ref="tree"
       ref="tree"
       class="ng-network-tree"
       class="ng-network-tree"
       :data="networkNodes"
       :data="networkNodes"
@@ -71,8 +87,11 @@
 </template>
 </template>
 
 
 <script>
 <script>
+import SponsorNetworkChart from './SponsorNetworkChart.vue'
+
 export default {
 export default {
   name: 'SponsorNetworkTree',
   name: 'SponsorNetworkTree',
+  components: { SponsorNetworkChart },
   props: {
   props: {
     extended: Boolean
     extended: Boolean
   },
   },
@@ -136,11 +155,11 @@ export default {
   white-space: nowrap;
   white-space: nowrap;
 }
 }
 
 
-.ng-network-form ::v-deep .el-input__inner {
-  height: 48px;
-  border-radius: 8px;
-  line-height: 48px;
-}
+//.ng-network-form ::v-deep .el-input__inner {
+//  height: 48px;
+//  border-radius: 8px;
+//  line-height: 48px;
+//}
 
 
 .ng-network-confirm {
 .ng-network-confirm {
   //min-height: 44px;
   //min-height: 44px;
@@ -166,6 +185,36 @@ export default {
   width: 96px;
   width: 96px;
 }
 }
 
 
+.ng-network-depth ::v-deep .el-input-number {
+  width: 100%;
+}
+
+.ng-network-diagram-caption {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  flex-wrap: wrap;
+  gap: 12px;
+  margin-bottom: 20px;
+  color: #606266;
+  font-size: 12px;
+  line-height: 1.6;
+}
+
+.ng-network-diagram-root {
+  max-width: 100%;
+  padding: 4px 10px;
+  border-radius: 6px;
+  color: #fff;
+  background: #202259;
+  overflow-wrap: anywhere;
+}
+
+.ng-network-diagram-empty {
+  color: #909399;
+  text-align: center;
+}
+
 .ng-network-tree {
 .ng-network-tree {
   overflow-x: auto;
   overflow-x: auto;
 }
 }