@vyr/echarts 0.0.1 → 0.0.3

package/package.json

@@ -1,22 +1 @@
-{
-  "name": "@vyr/echarts",
-  "version": "0.0.1",
-  "description": "",
-  "main": "./src/index.ts",
-  "author": "",
-  "sideEffects": true,
-  "license": "MIT",
-  "dependencies": {
-    "@vyr/locale": "0.0.1",
-    "@vyr/engine": "0.0.1",
-    "echarts": "^5.5.0"
-  },
-  "files": [
-    "package.json",
-    "src/"
-  ],
-  "vyr": {
-    "type": "universal",
-    "order": 10
-  }
-}
+{"name":"@vyr/echarts","version":"0.0.3","description":"","main":"./src/index.ts","author":"","sideEffects":true,"license":"MIT","dependencies":{"@vyr/locale":"0.0.3","@vyr/engine":"0.0.3","echarts":"^5.5.0"},"files":["package.json","src/"],"vyr":{"type":"universal","order":10}}

package/src/actor/EchartActor.ts

@@ -1,5 +1,5 @@
 import * as echarts from 'echarts'
-import { DatasetDescriptor, HTMLActor, UpdateArgs } from "@vyr/engine";
+import { DatasetDescriptor, HTMLActor } from "@vyr/engine";
 import { EchartDescriptor } from "../descriptor";
 import { ServiceEchartInterpreter } from '../interpreter';
 
@@ -43,7 +43,7 @@ class EchartActor extends HTMLActor {
 
     remove() { }
 
-    getXAxis(descriptor: EchartDescriptor, args: UpdateArgs) {
+    getXAxis(descriptor: EchartDescriptor) {
         const xAxis: AxisOption = {
             show: descriptor.xAxisShow,
             axisLine: descriptor.xAxisLine,
@@ -54,7 +54,7 @@ class EchartActor extends HTMLActor {
         if (descriptor.xAxisType) xAxis.type = descriptor.xAxisType
         return xAxis
     }
-    getYAxis(descriptor: EchartDescriptor, args: UpdateArgs) {
+    getYAxis(descriptor: EchartDescriptor) {
         const yAxis: AxisOption = {
             show: descriptor.yAxisShow,
             axisLine: descriptor.yAxisLine,
@@ -65,7 +65,7 @@ class EchartActor extends HTMLActor {
         if (descriptor.yAxisType) yAxis.type = descriptor.yAxisType
         return yAxis
     }
-    getGrid(descriptor: EchartDescriptor, args: UpdateArgs) {
+    getGrid(descriptor: EchartDescriptor) {
         const grid = {
             show: descriptor.gridShow,
             ...descriptor.gridRect,
@@ -73,7 +73,7 @@ class EchartActor extends HTMLActor {
 
         return grid
     }
-    getLegend(descriptor: EchartDescriptor, args: UpdateArgs) {
+    getLegend(descriptor: EchartDescriptor) {
         const legend = {
             show: descriptor.legendShow,
             type: descriptor.legendType || undefined,
@@ -85,7 +85,7 @@ class EchartActor extends HTMLActor {
         }
         return legend
     }
-    getTooltip(descriptor: EchartDescriptor, args: UpdateArgs) {
+    getTooltip(descriptor: EchartDescriptor) {
         const tooltip = {
             show: descriptor.tooltipShow,
             trigger: descriptor.tooltipTrigger,
@@ -94,7 +94,7 @@ class EchartActor extends HTMLActor {
         return tooltip
     }
 
-    getDataZoom(descriptor: EchartDescriptor, args: UpdateArgs) {
+    getDataZoom(descriptor: EchartDescriptor) {
         const dataZoom = [
             {
                 // 设置滚动条的隐藏或显示
@@ -131,34 +131,34 @@ class EchartActor extends HTMLActor {
         return dataZoom
     }
 
-    setOptions(descriptor: EchartDescriptor, args: UpdateArgs) {
+    setOptions(descriptor: EchartDescriptor) {
         const dimensions: string[] = [descriptor.xAxisModelValue]
         const children: EchartServiceOption[] = []
         const graphics = HTMLActor.getGraphics(this)
         for (const serie of descriptor.children) {
             dimensions.push(serie.modelValue)
             const interpreter = graphics.getInterpreter<ServiceEchartInterpreter>(serie)
-            children.push(interpreter.getService(serie, args))
+            children.push(interpreter.getService(serie))
         }
 
-        const xAxis = this.getXAxis(descriptor, args)
-        const yAxis = this.getYAxis(descriptor, args)
-        const grid = this.getGrid(descriptor, args)
-        const legend = this.getLegend(descriptor, args)
-        const tooltip = this.getTooltip(descriptor, args)
-        const dataZoom = descriptor.scroll.end <= 0 ? undefined : this.getDataZoom(descriptor, args)
+        const xAxis = this.getXAxis(descriptor)
+        const yAxis = this.getYAxis(descriptor)
+        const grid = this.getGrid(descriptor)
+        const legend = this.getLegend(descriptor)
+        const tooltip = this.getTooltip(descriptor)
+        const dataZoom = descriptor.scroll.end <= 0 ? undefined : this.getDataZoom(descriptor)
         const dataset = { dimensions, source: DatasetDescriptor.getCollection(descriptor.dataset) }
 
         this.options = { xAxis, yAxis, grid, legend, tooltip, dataset, dataZoom, series: children }
     }
 
-    update(descriptor: EchartDescriptor, args: UpdateArgs) {
+    update(descriptor: EchartDescriptor) {
         const wrapper = this.getWrapper()
-        this.setHTMLStyle(wrapper, this.getWrapperStyle(descriptor, args))
-        this.setHTMLInteraction(wrapper, descriptor, args)
-        this.setHTMLStyle(this.DOM, this.getLayoutStyle(descriptor, args))
-        this.setStyleClass(this.DOM, this.getStyleClass(descriptor, args))
-        this.setOptions(descriptor, args)
+        this.setHTMLStyle(wrapper, this.getWrapperStyle(descriptor))
+        this.setHTMLInteraction(wrapper, descriptor)
+        this.setHTMLStyle(this.DOM, this.getLayoutStyle(descriptor))
+        this.setStyleClass(this.DOM, this.getStyleClass(descriptor))
+        this.setOptions(descriptor)
         this.instance.clear()
         this.instance.setOption(this.options)
         const rect = wrapper.getBoundingClientRect()

package/src/interpreter/BarServiceEchartInterpreter.ts

@@ -1,12 +1,11 @@
-import { UpdateArgs } from "@vyr/engine";
 import { BarServiceEchartDescriptor } from "../descriptor";
 import { ServiceEchartInterpreter } from "./ServiceEchartInterpreter";
 
 class BarServiceEchartInterpreter extends ServiceEchartInterpreter {
     static type = BarServiceEchartDescriptor.type
 
-    getService(descriptor: BarServiceEchartDescriptor, args: UpdateArgs) {
-        const service = super.getService(descriptor, args)
+    getService(descriptor: BarServiceEchartDescriptor) {
+        const service = super.getService(descriptor)
 
         return {
             ...service,

package/src/interpreter/EchartInterpreter.ts

@@ -1,41 +1,41 @@
-import { Descriptor, HTMLActor, Interpreter, PickupObject, UpdateArgs } from "@vyr/engine";
+import { Descriptor, HTMLActor, Interpreter, PickupObject } from "@vyr/engine";
 import { EchartDescriptor } from "../descriptor";
 import { EchartActor } from "../actor";
 
 class EchartInterpreter extends Interpreter {
     static type = EchartDescriptor.type
 
-    protected createActor(descriptor: EchartDescriptor, args: UpdateArgs) {
+    protected createActor(descriptor: EchartDescriptor) {
         return new EchartActor(descriptor.uuid)
     }
 
-    update(descriptor: EchartDescriptor, args: UpdateArgs) {
-        super.update(descriptor, args)
-        
-        const actor = this.getActor<EchartActor>(descriptor, args)
-        actor.update(descriptor, args)
+    update(descriptor: EchartDescriptor) {
+        super.update(descriptor)
+
+        const actor = this.getActor<EchartActor>(descriptor)
+        actor.update(descriptor)
     }
 
-    mount(descriptor: EchartDescriptor, args: UpdateArgs, parentInterpreter: Interpreter, parentDescriptor: Descriptor) {
-        super.mount(descriptor, args, parentInterpreter, parentDescriptor)
-        const actor = this.getActor<EchartActor>(descriptor, args)
+    mount(descriptor: EchartDescriptor, parentInterpreter: Interpreter, parentDescriptor: Descriptor) {
+        super.mount(descriptor, parentInterpreter, parentDescriptor)
+        const actor = this.getActor<EchartActor>(descriptor)
 
-        const parenActor = parentInterpreter.getActor<HTMLActor>(parentDescriptor, args)
+        const parenActor = parentInterpreter.getActor<HTMLActor>(parentDescriptor)
         parenActor.add(actor)
     }
 
-    unmount(descriptor: Descriptor, args: UpdateArgs, parentInterpreter: Interpreter, parentDescriptor: Descriptor) {
-        const actor = this.getActor<EchartActor>(descriptor, args)
+    unmount(descriptor: Descriptor, parentInterpreter: Interpreter, parentDescriptor: Descriptor) {
+        const actor = this.getActor<EchartActor>(descriptor)
         actor.clearStyleClass(actor.DOM)
         actor.cleanInteraction()
 
-        const parenActor = parentInterpreter.getActor<HTMLActor>(parentDescriptor, args)
+        const parenActor = parentInterpreter.getActor<HTMLActor>(parentDescriptor)
         parenActor.remove(actor)
 
-        super.unmount(descriptor, args, parentInterpreter, parentDescriptor)
+        super.unmount(descriptor, parentInterpreter, parentDescriptor)
     }
 
-    pickup(descriptor: Descriptor, args: UpdateArgs, result: PickupObject[]) {
+    pickup(descriptor: Descriptor, result: PickupObject[]) {
         result.push({ uuid: descriptor.uuid, generatedBy: descriptor.generatedBy })
     }
 }

package/src/interpreter/LineServiceEchartInterpreter.ts

@@ -1,12 +1,11 @@
-import { UpdateArgs } from "@vyr/engine";
 import { LineServiceEchartDescriptor } from "../descriptor";
 import { ServiceEchartInterpreter } from "./ServiceEchartInterpreter";
 
 class LineServiceEchartInterpreter extends ServiceEchartInterpreter {
     static type = LineServiceEchartDescriptor.type
 
-    getService(descriptor: LineServiceEchartDescriptor, args: UpdateArgs) {
-        const service = super.getService(descriptor, args)
+    getService(descriptor: LineServiceEchartDescriptor) {
+        const service = super.getService(descriptor)
 
         return {
             ...service,

package/src/interpreter/PieServiceEchartInterpreter.ts

@@ -1,12 +1,11 @@
-import { UpdateArgs } from "@vyr/engine";
 import { PieServiceEchartDescriptor } from "../descriptor";
 import { ServiceEchartInterpreter } from "./ServiceEchartInterpreter";
 
 class PieServiceEchartInterpreter extends ServiceEchartInterpreter {
     static type = PieServiceEchartDescriptor.type
 
-    getService(descriptor: PieServiceEchartDescriptor, args: UpdateArgs) {
-        const service = super.getService(descriptor, args)
+    getService(descriptor: PieServiceEchartDescriptor) {
+        const service = super.getService(descriptor)
 
         return {
             ...service,

package/src/interpreter/ServiceEchartInterpreter.ts

@@ -1,5 +1,5 @@
 import * as echarts from 'echarts'
-import { Descriptor, StyleColor, Interpreter, Queue, UpdateArgs } from "@vyr/engine";
+import { Descriptor, StyleColor, Interpreter, Queue } from "@vyr/engine";
 import { EchartDescriptor, ServiceEchartDescriptor } from "../descriptor";
 import { EchartActor } from '../actor';
 
@@ -52,36 +52,36 @@ class ServiceEchartInterpreter extends Interpreter {
         }
     }
 
-    getService(descriptor: ServiceEchartDescriptor, args: UpdateArgs) {
+    getService(descriptor: ServiceEchartDescriptor) {
         return { type: descriptor.echart, name: descriptor.name }
     }
 
-    update(descriptor: ServiceEchartDescriptor, args: UpdateArgs) {
-        super.update(descriptor, args)
+    update(descriptor: ServiceEchartDescriptor) {
+        super.update(descriptor)
         const unit = this.graphics.getUnit(descriptor.uuid)
         const parentDescriptor = Descriptor.get(unit.parent)
         if (parentDescriptor instanceof EchartDescriptor) {
-            const actor = this.graphics.getActor<EchartActor>(parentDescriptor, args)
+            const actor = this.graphics.getActor<EchartActor>(parentDescriptor)
             if (actor === null) return
-            actor.setOptions(parentDescriptor, args)
+            actor.setOptions(parentDescriptor)
             actor.instance.setOption(actor.options)
         }
     }
 
-    mount(descriptor: EchartDescriptor, args: UpdateArgs, parentInterpreter: Interpreter, parentDescriptor: Descriptor) {
-        super.mount(descriptor, args, parentInterpreter, parentDescriptor)
+    mount(descriptor: EchartDescriptor, parentInterpreter: Interpreter, parentDescriptor: Descriptor) {
+        super.mount(descriptor, parentInterpreter, parentDescriptor)
         if (parentDescriptor instanceof EchartDescriptor) {
             const unit = this.graphics.getUnit(parentDescriptor.uuid)
             if (unit) unit.trigger(Queue.Update)
         }
     }
 
-    unmount(descriptor: Descriptor, args: UpdateArgs, parentInterpreter: Interpreter, parentDescriptor: Descriptor) {
+    unmount(descriptor: Descriptor, parentInterpreter: Interpreter, parentDescriptor: Descriptor) {
         if (parentDescriptor instanceof EchartDescriptor) {
             const unit = this.graphics.getUnit(parentDescriptor.uuid)
             if (unit) unit.trigger(Queue.Update)
         }
-        super.unmount(descriptor, args, parentInterpreter, parentDescriptor)
+        super.unmount(descriptor, parentInterpreter, parentDescriptor)
     }
 }