@wcardinal/wcardinal-ui 0.200.1 → 0.200.2

package/dist/wcardinal-ui.js

@@ -1,5 +1,5 @@
 /*
- Winter Cardinal UI v0.200.1
+ Winter Cardinal UI v0.200.2
  Copyright (C) 2019 Toshiba Corporation
  SPDX-License-Identifier: Apache-2.0
 
@@ -59195,103 +59195,105 @@
         };
         DDiagramCanvas.prototype.initData = function (shape, dataShape, mapper, formatToFormatter, initialToInitialValue, canvasTicker, canvasData) {
             var data = shape.data;
+            var format = "";
+            var initial = "";
             for (var i = 0, imax = data.size(); i < imax; ++i) {
                 var value = data.get(i);
-                if (value) {
-                    var type = value.type;
-                    var format = value.format;
-                    var initial = value.initial;
-                    switch (type) {
-                        case EShapeDataValueType.NUMBER:
-                        case EShapeDataValueType.NUMBER_ARRAY:
-                        case EShapeDataValueType.STRING:
-                        case EShapeDataValueType.STRING_ARRAY:
-                        case EShapeDataValueType.OBJECT:
-                        case EShapeDataValueType.OBJECT_ARRAY:
-                            // Mapping
-                            if (value.scope === EShapeDataValueScope.PRIVATE) {
-                                var id = value.id;
-                                if (0 < id.length) {
-                                    if (dataShape) {
-                                        dataShape.data.private.add(id, value);
-                                    }
-                                    else {
-                                        canvasData.private.add(id, value);
-                                    }
+                if (value == null)
+                    continue;
+                switch (value.type) {
+                    case EShapeDataValueType.NUMBER:
+                    case EShapeDataValueType.NUMBER_ARRAY:
+                    case EShapeDataValueType.STRING:
+                    case EShapeDataValueType.STRING_ARRAY:
+                    case EShapeDataValueType.OBJECT:
+                    case EShapeDataValueType.OBJECT_ARRAY:
+                        // Mapping
+                        if (value.scope === EShapeDataValueScope.PRIVATE) {
+                            var id = value.id;
+                            if (0 < id.length) {
+                                if (dataShape) {
+                                    dataShape.data.private.add(id, value);
                                 }
-                            }
-                            else if (value.scope === EShapeDataValueScope.PROTECTED) {
-                                var id = value.id;
-                                if (0 < id.length) {
-                                    canvasData.protected.add(id, value);
+                                else {
+                                    canvasData.private.add(id, value);
                                 }
                             }
-                            else {
-                                if (mapper) {
-                                    mapper(value, dataShape || shape);
-                                }
-                                var id = value.id;
-                                if (0 < id.length) {
-                                    canvasData.add(id, value);
-                                }
+                        }
+                        else if (value.scope === EShapeDataValueScope.PROTECTED) {
+                            var id = value.id;
+                            if (0 < id.length) {
+                                canvasData.protected.add(id, value);
                             }
-                            // Format
-                            if (formatToFormatter.has(format)) {
-                                value.formatter = formatToFormatter.get(format);
+                        }
+                        else {
+                            if (mapper) {
+                                mapper(value, dataShape || shape);
                             }
-                            else if (0 < format.length) {
-                                try {
-                                    var formatter = this.calcFormatter(value, format, initial);
-                                    formatToFormatter.set(format, formatter);
-                                    value.formatter = formatter;
-                                }
-                                catch (e) {
-                                    // DO NOTHING
-                                }
+                            var id = value.id;
+                            if (0 < id.length) {
+                                canvasData.add(id, value);
                             }
-                            // Initial
-                            if (initialToInitialValue.has(initial)) {
-                                value.value = initialToInitialValue.get(initial);
+                        }
+                        // Format
+                        format = value.format;
+                        initial = value.initial;
+                        if (formatToFormatter.has(format)) {
+                            value.formatter = formatToFormatter.get(format);
+                        }
+                        else if (0 < format.length) {
+                            try {
+                                var formatter = this.calcFormatter(value, format, initial);
+                                formatToFormatter.set(format, formatter);
+                                value.formatter = formatter;
                             }
-                            else if (0 < initial.length) {
-                                try {
-                                    var initialValue = this.calcInitial(value, initial);
-                                    initialToInitialValue.set(initial, initialValue);
-                                    value.value = initialValue;
-                                }
-                                catch (e) {
-                                    // DO NOTHING
-                                }
+                            catch (e) {
+                                // DO NOTHING
                             }
-                            break;
-                        case EShapeDataValueType.TICKER:
-                            // Initial
-                            if (initialToInitialValue.has(initial)) {
-                                value.value = 0;
-                                canvasTicker.add(initialToInitialValue.get(initial)).add(value);
+                        }
+                        // Initial
+                        if (initialToInitialValue.has(initial)) {
+                            value.value = initialToInitialValue.get(initial);
+                        }
+                        else if (0 < initial.length) {
+                            try {
+                                var initialValue = this.calcInitial(value, initial);
+                                initialToInitialValue.set(initial, initialValue);
+                                value.value = initialValue;
                             }
-                            else if (0 < initial.length) {
-                                try {
-                                    var initialValue = this.calcInitial(value, initial);
-                                    initialToInitialValue.set(initial, initialValue);
-                                    value.value = 0;
-                                    canvasTicker.add(initialValue).add(value);
-                                }
-                                catch (e) {
-                                    // DO NOTHING
-                                }
+                            catch (e) {
+                                // DO NOTHING
                             }
-                            break;
-                        default:
-                            var extension = EShapeDataValueExtensions.get(type);
-                            if (extension) {
-                                // Mapping
-                                canvasData.extended.add(extension.id, value);
-                                // Initial
-                                value.value = extension.initial;
+                        }
+                        break;
+                    case EShapeDataValueType.TICKER:
+                        // Initial
+                        initial = value.initial;
+                        if (initialToInitialValue.has(initial)) {
+                            value.value = 0;
+                            canvasTicker.add(initialToInitialValue.get(initial)).add(value);
+                        }
+                        else if (0 < initial.length) {
+                            try {
+                                var initialValue = this.calcInitial(value, initial);
+                                initialToInitialValue.set(initial, initialValue);
+                                value.value = 0;
+                                canvasTicker.add(initialValue).add(value);
                             }
-                            break;
-                    }
+                            catch (e) {
+                                // DO NOTHING
+                            }
+                        }
+                        break;
+                    default:
+                        var extension = EShapeDataValueExtensions.get(value.type);
+                        if (extension) {
+                            // Mapping
+                            canvasData.extended.add(extension.id, value);
+                            // Initial
+                            value.value = extension.initial;
+                        }
+                        break;
                 }
             }
         };