krono-flow 0.0.2 → 0.0.3

package/dist/index.js

@@ -6955,7 +6955,7 @@
         }
         var newStops = stops.slice(0);
         // panel新增可能出现顺序不对
-        newStops.sort(function (a, b) { return a.offset - b.offset; });
+        newStops.sort(function (a, b) { return a.offset.v - b.offset.v; });
         if (t === GRADIENT.LINEAR) {
             var start = void 0, end = void 0;
             if (deg <= 90) {
@@ -7114,7 +7114,7 @@
                 if (i) {
                     s_2 += ', ';
                 }
-                var color = item.color.map(function (c, i) {
+                var color = item.color.v.map(function (c, i) {
                     if (i === 3) {
                         return toPrecision(c);
                     }
@@ -7122,7 +7122,7 @@
                         return Math.min(255, Math.floor(c * ratio_1));
                     }
                 });
-                s_2 += color2rgbaStr(color) + ' ' + toPrecision(item.offset * 100) + '%';
+                s_2 += color2rgbaStr(color) + ' ' + toPrecision(item.offset.v * 100) + '%';
             });
             return s_2 + ')';
         }
@@ -7135,38 +7135,50 @@
             // 当首尾offset不为[0,1]时，标准尾首间会断渐变需要手动补齐
             var first = newStops[0];
             var last = newStops[newStops.length - 1];
-            if (standard && (first.offset > 0 || last.offset < 1)) {
-                var fa = (_a = first.color[3]) !== null && _a !== void 0 ? _a : 1;
-                var la = (_b = last.color[3]) !== null && _b !== void 0 ? _b : 1;
+            if (standard && (first.offset.v > 0 || last.offset.v < 1)) {
+                var fa = (_a = first.color.v[3]) !== null && _a !== void 0 ? _a : 1;
+                var la = (_b = last.color.v[3]) !== null && _b !== void 0 ? _b : 1;
                 var dc = [
-                    first.color[0] - last.color[0],
-                    first.color[1] - last.color[1],
-                    first.color[2] - last.color[2],
+                    first.color.v[0] - last.color.v[0],
+                    first.color.v[1] - last.color.v[1],
+                    first.color.v[2] - last.color.v[2],
                     fa - la,
                 ];
-                var dl = 1 - last.offset + first.offset;
-                if (first.offset > 0) {
-                    var p = first.offset / dl;
+                var dl = 1 - last.offset.v + first.offset.v;
+                if (first.offset.v > 0) {
+                    var p = first.offset.v / dl;
                     newStops.unshift({
-                        color: [
-                            Math.min(255, Math.max(0, Math.round(first.color[0] - dc[0] * p))),
-                            Math.min(255, Math.max(0, Math.round(first.color[1] - dc[1] * p))),
-                            Math.min(255, Math.max(0, Math.round(first.color[2] - dc[2] * p))),
-                            Math.min(1, Math.max(0, (_c = first.color[3]) !== null && _c !== void 0 ? _c : 1 - dc[3] * p)),
-                        ],
-                        offset: 0,
+                        color: {
+                            v: [
+                                Math.min(255, Math.max(0, Math.round(first.color.v[0] - dc[0] * p))),
+                                Math.min(255, Math.max(0, Math.round(first.color.v[1] - dc[1] * p))),
+                                Math.min(255, Math.max(0, Math.round(first.color.v[2] - dc[2] * p))),
+                                Math.min(1, Math.max(0, (_c = first.color.v[3]) !== null && _c !== void 0 ? _c : 1 - dc[3] * p)),
+                            ],
+                            u: StyleUnit.RGBA,
+                        },
+                        offset: {
+                            v: 0,
+                            u: StyleUnit.PERCENT,
+                        },
                     });
                 }
-                if (last.offset < 1) {
-                    var p = (1 - last.offset) / dl;
+                if (last.offset.v < 1) {
+                    var p = (1 - last.offset.v) / dl;
                     newStops.push({
-                        color: [
-                            Math.min(255, Math.max(0, Math.round(last.color[0] + dc[0] * p))),
-                            Math.min(255, Math.max(0, Math.round(last.color[1] + dc[1] * p))),
-                            Math.min(255, Math.max(0, Math.round(last.color[2] + dc[2] * p))),
-                            Math.min(1, Math.max(0, (_d = last.color[3]) !== null && _d !== void 0 ? _d : 1 + dc[3] * p)),
-                        ],
-                        offset: 1,
+                        color: {
+                            v: [
+                                Math.min(255, Math.max(0, Math.round(last.color.v[0] + dc[0] * p))),
+                                Math.min(255, Math.max(0, Math.round(last.color.v[1] + dc[1] * p))),
+                                Math.min(255, Math.max(0, Math.round(last.color.v[2] + dc[2] * p))),
+                                Math.min(1, Math.max(0, (_d = last.color.v[3]) !== null && _d !== void 0 ? _d : 1 + dc[3] * p)),
+                            ],
+                            u: StyleUnit.RGBA,
+                        },
+                        offset: {
+                            v: 100,
+                            u: StyleUnit.PERCENT,
+                        },
                     });
                 }
             }
@@ -7174,8 +7186,8 @@
                 if (i) {
                     s_3 += ', ';
                 }
-                item.color[3] = toPrecision(item.color[3]);
-                s_3 += color2rgbaStr(item.color) + ' ' + toPrecision(item.offset * 100) + '%';
+                item.color.v[3] = toPrecision(item.color.v[3]);
+                s_3 += color2rgbaStr(item.color.v) + ' ' + toPrecision(item.offset.v * 100) + '%';
             });
             return s_3 + ')';
         }
@@ -8253,10 +8265,33 @@
             dspTy: 0,
         };
     }
+    function getCssTextShadow(item) {
+        if (!item) {
+            return 'none';
+        }
+        return item.x + 'px ' + item.y + 'px ' + item.blur + ' px ' + color2rgbaStr(item.color);
+    }
     function getPropsRich(rich) {
-        return __assign(__assign({}, rich), { textAlign: (['left', 'right', 'center', 'justify'][rich.textAlign] || 'left'), textDecoration: rich.textDecoration.map(function (o) {
-                return ['none', 'underline', 'lineThrough'][o] || 'none';
-            }), color: color2rgbaStr(rich.color) });
+        return {
+            fontFamily: rich.fontFamily.v,
+            fontSize: rich.fontSize.v,
+            fontWeight: rich.fontWeight.v,
+            lineHeight: rich.lineHeight.v,
+            letterSpacing: rich.letterSpacing.v,
+            paragraphSpacing: rich.paragraphSpacing.v,
+            fontStyle: ['normal', 'italic', 'oblique'][rich.fontStyle.v] || 'normal',
+            color: color2rgbaStr(rich.color.v),
+            textAlign: (['left', 'right', 'center', 'justify'][rich.textAlign.v] || 'left'),
+            textDecoration: rich.textDecoration.map(function (item) {
+                return ['none', 'underline', 'lineThrough'][item.v] || 'none';
+            }),
+            textShadow: getCssTextShadow(rich.textShadow.v),
+            stroke: rich.stroke.map(function (item) {
+                return getCssFillStroke(item.v, 1, 1, true);
+            }),
+            strokeWidth: rich.strokeWidth.map(function (item) { return item.v; }),
+            strokeEnable: rich.strokeEnable.map(function (item) { return item.v; }),
+        };
     }
     var css = {
         normalize: normalize,
@@ -11753,27 +11788,27 @@
             });
             if (standard) {
                 if (this.isMounted) {
-                    res.fill = computedStyle.fill.map(function (item) { return getCssFillStroke(item, _this.width, _this.height, true); });
+                    res.fill = style.fill.map(function (item) { return getCssFillStroke(item.v, _this.width, _this.height, true); });
                 }
                 else {
                     inject.error('Can not get CSS standard fill unmounted');
                 }
             }
             else {
-                res.fill = calComputedFill(style.fill).map(function (item) { return getCssFillStroke(item); });
+                res.fill = style.fill.map(function (item) { return getCssFillStroke(item.v); });
             }
             res.fillRule = ['nonzero', 'evenodd'][style.fillRule.v];
             res.fillMode = style.fillMode.map(function (item) { return getCssMbm(item.v); });
             if (standard) {
                 if (this.isMounted) {
-                    res.stroke = computedStyle.stroke.map(function (item) { return getCssFillStroke(item, _this.width, _this.height, true); });
+                    res.stroke = style.stroke.map(function (item) { return getCssFillStroke(item.v, _this.width, _this.height, true); });
                 }
                 else {
                     inject.error('Can not get CSS standard stroke unmounted');
                 }
             }
             else {
-                res.stroke = calComputedStroke(style.stroke).map(function (item) { return getCssFillStroke(item, _this.width, _this.height); });
+                res.stroke = style.stroke.map(function (item) { return getCssFillStroke(item.v); });
             }
             res.strokeLinecap = ['butt', 'round', 'square'][style.strokeLinecap.v];
             res.strokeLinejoin = ['miter', 'round', 'bevel'][style.strokeLinejoin.v];
@@ -42775,7 +42810,7 @@
         };
         Text.prototype.cloneProps = function () {
             var props = _super.prototype.cloneProps.call(this);
-            // props.rich = this.computedRich.map(item => getPropsRich(item));
+            props.rich = this.rich.map(function (item) { return getPropsRich(item); });
             if (this.isMounted) {
                 var textBehaviour = props.textBehaviour = this.getTextBehaviour();
                 var style = props.style;