修改消费视图

miniprogram/pages/components/PayTypeChart/PayTypeChart.js

@@ -15,6 +15,7 @@ function initChart(canvas, width, height, F2) {
         el: canvas,
         width: width,
         height: height,
+        padding: ['auto', 'auto', 50, 'auto'],
     });
     paytypeChart.source(data, {
         days: {
@@ -30,43 +31,32 @@ function initChart(canvas, width, height, F2) {
             padding: [6, 10],
         },
         onShow: function (ev) {
+            console.log(ev);
             var items = ev.items;
-            items[0].name = '';
-            items[0].value = month + '-' + items[0].title;
-            items[1].name = '';
-            items[1].value = items[1].value + '元';
+            items[0].name = items[0].title;
+            items[0].value = util_1.formatPrice(Number(items[0].value));
         },
     });
-    paytypeChart.coord('polar', {
-        transposed: true,
-        innerRadius: 0.5,
-        radius: 0.9,
-    });
     paytypeChart.legend({
         position: 'right',
         marker: 'square',
+        onClick: function (ev) {
+            var tooltip = paytypeChart.get('tooltip');
+            console.log(ev, tooltip);
+        },
     });
-    paytypeChart.tooltip(false);
     paytypeChart
         .interval()
-        .position('a*count')
-        .color('key', ['#EB7E59', '#13C2C2', '#FACC14', '#1890FF'])
-        .adjust('stack');
-    paytypeChart.axis(false);
-    paytypeChart.render();
-    var frontPlot = paytypeChart.get('frontPlot');
-    var coord = paytypeChart.get('coord');
-    frontPlot.addShape('sector', {
-        attrs: {
-            x: coord.circleRadius * (1 + coord.innerRadius) + coord.endAngle,
-            y: coord.center.y,
-            r: 0,
-            r0: coord.circleRadius * coord.innerRadius * 1.1,
-            fill: '#fff',
+        .position('name*count')
+        .color('name', ['#EB7E59', '#13C2C2', '#FACC14', '#1890FF']);
+    paytypeChart.axis('name', {
+        label: {
+            rotate: -Math.PI / 4,
+            textAlign: 'end',
+            textBaseline: 'middle',
         },
     });
-    paytypeChart.get('canvas').draw();
-    console.log('coord', coord);
+    paytypeChart.render();
     return paytypeChart;
 }
 Component({
@@ -75,24 +65,6 @@ Component({
             type: Array,
             value: [],
             observer: function (newVal) {
-                paytypeChart &&
-                    paytypeChart.legend({
-                        position: 'right',
-                        marker: 'square',
-                        itemFormatter: function (val) {
-                            var item = newVal.find(function (item) { return item.key === val; });
-                            if (item) {
-                                var name_1 = item.name;
-                                if (item && item.name.length < 4) {
-                                    name_1 += '\xa0\xa0\xa0';
-                                }
-                                return name_1 + '   ' + util_1.formatPrice(item.count);
-                            }
-                            else {
-                                return '';
-                            }
-                        },
-                    });
                 paytypeChart && paytypeChart.changeData(newVal);
             },
         },
@@ -110,4 +82,4 @@ Component({
         },
     },
 });
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"PayTypeChart.js","sourceRoot":"","sources":["PayTypeChart.ts"],"names":[],"mappings":";;AAAA,4CAAkD;AAGlD,IAAI,YAAY,GAAG,IAAI,CAAC;AACxB,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,QAAQ,GAAG;IACf,IAAI,EAAE,SAAS;IACf,IAAI,EAAE,SAAS;IACf,QAAQ,EAAE,SAAS;IACnB,MAAM,EAAE,SAAS;CAClB,CAAC;AAEF,mBAAmB,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,EAAE;IAC1C,IAAM,IAAI,GAAG,EAAE,CAAC;IAChB,YAAY,GAAG,IAAI,EAAE,CAAC,KAAK,CAAC;QAC1B,EAAE,EAAE,MAAM;QACV,KAAK,OAAA;QACL,MAAM,QAAA;KACP,CAAC,CAAC;IAEH,YAAY,CAAC,MAAM,CAAC,IAAI,EAAE;QACxB,IAAI,EAAE;YACJ,GAAG,EAAE,CAAC;YACN,GAAG,EAAE,EAAE;SACR;KACF,CAAC,CAAC;IACH,YAAY,CAAC,OAAO,CAAC;QACnB,cAAc,EAAE,KAAK;QACrB,UAAU,EAAE;YACV,MAAM,EAAE,CAAC;YACT,IAAI,EAAE,SAAS;YACf,OAAO,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC;SACjB;QACD,MAAM,YAAC,EAAE;YACC,IAAA,gBAAK,CAAQ;YACrB,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,GAAG,EAAE,CAAC;YACnB,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,GAAG,KAAK,GAAG,GAAG,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC;YAC9C,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,GAAG,EAAE,CAAC;YACnB,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,GAAG,GAAG,CAAC;QACxC,CAAC;KACF,CAAC,CAAC;IAEH,YAAY,CAAC,KAAK,CAAC,OAAO,EAAE;QAC1B,UAAU,EAAE,IAAI;QAChB,WAAW,EAAE,GAAG;QAChB,MAAM,EAAE,GAAG;KACZ,CAAC,CAAC;IACH,YAAY,CAAC,MAAM,CAAC;QAClB,QAAQ,EAAE,OAAO;QACjB,MAAM,EAAE,QAAQ;KACjB,CAAC,CAAC;IACH,YAAY,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;IAC5B,YAAY;SACT,QAAQ,EAAE;SACV,QAAQ,CAAC,SAAS,CAAC;SACnB,KAAK,CAAC,KAAK,EAAE,CAAC,SAAS,EAAE,SAAS,EAAE,SAAS,EAAE,SAAS,CAAC,CAAC;SAC1D,MAAM,CAAC,OAAO,CAAC,CAAC;IACnB,YAAY,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IACzB,YAAY,CAAC,MAAM,EAAE,CAAC;IAGtB,IAAM,SAAS,GAAG,YAAY,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;IAChD,IAAM,KAAK,GAAG,YAAY,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;IACxC,SAAS,CAAC,QAAQ,CAAC,QAAQ,EAAE;QAC3B,KAAK,EAAE;YACL,CAAC,EAAE,KAAK,CAAC,YAAY,GAAG,CAAC,CAAC,GAAG,KAAK,CAAC,WAAW,CAAC,GAAG,KAAK,CAAC,QAAQ;YAChE,CAAC,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC;YACjB,CAAC,EAAE,CAAC;YACJ,EAAE,EAAE,KAAK,CAAC,YAAY,GAAG,KAAK,CAAC,WAAW,GAAG,GAAG;YAChD,IAAI,EAAE,MAAM;SACb;KACF,CAAC,CAAC;IACH,YAAY,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC,IAAI,EAAE,CAAC;IAClC,OAAO,CAAC,GAAG,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;IAE5B,MAAM,CAAC,YAAY,CAAC;AACtB,CAAC;AAED,SAAS,CAAC;IACR,UAAU,EAAE;QACV,QAAQ,EAAE;YACR,IAAI,EAAE,KAAK;YACX,KAAK,EAAE,EAAE;YACT,QAAQ,YAAC,MAAM;gBACb,YAAY;oBACV,YAAY,CAAC,MAAM,CAAC;wBAClB,QAAQ,EAAE,OAAO;wBACjB,MAAM,EAAE,QAAQ;wBAChB,aAAa,EAAE,UAAA,GAAG;4BAChB,IAAI,IAAI,GAAG,MAAM,CAAC,IAAI,CAAC,UAAA,IAAI,IAAI,OAAA,IAAI,CAAC,GAAG,KAAK,GAAG,EAAhB,CAAgB,CAAC,CAAC;4BACjD,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC;gCACT,IAAI,MAAI,GAAG,IAAI,CAAC,IAAI,CAAC;gCACrB,EAAE,CAAC,CAAC,IAAI,IAAI,IAAI,CAAC,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC;oCACjC,MAAI,IAAI,cAAc,CAAC;gCACzB,CAAC;gCACD,MAAM,CAAC,MAAI,GAAG,KAAK,GAAG,kBAAW,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;4BAChD,CAAC;4BAAC,IAAI,CAAC,CAAC;gCACN,MAAM,CAAC,EAAE,CAAC;4BACZ,CAAC;wBACH,CAAC;qBAWF,CAAC,CAAC;gBACL,YAAY,IAAI,YAAY,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC;YAClD,CAAC;SACF;QACD,KAAK,EAAE;YACL,IAAI,EAAE,MAAM;YACZ,KAAK,EAAE,EAAE;YACT,QAAQ,YAAC,MAAM;gBACb,KAAK,GAAG,MAAM,CAAC;YACjB,CAAC;SACF;KACF;IACD,IAAI,EAAE;QACJ,IAAI,EAAE;YACJ,MAAM,EAAE,SAAS;SAClB;KACF;CACF,CAAC,CAAC","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"]}
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiUGF5VHlwZUNoYXJ0LmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiUGF5VHlwZUNoYXJ0LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7O0FBQUEsNENBQWtEO0FBR2xELElBQUksWUFBWSxHQUFHLElBQUksQ0FBQztBQUN4QixJQUFJLEtBQUssR0FBRyxFQUFFLENBQUM7QUFDZixJQUFNLFFBQVEsR0FBRztJQUNmLElBQUksRUFBRSxTQUFTO0lBQ2YsSUFBSSxFQUFFLFNBQVM7SUFDZixRQUFRLEVBQUUsU0FBUztJQUNuQixNQUFNLEVBQUUsU0FBUztDQUNsQixDQUFDO0FBRUYsbUJBQW1CLE1BQU0sRUFBRSxLQUFLLEVBQUUsTUFBTSxFQUFFLEVBQUU7SUFDMUMsSUFBTSxJQUFJLEdBQUcsRUFBRSxDQUFDO0lBQ2hCLFlBQVksR0FBRyxJQUFJLEVBQUUsQ0FBQyxLQUFLLENBQUM7UUFDMUIsRUFBRSxFQUFFLE1BQU07UUFDVixLQUFLLE9BQUE7UUFDTCxNQUFNLFFBQUE7UUFDTixPQUFPLEVBQUUsQ0FBQyxNQUFNLEVBQUUsTUFBTSxFQUFFLEVBQUUsRUFBRSxNQUFNLENBQUM7S0FDdEMsQ0FBQyxDQUFDO0lBRUgsWUFBWSxDQUFDLE1BQU0sQ0FBQyxJQUFJLEVBQUU7UUFDeEIsSUFBSSxFQUFFO1lBQ0osR0FBRyxFQUFFLENBQUM7WUFDTixHQUFHLEVBQUUsRUFBRTtTQUNSO0tBQ0YsQ0FBQyxDQUFDO0lBQ0gsWUFBWSxDQUFDLE9BQU8sQ0FBQztRQUNuQixjQUFjLEVBQUUsS0FBSztRQUNyQixVQUFVLEVBQUU7WUFDVixNQUFNLEVBQUUsQ0FBQztZQUNULElBQUksRUFBRSxTQUFTO1lBQ2YsT0FBTyxFQUFFLENBQUMsQ0FBQyxFQUFFLEVBQUUsQ0FBQztTQUNqQjtRQUNELE1BQU0sWUFBQyxFQUFFO1lBQ1AsT0FBTyxDQUFDLEdBQUcsQ0FBQyxFQUFFLENBQUMsQ0FBQztZQUNSLElBQUEsZ0JBQUssQ0FBUTtZQUNyQixLQUFLLENBQUMsQ0FBQyxDQUFDLENBQUMsSUFBSSxHQUFHLEtBQUssQ0FBQyxDQUFDLENBQUMsQ0FBQyxLQUFLLENBQUM7WUFDL0IsS0FBSyxDQUFDLENBQUMsQ0FBQyxDQUFDLEtBQUssR0FBRyxrQkFBVyxDQUFDLE1BQU0sQ0FBQyxLQUFLLENBQUMsQ0FBQyxDQUFDLENBQUMsS0FBSyxDQUFDLENBQUMsQ0FBQztRQUd2RCxDQUFDO0tBQ0YsQ0FBQyxDQUFDO0lBT0gsWUFBWSxDQUFDLE1BQU0sQ0FBQztRQUNsQixRQUFRLEVBQUUsT0FBTztRQUNqQixNQUFNLEVBQUUsUUFBUTtRQUNoQixPQUFPLEVBQUUsVUFBQSxFQUFFO1lBQ1QsSUFBTSxPQUFPLEdBQUcsWUFBWSxDQUFDLEdBQUcsQ0FBQyxTQUFTLENBQUMsQ0FBQztZQUM1QyxPQUFPLENBQUMsR0FBRyxDQUFDLEVBQUUsRUFBRSxPQUFPLENBQUMsQ0FBQztRQUUzQixDQUFDO0tBQ0YsQ0FBQyxDQUFDO0lBQ0gsWUFBWTtTQUNULFFBQVEsRUFBRTtTQUNWLFFBQVEsQ0FBQyxZQUFZLENBQUM7U0FDdEIsS0FBSyxDQUFDLE1BQU0sRUFBRSxDQUFDLFNBQVMsRUFBRSxTQUFTLEVBQUUsU0FBUyxFQUFFLFNBQVMsQ0FBQyxDQUFDLENBQUM7SUFDL0QsWUFBWSxDQUFDLElBQUksQ0FBQyxNQUFNLEVBQUU7UUFDeEIsS0FBSyxFQUFFO1lBQ0wsTUFBTSxFQUFFLENBQUMsSUFBSSxDQUFDLEVBQUUsR0FBRyxDQUFDO1lBQ3BCLFNBQVMsRUFBRSxLQUFLO1lBQ2hCLFlBQVksRUFBRSxRQUFRO1NBQ3ZCO0tBQ0YsQ0FBQyxDQUFDO0lBQ0gsWUFBWSxDQUFDLE1BQU0sRUFBRSxDQUFDO0lBaUJ0QixNQUFNLENBQUMsWUFBWSxDQUFDO0FBQ3RCLENBQUM7QUFFRCxTQUFTLENBQUM7SUFDUixVQUFVLEVBQUU7UUFDVixRQUFRLEVBQUU7WUFDUixJQUFJLEVBQUUsS0FBSztZQUNYLEtBQUssRUFBRSxFQUFFO1lBQ1QsUUFBUSxZQUFDLE1BQU07Z0JBa0JiLFlBQVksSUFBSSxZQUFZLENBQUMsVUFBVSxDQUFDLE1BQU0sQ0FBQyxDQUFDO1lBQ2xELENBQUM7U0FDRjtRQUNELEtBQUssRUFBRTtZQUNMLElBQUksRUFBRSxNQUFNO1lBQ1osS0FBSyxFQUFFLEVBQUU7WUFDVCxRQUFRLFlBQUMsTUFBTTtnQkFDYixLQUFLLEdBQUcsTUFBTSxDQUFDO1lBQ2pCLENBQUM7U0FDRjtLQUNGO0lBQ0QsSUFBSSxFQUFFO1FBQ0osSUFBSSxFQUFFO1lBQ0osTUFBTSxFQUFFLFNBQVM7U0FDbEI7S0FDRjtDQUNGLENBQUMsQ0FBQyIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7IGZvcm1hdFByaWNlIH0gZnJvbSAnLi4vLi4vLi4vdXRpbHMvdXRpbCc7XG5cbi8vIHBhZ2VzL2NvbXBvbmVudHMvUGF5VHlwZUNoYXJ0L1BheVR5cGVDaGFydC5qc1xubGV0IHBheXR5cGVDaGFydCA9IG51bGw7XG5sZXQgbW9udGggPSAnJztcbmNvbnN0IGNvbG9yTWFwID0ge1xuICBhaW1pOiAnI0VCN0U1OScsXG4gIGJlYW46ICcjMTNDMkMyJyxcbiAgZGlzY291bnQ6ICcjRkFDQzE0JyxcbiAgb25saW5lOiAnIzE4OTBGRicsXG59O1xuXG5mdW5jdGlvbiBpbml0Q2hhcnQoY2FudmFzLCB3aWR0aCwgaGVpZ2h0LCBGMikge1xuICBjb25zdCBkYXRhID0gW107XG4gIHBheXR5cGVDaGFydCA9IG5ldyBGMi5DaGFydCh7XG4gICAgZWw6IGNhbnZhcyxcbiAgICB3aWR0aCxcbiAgICBoZWlnaHQsXG4gICAgcGFkZGluZzogWydhdXRvJywgJ2F1dG8nLCA1MCwgJ2F1dG8nXSxcbiAgfSk7XG5cbiAgcGF5dHlwZUNoYXJ0LnNvdXJjZShkYXRhLCB7XG4gICAgZGF5czoge1xuICAgICAgbWluOiAxLFxuICAgICAgbWF4OiAzMSxcbiAgICB9LFxuICB9KTtcbiAgcGF5dHlwZUNoYXJ0LnRvb2x0aXAoe1xuICAgIHNob3dJdGVtTWFya2VyOiBmYWxzZSxcbiAgICBiYWNrZ3JvdW5kOiB7XG4gICAgICByYWRpdXM6IDIsXG4gICAgICBmaWxsOiAnI2YxNjZmZCcsXG4gICAgICBwYWRkaW5nOiBbNiwgMTBdLFxuICAgIH0sXG4gICAgb25TaG93KGV2KSB7XG4gICAgICBjb25zb2xlLmxvZyhldik7XG4gICAgICBjb25zdCB7IGl0ZW1zIH0gPSBldjtcbiAgICAgIGl0ZW1zWzBdLm5hbWUgPSBpdGVtc1swXS50aXRsZTtcbiAgICAgIGl0ZW1zWzBdLnZhbHVlID0gZm9ybWF0UHJpY2UoTnVtYmVyKGl0ZW1zWzBdLnZhbHVlKSk7XG4gICAgICAvLyBpdGVtc1sxXS5uYW1lID0gJyc7XG4gICAgICAvLyBpdGVtc1sxXS52YWx1ZSA9IGl0ZW1zWzFdLnZhbHVlICsgJ+WFgyc7XG4gICAgfSxcbiAgfSk7XG5cbiAgLy8gcGF5dHlwZUNoYXJ0LmNvb3JkKCdwb2xhcicsIHtcbiAgLy8gICB0cmFuc3Bvc2VkOiB0cnVlLFxuICAvLyAgIGlubmVyUmFkaXVzOiAwLjUsXG4gIC8vICAgcmFkaXVzOiAwLjksXG4gIC8vIH0pO1xuICBwYXl0eXBlQ2hhcnQubGVnZW5kKHtcbiAgICBwb3NpdGlvbjogJ3JpZ2h0JyxcbiAgICBtYXJrZXI6ICdzcXVhcmUnLFxuICAgIG9uQ2xpY2s6IGV2ID0+IHtcbiAgICAgIGNvbnN0IHRvb2x0aXAgPSBwYXl0eXBlQ2hhcnQuZ2V0KCd0b29sdGlwJyk7XG4gICAgICBjb25zb2xlLmxvZyhldiwgdG9vbHRpcCk7XG4gICAgICAvLyBwYXl0eXBlQ2hhcnQuXG4gICAgfSxcbiAgfSk7XG4gIHBheXR5cGVDaGFydFxuICAgIC5pbnRlcnZhbCgpXG4gICAgLnBvc2l0aW9uKCduYW1lKmNvdW50JylcbiAgICAuY29sb3IoJ25hbWUnLCBbJyNFQjdFNTknLCAnIzEzQzJDMicsICcjRkFDQzE0JywgJyMxODkwRkYnXSk7XG4gIHBheXR5cGVDaGFydC5heGlzKCduYW1lJywge1xuICAgIGxhYmVsOiB7XG4gICAgICByb3RhdGU6IC1NYXRoLlBJIC8gNCxcbiAgICAgIHRleHRBbGlnbjogJ2VuZCcsXG4gICAgICB0ZXh0QmFzZWxpbmU6ICdtaWRkbGUnLFxuICAgIH0sXG4gIH0pO1xuICBwYXl0eXBlQ2hhcnQucmVuZGVyKCk7XG5cbiAgLy8g57uY5Yi25YaF6Zi05b2xXG4gIC8vIGNvbnN0IGZyb250UGxvdCA9IHBheXR5cGVDaGFydC5nZXQoJ2Zyb250UGxvdCcpO1xuICAvLyBjb25zdCBjb29yZCA9IHBheXR5cGVDaGFydC5nZXQoJ2Nvb3JkJyk7IC8vIOiOt+WPluWdkOagh+ezu+WvueixoVxuICAvLyBmcm9udFBsb3QuYWRkU2hhcGUoJ3NlY3RvcicsIHtcbiAgLy8gICBhdHRyczoge1xuICAvLyAgICAgeDogY29vcmQuY2lyY2xlUmFkaXVzLFxuICAvLyAgICAgeTogY29vcmQuY2VudGVyLnksXG4gIC8vICAgICByOiBjb29yZC5jaXJjbGVSYWRpdXMgKiBjb29yZC5pbm5lclJhZGl1cyAqIDEuMSwgLy8g5YWo5Y2K5b6EXG4gIC8vICAgICByMDogMCxcbiAgLy8gICAgIGZpbGw6ICcjMDAwJyxcbiAgLy8gICB9LFxuICAvLyB9KTtcbiAgLy8gcGF5dHlwZUNoYXJ0LmdldCgnY2FudmFzJykuZHJhdygpO1xuICAvLyBjb25zb2xlLmxvZygnY29vcmQnLCBjb29yZCk7XG5cbiAgcmV0dXJuIHBheXR5cGVDaGFydDtcbn1cblxuQ29tcG9uZW50KHtcbiAgcHJvcGVydGllczoge1xuICAgIGRhdGFMaXN0OiB7XG4gICAgICB0eXBlOiBBcnJheSxcbiAgICAgIHZhbHVlOiBbXSxcbiAgICAgIG9ic2VydmVyKG5ld1ZhbCkge1xuICAgICAgICAvLyBwYXl0eXBlQ2hhcnQgJiZcbiAgICAgICAgLy8gICBwYXl0eXBlQ2hhcnQubGVnZW5kKHtcbiAgICAgICAgLy8gICAgIHBvc2l0aW9uOiAncmlnaHQnLFxuICAgICAgICAvLyAgICAgbWFya2VyOiAnc3F1YXJlJyxcbiAgICAgICAgLy8gICAgIGl0ZW1Gb3JtYXR0ZXI6IHZhbCA9PiB7XG4gICAgICAgIC8vICAgICAgIGxldCBpdGVtID0gbmV3VmFsLmZpbmQoaXRlbSA9PiBpdGVtLmtleSA9PT0gdmFsKTtcbiAgICAgICAgLy8gICAgICAgaWYgKGl0ZW0pIHtcbiAgICAgICAgLy8gICAgICAgICBsZXQgbmFtZSA9IGl0ZW0ubmFtZTtcbiAgICAgICAgLy8gICAgICAgICBpZiAoaXRlbSAmJiBpdGVtLm5hbWUubGVuZ3RoIDwgNCkge1xuICAgICAgICAvLyAgICAgICAgICAgbmFtZSArPSAnXFx4YTBcXHhhMFxceGEwJztcbiAgICAgICAgLy8gICAgICAgICB9XG4gICAgICAgIC8vICAgICAgICAgcmV0dXJuIG5hbWUgKyAnICAgJyArIGZvcm1hdFByaWNlKGl0ZW0uY291bnQpO1xuICAgICAgICAvLyAgICAgICB9IGVsc2Uge1xuICAgICAgICAvLyAgICAgICAgIHJldHVybiAnJztcbiAgICAgICAgLy8gICAgICAgfVxuICAgICAgICAvLyAgICAgfSxcbiAgICAgICAgLy8gICB9KTtcbiAgICAgICAgcGF5dHlwZUNoYXJ0ICYmIHBheXR5cGVDaGFydC5jaGFuZ2VEYXRhKG5ld1ZhbCk7XG4gICAgICB9LFxuICAgIH0sXG4gICAgbW9udGg6IHtcbiAgICAgIHR5cGU6IFN0cmluZyxcbiAgICAgIHZhbHVlOiAnJyxcbiAgICAgIG9ic2VydmVyKG5ld1ZhbCkge1xuICAgICAgICBtb250aCA9IG5ld1ZhbDtcbiAgICAgIH0sXG4gICAgfSxcbiAgfSxcbiAgZGF0YToge1xuICAgIG9wdHM6IHtcbiAgICAgIG9uSW5pdDogaW5pdENoYXJ0LFxuICAgIH0sXG4gIH0sXG59KTtcbiJdfQ==
\ No newline at end of file

miniprogram/pages/components/PayTypeChart/PayTypeChart.ts

@@ -16,6 +16,7 @@ function initChart(canvas, width, height, F2) {
     el: canvas,
     width,
     height,
+    padding: ['auto', 'auto', 50, 'auto'],
   });
 
   paytypeChart.source(data, {
@@ -32,46 +33,56 @@ function initChart(canvas, width, height, F2) {
       padding: [6, 10],
     },
     onShow(ev) {
+      console.log(ev);
       const { items } = ev;
-      items[0].name = '';
-      items[0].value = month + '-' + items[0].title;
-      items[1].name = '';
-      items[1].value = items[1].value + '元';
+      items[0].name = items[0].title;
+      items[0].value = formatPrice(Number(items[0].value));
+      // items[1].name = '';
+      // items[1].value = items[1].value + '元';
     },
   });
 
-  paytypeChart.coord('polar', {
-    transposed: true,
-    innerRadius: 0.5,
-    radius: 0.9,
-  });
+  // paytypeChart.coord('polar', {
+  //   transposed: true,
+  //   innerRadius: 0.5,
+  //   radius: 0.9,
+  // });
   paytypeChart.legend({
     position: 'right',
     marker: 'square',
+    onClick: ev => {
+      const tooltip = paytypeChart.get('tooltip');
+      console.log(ev, tooltip);
+      // paytypeChart.
+    },
   });
-  paytypeChart.tooltip(false);
   paytypeChart
     .interval()
-    .position('a*count')
-    .color('key', ['#EB7E59', '#13C2C2', '#FACC14', '#1890FF'])
-    .adjust('stack');
-  paytypeChart.axis(false);
+    .position('name*count')
+    .color('name', ['#EB7E59', '#13C2C2', '#FACC14', '#1890FF']);
+  paytypeChart.axis('name', {
+    label: {
+      rotate: -Math.PI / 4,
+      textAlign: 'end',
+      textBaseline: 'middle',
+    },
+  });
   paytypeChart.render();
 
   // 绘制内阴影
-  const frontPlot = paytypeChart.get('frontPlot');
-  const coord = paytypeChart.get('coord'); // 获取坐标系对象
-  frontPlot.addShape('sector', {
-    attrs: {
-      x: coord.circleRadius * (1 + coord.innerRadius) + coord.endAngle,
-      y: coord.center.y,
-      r: 0, // 全半径
-      r0: coord.circleRadius * coord.innerRadius * 1.1,
-      fill: '#fff',
-    },
-  });
-  paytypeChart.get('canvas').draw();
-  console.log('coord', coord);
+  // const frontPlot = paytypeChart.get('frontPlot');
+  // const coord = paytypeChart.get('coord'); // 获取坐标系对象
+  // frontPlot.addShape('sector', {
+  //   attrs: {
+  //     x: coord.circleRadius,
+  //     y: coord.center.y,
+  //     r: coord.circleRadius * coord.innerRadius * 1.1, // 全半径
+  //     r0: 0,
+  //     fill: '#000',
+  //   },
+  // });
+  // paytypeChart.get('canvas').draw();
+  // console.log('coord', coord);
 
   return paytypeChart;
 }
@@ -82,33 +93,23 @@ Component({
       type: Array,
       value: [],
       observer(newVal) {
-        paytypeChart &&
-          paytypeChart.legend({
-            position: 'right',
-            marker: 'square',
-            itemFormatter: val => {
-              let item = newVal.find(item => item.key === val);
-              if (item) {
-                let name = item.name;
-                if (item && item.name.length < 4) {
-                  name += '\xa0\xa0\xa0';
-                }
-                return name + '   ' + formatPrice(item.count);
-              } else {
-                return '';
-              }
-            },
-            // custom: true,
-            // items: newVal.map(item => ({
-            //   name: item.name,
-            //   value: ' ' + formatPrice(item.count),
-            //   marker: {
-            //     symbol: 'square',
-            //     fill: colorMap[item.key],
-            //     radius: 4,
-            //   },
-            // })),
-          });
+        // paytypeChart &&
+        //   paytypeChart.legend({
+        //     position: 'right',
+        //     marker: 'square',
+        //     itemFormatter: val => {
+        //       let item = newVal.find(item => item.key === val);
+        //       if (item) {
+        //         let name = item.name;
+        //         if (item && item.name.length < 4) {
+        //           name += '\xa0\xa0\xa0';
+        //         }
+        //         return name + '   ' + formatPrice(item.count);
+        //       } else {
+        //         return '';
+        //       }
+        //     },
+        //   });
         paytypeChart && paytypeChart.changeData(newVal);
       },
     },