Skip to content

W
wx-boss
Commit fd8d37c2 by 姜雷
Options

Merge branch 'develop' into test

parents f7508ced ad1491ba
Showing with 12 additions and 12 deletions
miniprogram/pages/components/PlatformFeeChart/PlatformFeeChart.js
...@@ -98,12 +98,12 @@ Component({ ...@@ -98,12 +98,12 @@ Component({
methods: { methods: {
clickHandle: function (e) { clickHandle: function (e) {
console.log(e); console.log(e);
var touches = e.detail.touches; var changedTouches = e.detail.changedTouches;
var x = 0; var x = 0;
var y = 0; var y = 0;
if (touches && touches.length) { if (changedTouches && changedTouches.length) {
x = touches[0].x; x = changedTouches[0].x;
y = touches[0].y; y = changedTouches[0].y;
} }
var objArr = platforFeeChart.getSnapRecords({ x: x, y: y }); var objArr = platforFeeChart.getSnapRecords({ x: x, y: y });
if (objArr.length) if (objArr.length)
...@@ -111,4 +111,4 @@ Component({ ...@@ -111,4 +111,4 @@ Component({
}, },
}, },
}); });
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"PlatformFeeChart.js","sourceRoot":"","sources":["PlatformFeeChart.ts"],"names":[],"mappings":"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","sourcesContent":["// pages/components/PlatformFeeChart/PlatformFeeChart.js\nlet platforFeeChart = null;\nlet month = '';\n\nfunction initChart(canvas, width, height, F2) {\n  const data = [];\n  platforFeeChart = new F2.Chart({\n    el: canvas,\n    width,\n    height,\n  });\n\n  platforFeeChart.source(data, {\n    month: {\n      min: 1,\n      max: 12,\n    },\n  });\n  platforFeeChart.tooltip({\n    showItemMarker: false,\n    background: {\n      radius: 2,\n      fill: '#6895fe',\n      padding: [6, 10],\n    },\n    onShow(ev) {\n      const { items } = ev;\n      items[0].name = '';\n      items[0].value = items[0].title + '月';\n      items[1].name = '';\n      items[1].value = items[1].value + '元';\n    },\n  });\n  platforFeeChart\n    .line()\n    .position('month*totalMoney')\n    .color('#6895fe')\n    .shape('smooth')\n    .size(4);\n  platforFeeChart\n    .area()\n    .position('month*totalMoney')\n    .color('l(90) 0:#6895fe 1:#fff')\n    .shape('smooth')\n    .style({\n      fillOpacity: 0.6,\n    });\n  // platforFeeChart.axis('rechargeMoney', false);\n  platforFeeChart.render();\n  return platforFeeChart;\n}\n\nfunction findMaxIndex(list, key) {\n  if (!list.length) return -1;\n  let max = list[0][key];\n  let maxIndex = 0;\n  for (let index = 0; index < list.length; index++) {\n    const element = list[index];\n    if (element >= max) maxIndex = index;\n  }\n  return maxIndex;\n}\n\nComponent({\n  // lifetimes: {\n  //   attached() {\n  //     const query = wx.createSelectorQuery().in(this);\n  //     query\n  //       .select('#PlatformFeeChart')\n  //       .boundingClientRect(res => {\n  //         // res.top; // 这个组件内 #the-id 节点的上边界坐标\n  //         console.log(res);\n  //         this.setData({\n  //           x: res.left,\n  //           y: res.top,\n  //         });\n  //       })\n  //       .exec();\n  //   },\n  // },\n\n  properties: {\n    dataList: {\n      type: Array,\n      value: [],\n      observer(newVal) {\n        if (platforFeeChart) {\n          platforFeeChart.changeData(newVal);\n        } else {\n          setTimeout(() => {\n            platforFeeChart.changeData(newVal);\n          }, 1000);\n        }\n        if (platforFeeChart) {\n          let index = findMaxIndex(newVal, 'totalMoney');\n          if (index !== -1) {\n            let item = newVal[index];\n            const point = platforFeeChart.getPosition(item);\n            platforFeeChart.showTooltip(point);\n          }\n        }\n      },\n    },\n    month: {\n      type: String,\n      value: '',\n      observer(newVal) {\n        month = newVal;\n      },\n    },\n  },\n  data: {\n    opts: {\n      onInit: initChart,\n    },\n  },\n  methods: {\n    clickHandle(e) {\n      console.log(e);\n      const { touches } = e.detail;\n\n      let x = 0;\n      let y = 0;\n      if (touches && touches.length) {\n        x = touches[0].x;\n        y = touches[0].y;\n      }\n      const objArr = platforFeeChart.getSnapRecords({ x, y });\n      if (objArr.length) this.triggerEvent('selectedData', objArr[0]._origin);\n    },\n  },\n});\n"]} //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"PlatformFeeChart.js","sourceRoot":"","sources":["PlatformFeeChart.ts"],"names":[],"mappings":"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","sourcesContent":["// pages/components/PlatformFeeChart/PlatformFeeChart.js\nlet platforFeeChart = null;\nlet month = '';\n\nfunction initChart(canvas, width, height, F2) {\n  const data = [];\n  platforFeeChart = new F2.Chart({\n    el: canvas,\n    width,\n    height,\n  });\n\n  platforFeeChart.source(data, {\n    month: {\n      min: 1,\n      max: 12,\n    },\n  });\n  platforFeeChart.tooltip({\n    showItemMarker: false,\n    background: {\n      radius: 2,\n      fill: '#6895fe',\n      padding: [6, 10],\n    },\n    onShow(ev) {\n      const { items } = ev;\n      items[0].name = '';\n      items[0].value = items[0].title + '月';\n      items[1].name = '';\n      items[1].value = items[1].value + '元';\n    },\n  });\n  platforFeeChart\n    .line()\n    .position('month*totalMoney')\n    .color('#6895fe')\n    .shape('smooth')\n    .size(4);\n  platforFeeChart\n    .area()\n    .position('month*totalMoney')\n    .color('l(90) 0:#6895fe 1:#fff')\n    .shape('smooth')\n    .style({\n      fillOpacity: 0.6,\n    });\n  // platforFeeChart.axis('rechargeMoney', false);\n  platforFeeChart.render();\n  return platforFeeChart;\n}\n\nfunction findMaxIndex(list, key) {\n  if (!list.length) return -1;\n  let max = list[0][key];\n  let maxIndex = 0;\n  for (let index = 0; index < list.length; index++) {\n    const element = list[index];\n    if (element >= max) maxIndex = index;\n  }\n  return maxIndex;\n}\n\nComponent({\n  // lifetimes: {\n  //   attached() {\n  //     const query = wx.createSelectorQuery().in(this);\n  //     query\n  //       .select('#PlatformFeeChart')\n  //       .boundingClientRect(res => {\n  //         // res.top; // 这个组件内 #the-id 节点的上边界坐标\n  //         console.log(res);\n  //         this.setData({\n  //           x: res.left,\n  //           y: res.top,\n  //         });\n  //       })\n  //       .exec();\n  //   },\n  // },\n\n  properties: {\n    dataList: {\n      type: Array,\n      value: [],\n      observer(newVal) {\n        if (platforFeeChart) {\n          platforFeeChart.changeData(newVal);\n        } else {\n          setTimeout(() => {\n            platforFeeChart.changeData(newVal);\n          }, 1000);\n        }\n        if (platforFeeChart) {\n          let index = findMaxIndex(newVal, 'totalMoney');\n          if (index !== -1) {\n            let item = newVal[index];\n            const point = platforFeeChart.getPosition(item);\n            platforFeeChart.showTooltip(point);\n          }\n        }\n      },\n    },\n    month: {\n      type: String,\n      value: '',\n      observer(newVal) {\n        month = newVal;\n      },\n    },\n  },\n  data: {\n    opts: {\n      onInit: initChart,\n    },\n  },\n  methods: {\n    clickHandle(e) {\n      console.log(e);\n      const { changedTouches } = e.detail;\n\n      let x = 0;\n      let y = 0;\n      if (changedTouches && changedTouches.length) {\n        x = changedTouches[0].x;\n        y = changedTouches[0].y;\n      }\n      const objArr = platforFeeChart.getSnapRecords({ x, y });\n      if (objArr.length) this.triggerEvent('selectedData', objArr[0]._origin);\n    },\n  },\n});\n"]}
\ No newline at end of file \ No newline at end of file
miniprogram/pages/components/PlatformFeeChart/PlatformFeeChart.ts
...@@ -117,13 +117,13 @@ Component({ ...@@ -117,13 +117,13 @@ Component({
methods: { methods: {
clickHandle(e) { clickHandle(e) {
console.log(e); console.log(e);
const { touches } = e.detail; const { changedTouches } = e.detail;
let x = 0; let x = 0;
let y = 0; let y = 0;
if (touches && touches.length) { if (changedTouches && changedTouches.length) {
x = touches[0].x; x = changedTouches[0].x;
y = touches[0].y; y = changedTouches[0].y;
} }
const objArr = platforFeeChart.getSnapRecords({ x, y }); const objArr = platforFeeChart.getSnapRecords({ x, y });
if (objArr.length) this.triggerEvent('selectedData', objArr[0]._origin); if (objArr.length) this.triggerEvent('selectedData', objArr[0]._origin);
......
miniprogram/pages/components/PlatformFeeChart/PlatformFeeChart.wxml
<!-- pages/components/PlatformFeeChart/PlatformFeeChart.wxml --> <!-- pages/components/PlatformFeeChart/PlatformFeeChart.wxml -->
<ff-canvas id="PlatformFeeChart" canvas-id="PlatformFeeChart" opts="{{ opts }}" bindcanvastouch="clickHandle" /> <ff-canvas id="PlatformFeeChart" canvas-id="PlatformFeeChart" opts="{{ opts }}" bindcanvastouchend="clickHandle" />
\ No newline at end of file \ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment