@wcardinal/wcardinal-ui 0.290.0 → 0.292.0

package/dist/types/wcardinal/ui/d-chart-coordinate-log.d.ts

@@ -1,48 +1,10 @@
 import { DBase } from "./d-base";
-import { DChartCoordinate, DChartCoordinateOptions, DThemeChartCoordinate } from "./d-chart-coordinate";
-import { DChartCoordinateContainerSub } from "./d-chart-coordinate-container-sub";
-import { DChartCoordinateDirection } from "./d-chart-coordinate-direction";
-import { DChartCoordinateTick } from "./d-chart-coordinate-tick";
-import { DChartCoordinateTickMajorStepFunction } from "./d-chart-coordinate-tick-major-step-function";
-import { DChartCoordinateTickMinorStepFunction } from "./d-chart-coordinate-tick-minor-step-function";
-import { DChartCoordinateTransform } from "./d-chart-coordinate-transform";
-import { DChartCoordinateTransformMark, DChartCoordinateTransformMarkImpl } from "./d-chart-coordinate-transform-mark";
-import { DChartPlotArea } from "./d-chart-plot-area";
-import { DChartRegion } from "./d-chart-region";
-import { DChartRegionImpl } from "./d-chart-region-impl";
-export declare class DChartCoordinateLog<CHART extends DBase = DBase> implements DChartCoordinate<CHART> {
-    protected _id: number;
-    protected _transform: DChartCoordinateTransform<CHART>;
-    protected _container?: DChartCoordinateContainerSub<CHART>;
-    protected _direction: DChartCoordinateDirection;
-    protected _theme: DThemeChartCoordinate;
-    protected _work: DChartRegionImpl;
-    protected _tick: DChartCoordinateTick<CHART>;
-    protected _mark: DChartCoordinateTransformMarkImpl;
-    protected _from?: number;
-    protected _to?: number;
-    constructor(options?: DChartCoordinateOptions);
-    get from(): number | undefined;
-    set from(from: number | undefined);
-    get to(): number | undefined;
-    set to(to: number | undefined);
-    bind(container: DChartCoordinateContainerSub<CHART>, direction: DChartCoordinateDirection): void;
-    unbind(): void;
-    fit(from?: number, to?: number): void;
-    mark(from?: number, to?: number): void;
-    blend(ratio: number): void;
-    protected doFit(from: number | undefined, to: number | undefined, result: DChartCoordinateTransformMark | DChartCoordinateTransform<CHART>): void;
-    protected toFitDomain(from: number | undefined, to: number | undefined, plotArea: DChartPlotArea<CHART>, result: DChartRegion): DChartRegion;
-    protected toFitRange(from: number | undefined, to: number | undefined, plotArea: DChartPlotArea<CHART>, result: DChartRegion): DChartRegion;
-    protected doFit_(pixelFrom: number, pixelTo: number, region: DChartRegion, result: DChartCoordinateTransformMark | DChartCoordinateTransform<CHART>): void;
-    get id(): number;
-    get transform(): DChartCoordinateTransform<CHART>;
+import { DChartCoordinateBase } from "./d-chart-coordinate-base";
+import { DChartCoordinateTick, DChartCoordinateTickOptions } from "./d-chart-coordinate-tick";
+export declare class DChartCoordinateLog<CHART extends DBase = DBase> extends DChartCoordinateBase<CHART> {
+    protected newTick(options?: DChartCoordinateTickOptions): DChartCoordinateTick<CHART>;
     map(value: number): number;
     mapAll(values: number[], ifrom: number, iend: number, stride: number, offset: number): void;
     unmap(value: number): number;
     unmapAll(values: number[], ifrom: number, iend: number, stride: number, offset: number): void;
-    ticks(domainFrom: number, domainTo: number, majorCount: number, majorCapacity: number, majorStep: number | DChartCoordinateTickMajorStepFunction | undefined, minorCountPerMajor: number, minorCount: number, minorStep: number | DChartCoordinateTickMinorStepFunction | undefined, majorResult: number[], minorResult: number[]): void;
-    protected toTheme(options?: DChartCoordinateOptions): DThemeChartCoordinate;
-    protected getThemeDefault(): DThemeChartCoordinate;
-    protected getType(): string;
 }

package/dist/types/wcardinal/ui/d-table-body.d.ts

@@ -78,6 +78,13 @@ export declare class DTableBody<ROW, DATA extends DTableData<ROW> = DTableDataLi
     protected onParentMove(newX: number, newY: number, oldX: number, oldY: number): void;
     protected updateFrozenCellPosition(x: number): void;
     getClippingRect(target: unknown, result: Rectangle): void;
+    /**
+     * Scroll to the given row or row index.
+     *
+     * @param target a row or an row index to which the body scrolls to.
+     * @returns true if succeeded
+     */
+    scrollTo(target: ROW | number): boolean;
     protected toRowIndexMapped(local: Point): number;
     protected toRow(rowIndexMapped: number): DTableBodyRow<ROW> | null;
     protected toCell(row: DTableBodyRow<ROW>, local: Point): DTableBodyCell<ROW, unknown> | null;

package/dist/types/wcardinal/ui/index.d.ts

@@ -78,18 +78,29 @@ export * from "./d-button-undo";
 export * from "./d-button";
 export * from "./d-canvas-container";
 export * from "./d-canvas";
+export * from "./d-chart-axis-bar";
+export * from "./d-chart-axis-base-bar";
 export * from "./d-chart-axis-base-options-parser";
 export * from "./d-chart-axis-base-options";
+export * from "./d-chart-axis-base-tick-container";
+export * from "./d-chart-axis-base-tick-major-gridline";
+export * from "./d-chart-axis-base-tick-major";
+export * from "./d-chart-axis-base-tick-minor";
 export * from "./d-chart-axis-base";
 export * from "./d-chart-axis-container-impl";
 export * from "./d-chart-axis-container";
 export * from "./d-chart-axis-position";
+export * from "./d-chart-axis-tick-container";
+export * from "./d-chart-axis-tick-major-gridline";
+export * from "./d-chart-axis-tick-major";
+export * from "./d-chart-axis-tick-minor";
 export * from "./d-chart-axis-tick-position";
 export * from "./d-chart-axis-x-datetime";
 export * from "./d-chart-axis-x";
 export * from "./d-chart-axis-y";
 export * from "./d-chart-axis";
 export * from "./d-chart-color-set";
+export * from "./d-chart-coordinate-base";
 export * from "./d-chart-coordinate-container-impl";
 export * from "./d-chart-coordinate-container-sub-impl";
 export * from "./d-chart-coordinate-container-sub";

package/dist/types/wcardinal/ui/theme/dark/d-theme-dark-chart-axis-base.d.ts

@@ -61,6 +61,13 @@ export declare class DThemeDarkChartAxisBase implements DThemeChartAxisBase {
     getMinorTickSize(): number;
     getMinorTickPosition(): DChartAxisTickPosition;
     getMinorTickStyle(): EShapePointsStyle | undefined;
+    getMinorTickTextAlignHorizontal(position: DChartAxisPosition): EShapeTextAlignHorizontal;
+    getMinorTickTextAlignVertical(position: DChartAxisPosition): EShapeTextAlignVertical;
+    getMinorTickTextDirection(): EShapeTextDirection;
+    getMinorTickTextColor(): number | undefined;
+    getMinorTickTextFormat(): string | undefined;
+    getMinorTickTextPaddingHorizontal(): number;
+    getMinorTickTextPaddingVertical(): number;
     getMinorTickStrokeEnable(): boolean | undefined;
     getMinorTickStrokeColor(): number | undefined;
     getMinorTickStrokeAlpha(): number | undefined;

package/dist/types/wcardinal/ui/theme/white/d-theme-white-chart-axis-base.d.ts

@@ -61,6 +61,13 @@ export declare class DThemeWhiteChartAxisBase implements DThemeChartAxisBase {
     getMinorTickSize(): number;
     getMinorTickPosition(): DChartAxisTickPosition;
     getMinorTickStyle(): EShapePointsStyle | undefined;
+    getMinorTickTextAlignHorizontal(position: DChartAxisPosition): EShapeTextAlignHorizontal;
+    getMinorTickTextAlignVertical(position: DChartAxisPosition): EShapeTextAlignVertical;
+    getMinorTickTextDirection(): EShapeTextDirection;
+    getMinorTickTextColor(): number | undefined;
+    getMinorTickTextFormat(): string | undefined;
+    getMinorTickTextPaddingHorizontal(): number;
+    getMinorTickTextPaddingVertical(): number;
     getMinorTickStrokeEnable(): boolean | undefined;
     getMinorTickStrokeColor(): number | undefined;
     getMinorTickStrokeAlpha(): number | undefined;

package/dist/wcardinal/ui/d-chart-axis-bar.js.map

@@ -1 +1 @@
-{"version":3,"file":"d-chart-axis-bar.js","sourceRoot":"","sources":["../../../src/main/typescript/wcardinal/ui/d-chart-axis-bar.ts"],"names":[],"mappings":"AAAA;;;GAGG","sourcesContent":["/*\n * Copyright (C) 2019 Toshiba Corporation\n * SPDX-License-Identifier: Apache-2.0\n */\n\nimport { DBase } from \"./d-base\";\nimport { EShape } from \"./shape/e-shape\";\n\nexport interface DChartAxisBar<CHART extends DBase> {\n\treadonly shape: EShape;\n}\n"]}
+{"version":3,"file":"d-chart-axis-bar.js","sourceRoot":"","sources":["../../../src/main/typescript/wcardinal/ui/d-chart-axis-bar.ts"],"names":[],"mappings":"AAAA;;;GAGG","sourcesContent":["/*\n * Copyright (C) 2019 Toshiba Corporation\n * SPDX-License-Identifier: Apache-2.0\n */\n\nimport { DBase } from \"./d-base\";\nimport { DChartAxisContainer } from \"./d-chart-axis-container\";\nimport { EShape } from \"./shape/e-shape\";\n\nexport interface DChartAxisBar<CHART extends DBase> {\n\treadonly shape: EShape;\n\n\tbind(container: DChartAxisContainer<CHART>, index: number): void;\n\tunbind(): void;\n\tupdate(): boolean;\n\tdestroy(): void;\n}\n"]}

package/dist/wcardinal/ui/d-chart-axis-base-options-parser.js

@@ -5,15 +5,20 @@
 import { DChartAxisPosition } from "./d-chart-axis-position";
 import { DChartAxisTickPosition } from "./d-chart-axis-tick-position";
 import { EShapePointsStyles } from "./shape/e-shape-points-styles";
+import { EShapeStrokeStyle } from "./shape/e-shape-stroke-style";
+import { EShapeTextStyle, EShapeTextWeight } from "./shape/e-shape-text";
+import { EShapeTextDirection } from "./shape/e-shape-text-direction";
 import { EShapeBarPosition } from "./shape/variant/e-shape-bar-position";
+import { isArray } from "./util/is-array";
 import { isString } from "./util/is-string";
 import { NumberFormatters } from "./util/number-formatters";
+import { toEnum } from "./util/to-enum";
 var DChartAxisBaseOptionParser = /** @class */ (function () {
     function DChartAxisBaseOptionParser(theme, options) {
         var _a, _b;
         this._coordinateIndex = (_a = options === null || options === void 0 ? void 0 : options.coordinate) !== null && _a !== void 0 ? _a : 0;
         this._position = this.toPosition(theme, options);
-        this._tick = this.toTickContainer(theme, options);
+        this._tick = this.toTick(theme, options);
         this._label = this.toLabel(theme, options);
         this._padding = (_b = options === null || options === void 0 ? void 0 : options.padding) !== null && _b !== void 0 ? _b : theme.getPadding();
         this._bar = this.toBar(theme, options);
@@ -77,13 +82,13 @@ var DChartAxisBaseOptionParser = /** @class */ (function () {
             stroke: this.toBarStroke(theme, options === null || options === void 0 ? void 0 : options.stroke)
         };
     };
-    DChartAxisBaseOptionParser.prototype.toTickContainer = function (theme, options) {
+    DChartAxisBaseOptionParser.prototype.toTick = function (theme, options) {
         var _a;
         var tick = options === null || options === void 0 ? void 0 : options.tick;
         return {
             enable: (_a = tick === null || tick === void 0 ? void 0 : tick.enable) !== null && _a !== void 0 ? _a : theme.getTickEnable(),
             major: this.toTickMajor(theme, tick),
-            minor: this.toMinorTick(theme, tick)
+            minor: this.toTickMinor(theme, tick)
         };
     };
     DChartAxisBaseOptionParser.prototype.toTickMajor = function (theme, options) {
@@ -104,8 +109,8 @@ var DChartAxisBaseOptionParser = /** @class */ (function () {
             position: this.toTickPosition(position),
             style: style,
             stroke: stroke,
-            text: this.toMajorTickText(theme, major === null || major === void 0 ? void 0 : major.text),
-            formatter: this.toMajorTickFormatter(theme, major),
+            text: this.toTickMajorText(theme, major === null || major === void 0 ? void 0 : major.text),
+            formatter: this.toTickMajorFormatter(theme, major),
             gridline: this.toTickMajorGridline(theme, major === null || major === void 0 ? void 0 : major.gridline, optionsStyle, optionsStroke)
         };
     };
@@ -149,7 +154,7 @@ var DChartAxisBaseOptionParser = /** @class */ (function () {
             }
         }
     };
-    DChartAxisBaseOptionParser.prototype.toMinorTick = function (theme, options) {
+    DChartAxisBaseOptionParser.prototype.toTickMinor = function (theme, options) {
         var _a, _b, _c, _d, _e, _f, _g;
         var minor = options === null || options === void 0 ? void 0 : options.minor;
         var position = (_b = (_a = minor === null || minor === void 0 ? void 0 : minor.position) !== null && _a !== void 0 ? _a : options === null || options === void 0 ? void 0 : options.position) !== null && _b !== void 0 ? _b : theme.getMinorTickPosition();
@@ -160,7 +165,9 @@ var DChartAxisBaseOptionParser = /** @class */ (function () {
             size: (_g = minor === null || minor === void 0 ? void 0 : minor.size) !== null && _g !== void 0 ? _g : theme.getMinorTickSize(),
             position: this.toTickPosition(position),
             style: style,
-            stroke: this.toTickMinorStroke(theme, minor === null || minor === void 0 ? void 0 : minor.stroke, options === null || options === void 0 ? void 0 : options.stroke)
+            stroke: this.toTickMinorStroke(theme, minor === null || minor === void 0 ? void 0 : minor.stroke, options === null || options === void 0 ? void 0 : options.stroke),
+            text: this.toTickMinorText(theme, minor === null || minor === void 0 ? void 0 : minor.text),
+            formatter: this.toTickMinorFormatter(theme, minor)
         };
     };
     DChartAxisBaseOptionParser.prototype.toBarStroke = function (theme, options) {
@@ -186,7 +193,7 @@ var DChartAxisBaseOptionParser = /** @class */ (function () {
                     width: (_h = (_g = optionsA.width) !== null && _g !== void 0 ? _g : optionsB.width) !== null && _h !== void 0 ? _h : width,
                     align: (_k = (_j = optionsA.align) !== null && _j !== void 0 ? _j : optionsB.align) !== null && _k !== void 0 ? _k : align,
                     side: (_m = (_l = optionsA.side) !== null && _l !== void 0 ? _l : optionsB.side) !== null && _m !== void 0 ? _m : side,
-                    style: (_p = (_o = optionsA.style) !== null && _o !== void 0 ? _o : optionsB.style) !== null && _p !== void 0 ? _p : style
+                    style: this.toStrokeStyle((_p = (_o = optionsA.style) !== null && _o !== void 0 ? _o : optionsB.style) !== null && _p !== void 0 ? _p : style)
                 };
             }
             else {
@@ -197,7 +204,7 @@ var DChartAxisBaseOptionParser = /** @class */ (function () {
                     width: (_t = optionsA.width) !== null && _t !== void 0 ? _t : width,
                     align: (_u = optionsA.align) !== null && _u !== void 0 ? _u : align,
                     side: (_v = optionsA.side) !== null && _v !== void 0 ? _v : side,
-                    style: (_w = optionsA.style) !== null && _w !== void 0 ? _w : style
+                    style: this.toStrokeStyle((_w = optionsA.style) !== null && _w !== void 0 ? _w : style)
                 };
             }
         }
@@ -209,7 +216,7 @@ var DChartAxisBaseOptionParser = /** @class */ (function () {
                 width: (_0 = optionsB.width) !== null && _0 !== void 0 ? _0 : width,
                 align: (_1 = optionsB.align) !== null && _1 !== void 0 ? _1 : align,
                 side: (_2 = optionsB.side) !== null && _2 !== void 0 ? _2 : side,
-                style: (_3 = optionsB.style) !== null && _3 !== void 0 ? _3 : style
+                style: this.toStrokeStyle((_3 = optionsB.style) !== null && _3 !== void 0 ? _3 : style)
             };
         }
         else {
@@ -224,12 +231,28 @@ var DChartAxisBaseOptionParser = /** @class */ (function () {
             };
         }
     };
-    DChartAxisBaseOptionParser.prototype.toMajorTickFormatter = function (theme, options) {
+    DChartAxisBaseOptionParser.prototype.toStrokeStyle = function (target) {
+        if (isString(target)) {
+            return EShapeStrokeStyle[target];
+        }
+        else if (isArray(target)) {
+            var result = EShapeStrokeStyle.NONE;
+            for (var i = 0, imax = target.length; i < imax; ++i) {
+                result |= EShapeStrokeStyle[target[i]];
+            }
+            return result;
+        }
+        return target;
+    };
+    DChartAxisBaseOptionParser.prototype.toTickMajorFormatter = function (theme, options) {
         var text = options === null || options === void 0 ? void 0 : options.text;
         if (text) {
-            var format = text.format;
-            if (format != null) {
-                return NumberFormatters.create(format);
+            var format_1 = text.format;
+            if (format_1 === null) {
+                return undefined;
+            }
+            else if (format_1 != null) {
+                return NumberFormatters.create(format_1);
             }
             else {
                 var formatter = text.formatter;
@@ -240,28 +263,32 @@ var DChartAxisBaseOptionParser = /** @class */ (function () {
                 }
             }
         }
-        return NumberFormatters.create(theme.getMajorTickTextFormat());
+        var format = theme.getMajorTickTextFormat();
+        if (format != null) {
+            return NumberFormatters.create(format);
+        }
+        return undefined;
     };
-    DChartAxisBaseOptionParser.prototype.toMajorTickText = function (theme, options) {
+    DChartAxisBaseOptionParser.prototype.toTickMajorText = function (theme, options) {
         options = options || {};
         return {
             format: options.format,
-            color: this.toMajorTickTextColor(theme, options.color),
+            color: this.toTickMajorTextColor(theme, options.color),
             alpha: options.alpha,
             family: options.family,
             size: options.size,
-            weight: options.weight,
-            align: this.toMajorTickTextAlign(theme, options.align),
-            offset: this.toMajorTickTextOffset(theme, options.offset),
-            style: options.style,
-            outline: this.toMajorTickTextOutline(theme, options.outline),
-            spacing: this.toMajorTickTextSpacing(theme, options.spacing),
+            weight: toEnum(options.weight, EShapeTextWeight),
+            align: this.toTickMajorTextAlign(theme, options.align),
+            offset: this.toTickMajorTextOffset(theme, options.offset),
+            style: toEnum(options.style, EShapeTextStyle),
+            outline: this.toTickMajorTextOutline(theme, options.outline),
+            spacing: this.toTickMajorTextSpacing(theme, options.spacing),
             direction: this.toTickMajorTextDirection(theme, options.direction),
-            padding: this.toMajorTickTextPadding(theme, options.padding),
+            padding: this.toTickMajorTextPadding(theme, options.padding),
             clipping: options.clipping
         };
     };
-    DChartAxisBaseOptionParser.prototype.toMajorTickTextOutline = function (theme, options) {
+    DChartAxisBaseOptionParser.prototype.toTickMajorTextOutline = function (theme, options) {
         if (options) {
             return {
                 enable: options.enable,
@@ -271,7 +298,7 @@ var DChartAxisBaseOptionParser = /** @class */ (function () {
             };
         }
     };
-    DChartAxisBaseOptionParser.prototype.toMajorTickTextAlign = function (theme, options) {
+    DChartAxisBaseOptionParser.prototype.toTickMajorTextAlign = function (theme, options) {
         var _a, _b;
         var position = this._position;
         return {
@@ -279,7 +306,7 @@ var DChartAxisBaseOptionParser = /** @class */ (function () {
             vertical: (_b = options === null || options === void 0 ? void 0 : options.vertical) !== null && _b !== void 0 ? _b : theme.getMajorTickTextAlignVertical(position)
         };
     };
-    DChartAxisBaseOptionParser.prototype.toMajorTickTextOffset = function (theme, options) {
+    DChartAxisBaseOptionParser.prototype.toTickMajorTextOffset = function (theme, options) {
         if (options) {
             return {
                 horizontal: options.horizontal,
@@ -287,7 +314,7 @@ var DChartAxisBaseOptionParser = /** @class */ (function () {
             };
         }
     };
-    DChartAxisBaseOptionParser.prototype.toMajorTickTextSpacing = function (theme, options) {
+    DChartAxisBaseOptionParser.prototype.toTickMajorTextSpacing = function (theme, options) {
         if (options) {
             return {
                 horizontal: options.horizontal,
@@ -295,7 +322,7 @@ var DChartAxisBaseOptionParser = /** @class */ (function () {
             };
         }
     };
-    DChartAxisBaseOptionParser.prototype.toMajorTickTextPadding = function (theme, options) {
+    DChartAxisBaseOptionParser.prototype.toTickMajorTextPadding = function (theme, options) {
         var _a, _b;
         return {
             horizontal: (_a = options === null || options === void 0 ? void 0 : options.horizontal) !== null && _a !== void 0 ? _a : theme.getMajorTickTextPaddingHorizontal(),
@@ -303,11 +330,102 @@ var DChartAxisBaseOptionParser = /** @class */ (function () {
         };
     };
     DChartAxisBaseOptionParser.prototype.toTickMajorTextDirection = function (theme, options) {
-        return options !== null && options !== void 0 ? options : theme.getMajorTickTextDirection();
+        return toEnum(options !== null && options !== void 0 ? options : theme.getMajorTickTextDirection(), EShapeTextDirection);
     };
-    DChartAxisBaseOptionParser.prototype.toMajorTickTextColor = function (theme, options) {
+    DChartAxisBaseOptionParser.prototype.toTickMajorTextColor = function (theme, options) {
         return options !== null && options !== void 0 ? options : theme.getMajorTickTextColor();
     };
+    DChartAxisBaseOptionParser.prototype.toTickMinorFormatter = function (theme, options) {
+        var text = options === null || options === void 0 ? void 0 : options.text;
+        if (text) {
+            var format_2 = text.format;
+            if (format_2 === null) {
+                return undefined;
+            }
+            else if (format_2 != null) {
+                return NumberFormatters.create(format_2);
+            }
+            else {
+                var formatter = text.formatter;
+                if (formatter) {
+                    return {
+                        format: formatter
+                    };
+                }
+            }
+        }
+        var format = theme.getMinorTickTextFormat();
+        if (format != null) {
+            return NumberFormatters.create(format);
+        }
+        return undefined;
+    };
+    DChartAxisBaseOptionParser.prototype.toTickMinorText = function (theme, options) {
+        options = options || {};
+        return {
+            format: options.format,
+            color: this.toTickMinorTextColor(theme, options.color),
+            alpha: options.alpha,
+            family: options.family,
+            size: options.size,
+            weight: toEnum(options.weight, EShapeTextWeight),
+            align: this.toTickMinorTextAlign(theme, options.align),
+            offset: this.toTickMinorTextOffset(theme, options.offset),
+            style: toEnum(options.style, EShapeTextStyle),
+            outline: this.toTickMinorTextOutline(theme, options.outline),
+            spacing: this.toTickMinorTextSpacing(theme, options.spacing),
+            direction: this.toTickMinorTextDirection(theme, options.direction),
+            padding: this.toTickMinorTextPadding(theme, options.padding),
+            clipping: options.clipping
+        };
+    };
+    DChartAxisBaseOptionParser.prototype.toTickMinorTextOutline = function (theme, options) {
+        if (options) {
+            return {
+                enable: options.enable,
+                color: options.color,
+                alpha: options.alpha,
+                width: options.width
+            };
+        }
+    };
+    DChartAxisBaseOptionParser.prototype.toTickMinorTextAlign = function (theme, options) {
+        var _a, _b;
+        var position = this._position;
+        return {
+            horizontal: (_a = options === null || options === void 0 ? void 0 : options.horizontal) !== null && _a !== void 0 ? _a : theme.getMinorTickTextAlignHorizontal(position),
+            vertical: (_b = options === null || options === void 0 ? void 0 : options.vertical) !== null && _b !== void 0 ? _b : theme.getMinorTickTextAlignVertical(position)
+        };
+    };
+    DChartAxisBaseOptionParser.prototype.toTickMinorTextOffset = function (theme, options) {
+        if (options) {
+            return {
+                horizontal: options.horizontal,
+                vertical: options.vertical
+            };
+        }
+    };
+    DChartAxisBaseOptionParser.prototype.toTickMinorTextSpacing = function (theme, options) {
+        if (options) {
+            return {
+                horizontal: options.horizontal,
+                vertical: options.vertical
+            };
+        }
+    };
+    DChartAxisBaseOptionParser.prototype.toTickMinorTextPadding = function (theme, options) {
+        var _a, _b;
+        return {
+            horizontal: (_a = options === null || options === void 0 ? void 0 : options.horizontal) !== null && _a !== void 0 ? _a : theme.getMinorTickTextPaddingHorizontal(),
+            vertical: (_b = options === null || options === void 0 ? void 0 : options.vertical) !== null && _b !== void 0 ? _b : theme.getMinorTickTextPaddingVertical()
+        };
+    };
+    DChartAxisBaseOptionParser.prototype.toTickMinorTextDirection = function (theme, options) {
+        return toEnum(options !== null && options !== void 0 ? options : theme.getMinorTickTextDirection(), EShapeTextDirection);
+    };
+    DChartAxisBaseOptionParser.prototype.toTickMinorTextColor = function (theme, options) {
+        return options !== null && options !== void 0 ? options : theme.getMinorTickTextColor();
+    };
     DChartAxisBaseOptionParser.prototype.toLabel = function (theme, options) {
         var label = options === null || options === void 0 ? void 0 : options.label;
         if (label) {
@@ -317,10 +435,10 @@ var DChartAxisBaseOptionParser = /** @class */ (function () {
                 alpha: label.alpha,
                 family: label.family,
                 size: label.size,
-                weight: label.weight,
+                weight: toEnum(label.weight, EShapeTextWeight),
                 align: this.toLabelAlign(theme, label.align),
                 offset: this.toLabelOffset(theme, label.offset),
-                style: label.style,
+                style: toEnum(label.style, EShapeTextStyle),
                 outline: this.toLabelOutline(theme, label.outline),
                 spacing: this.toLabelSpacing(theme, label.spacing),
                 direction: this.toLabelDirection(theme, label.direction),
@@ -371,7 +489,7 @@ var DChartAxisBaseOptionParser = /** @class */ (function () {
         };
     };
     DChartAxisBaseOptionParser.prototype.toLabelDirection = function (theme, options) {
-        return options !== null && options !== void 0 ? options : theme.getLabelDirection();
+        return toEnum(options !== null && options !== void 0 ? options : theme.getLabelDirection(), EShapeTextDirection);
     };
     DChartAxisBaseOptionParser.prototype.toLabelColor = function (theme, options) {
         return options !== null && options !== void 0 ? options : theme.getLabelColor();