Skip to content

W
wx-boss
Commit baa41289 by 姜雷
Options

Merge branch 'develop' into test

parents 126761d2 6a3e6895
Showing with 6 additions and 6 deletions
miniprogram/pages/components/PayTypeChart/PayTypeChart.js
...@@ -58,10 +58,10 @@ function initChart(canvas, width, height, F2) { ...@@ -58,10 +58,10 @@ function initChart(canvas, width, height, F2) {
var coord = paytypeChart.get('coord'); var coord = paytypeChart.get('coord');
frontPlot.addShape('sector', { frontPlot.addShape('sector', {
attrs: { attrs: {
x: coord.center.x - coord.circleRadius - coord.start.x + coord.endAngle, x: coord.circleRadius * (1 + coord.innerRadius) + coord.endAngle,
y: coord.center.y, y: coord.center.y,
r: 0, r: 0,
r0: coord.circleRadius * coord.innerRadius, r0: coord.circleRadius * coord.innerRadius * 1.1,
fill: '#fff', fill: '#fff',
}, },
}); });
...@@ -110,4 +110,4 @@ Component({ ...@@ -110,4 +110,4 @@ Component({
}, },
}, },
}); });
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"PayTypeChart.js","sourceRoot":"","sources":["PayTypeChart.ts"],"names":[],"mappings":"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","sourcesContent":["import { formatPrice } from '../../../utils/util';\n\n// pages/components/PayTypeChart/PayTypeChart.js\nlet paytypeChart = null;\nlet month = '';\nconst colorMap = {\n  aimi: '#EB7E59',\n  bean: '#13C2C2',\n  discount: '#FACC14',\n  online: '#1890FF',\n};\n\nfunction initChart(canvas, width, height, F2) {\n  const data = [];\n  paytypeChart = new F2.Chart({\n    el: canvas,\n    width,\n    height,\n  });\n\n  paytypeChart.source(data, {\n    days: {\n      min: 1,\n      max: 31,\n    },\n  });\n  paytypeChart.tooltip({\n    showItemMarker: false,\n    background: {\n      radius: 2,\n      fill: '#f166fd',\n      padding: [6, 10],\n    },\n    onShow(ev) {\n      const { items } = ev;\n      items[0].name = '';\n      items[0].value = month + '-' + items[0].title;\n      items[1].name = '';\n      items[1].value = items[1].value + '元';\n    },\n  });\n\n  paytypeChart.coord('polar', {\n    transposed: true,\n    innerRadius: 0.5,\n    radius: 0.9,\n  });\n  paytypeChart.legend({\n    position: 'right',\n    marker: 'square',\n  });\n  paytypeChart.tooltip(false);\n  paytypeChart\n    .interval()\n    .position('a*count')\n    .color('key', ['#EB7E59', '#13C2C2', '#FACC14', '#1890FF'])\n    .adjust('stack');\n  paytypeChart.axis(false);\n  paytypeChart.render();\n\n  // 绘制内阴影\n  const frontPlot = paytypeChart.get('frontPlot');\n  const coord = paytypeChart.get('coord'); // 获取坐标系对象\n  frontPlot.addShape('sector', {\n    attrs: {\n      x: coord.center.x - coord.circleRadius - coord.start.x + coord.endAngle,\n      y: coord.center.y,\n      r: 0, // 全半径\n      r0: coord.circleRadius * coord.innerRadius,\n      fill: '#fff',\n    },\n  });\n  paytypeChart.get('canvas').draw();\n  console.log('coord', coord);\n\n  return paytypeChart;\n}\n\nComponent({\n  properties: {\n    dataList: {\n      type: Array,\n      value: [],\n      observer(newVal) {\n        paytypeChart &&\n          paytypeChart.legend({\n            position: 'right',\n            marker: 'square',\n            itemFormatter: val => {\n              let item = newVal.find(item => item.key === val);\n              if (item) {\n                let name = item.name;\n                if (item && item.name.length < 4) {\n                  name += '\\xa0\\xa0\\xa0';\n                }\n                return name + '   ' + formatPrice(item.count);\n              } else {\n                return '';\n              }\n            },\n            // custom: true,\n            // items: newVal.map(item => ({\n            //   name: item.name,\n            //   value: ' ' + formatPrice(item.count),\n            //   marker: {\n            //     symbol: 'square',\n            //     fill: colorMap[item.key],\n            //     radius: 4,\n            //   },\n            // })),\n          });\n        paytypeChart && paytypeChart.changeData(newVal);\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});\n"]} //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"PayTypeChart.js","sourceRoot":"","sources":["PayTypeChart.ts"],"names":[],"mappings":"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","sourcesContent":["import { formatPrice } from '../../../utils/util';\n\n// pages/components/PayTypeChart/PayTypeChart.js\nlet paytypeChart = null;\nlet month = '';\nconst colorMap = {\n  aimi: '#EB7E59',\n  bean: '#13C2C2',\n  discount: '#FACC14',\n  online: '#1890FF',\n};\n\nfunction initChart(canvas, width, height, F2) {\n  const data = [];\n  paytypeChart = new F2.Chart({\n    el: canvas,\n    width,\n    height,\n  });\n\n  paytypeChart.source(data, {\n    days: {\n      min: 1,\n      max: 31,\n    },\n  });\n  paytypeChart.tooltip({\n    showItemMarker: false,\n    background: {\n      radius: 2,\n      fill: '#f166fd',\n      padding: [6, 10],\n    },\n    onShow(ev) {\n      const { items } = ev;\n      items[0].name = '';\n      items[0].value = month + '-' + items[0].title;\n      items[1].name = '';\n      items[1].value = items[1].value + '元';\n    },\n  });\n\n  paytypeChart.coord('polar', {\n    transposed: true,\n    innerRadius: 0.5,\n    radius: 0.9,\n  });\n  paytypeChart.legend({\n    position: 'right',\n    marker: 'square',\n  });\n  paytypeChart.tooltip(false);\n  paytypeChart\n    .interval()\n    .position('a*count')\n    .color('key', ['#EB7E59', '#13C2C2', '#FACC14', '#1890FF'])\n    .adjust('stack');\n  paytypeChart.axis(false);\n  paytypeChart.render();\n\n  // 绘制内阴影\n  const frontPlot = paytypeChart.get('frontPlot');\n  const coord = paytypeChart.get('coord'); // 获取坐标系对象\n  frontPlot.addShape('sector', {\n    attrs: {\n      x: coord.circleRadius * (1 + coord.innerRadius) + coord.endAngle,\n      y: coord.center.y,\n      r: 0, // 全半径\n      r0: coord.circleRadius * coord.innerRadius * 1.1,\n      fill: '#fff',\n    },\n  });\n  paytypeChart.get('canvas').draw();\n  console.log('coord', coord);\n\n  return paytypeChart;\n}\n\nComponent({\n  properties: {\n    dataList: {\n      type: Array,\n      value: [],\n      observer(newVal) {\n        paytypeChart &&\n          paytypeChart.legend({\n            position: 'right',\n            marker: 'square',\n            itemFormatter: val => {\n              let item = newVal.find(item => item.key === val);\n              if (item) {\n                let name = item.name;\n                if (item && item.name.length < 4) {\n                  name += '\\xa0\\xa0\\xa0';\n                }\n                return name + '   ' + formatPrice(item.count);\n              } else {\n                return '';\n              }\n            },\n            // custom: true,\n            // items: newVal.map(item => ({\n            //   name: item.name,\n            //   value: ' ' + formatPrice(item.count),\n            //   marker: {\n            //     symbol: 'square',\n            //     fill: colorMap[item.key],\n            //     radius: 4,\n            //   },\n            // })),\n          });\n        paytypeChart && paytypeChart.changeData(newVal);\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});\n"]}
\ No newline at end of file \ No newline at end of file
miniprogram/pages/components/PayTypeChart/PayTypeChart.ts
...@@ -63,10 +63,10 @@ function initChart(canvas, width, height, F2) { ...@@ -63,10 +63,10 @@ function initChart(canvas, width, height, F2) {
const coord = paytypeChart.get('coord'); // 获取坐标系对象 const coord = paytypeChart.get('coord'); // 获取坐标系对象
frontPlot.addShape('sector', { frontPlot.addShape('sector', {
attrs: { attrs: {
x: coord.center.x - coord.circleRadius - coord.start.x + coord.endAngle, x: coord.circleRadius * (1 + coord.innerRadius) + coord.endAngle,
y: coord.center.y, y: coord.center.y,
r: 0, // 全半径 r: 0, // 全半径
r0: coord.circleRadius * coord.innerRadius, r0: coord.circleRadius * coord.innerRadius * 1.1,
fill: '#fff', fill: '#fff',
}, },
}); });
......
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