@orbcharts/core 3.0.0-alpha.64 → 3.0.0-alpha.66

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@orbcharts/core",
-  "version": "3.0.0-alpha.64",
+  "version": "3.0.0-alpha.66",
   "description": "OrbCharts is an open source chart library based on d3.js and rx.js",
   "author": "Blue Planet Inc.",
   "license": "Apache-2.0",

package/src/base/createBaseChart.ts

@@ -206,13 +206,13 @@ export const createBaseChart: CreateBaseChart = <T extends ChartType>({
               throw new Error(createValidatorErrorMessage({
                 columnName,
                 expectToBe,
-                from: 'Chart.constructor'
+                from: 'Chart.dataFormatter$'
               }))
             } else if (status === 'warning') {
               console.warn(createValidatorWarningMessage({
                 columnName,
                 expectToBe,
-                from: 'Chart.constructor'
+                from: 'Chart.dataFormatter$'
               }))
             }
             
@@ -239,13 +239,13 @@ export const createBaseChart: CreateBaseChart = <T extends ChartType>({
               throw new Error(createValidatorErrorMessage({
                 columnName,
                 expectToBe,
-                from: 'Chart.constructor'
+                from: 'Chart.chartParams$'
               }))
             } else if (status === 'warning') {
               console.warn(createValidatorWarningMessage({
                 columnName,
                 expectToBe,
-                from: 'Chart.constructor'
+                from: 'Chart.chartParams$'
               }))
             }
             
@@ -375,13 +375,13 @@ export const createBaseChart: CreateBaseChart = <T extends ChartType>({
                   throw new Error(createValidatorErrorMessage({
                     columnName,
                     expectToBe,
-                    from: 'Chart.constructor'
+                    from: 'Chart.data$'
                   }))
                 } else if (status === 'warning') {
                   console.warn(createValidatorWarningMessage({
                     columnName,
                     expectToBe,
-                    from: 'Chart.constructor'
+                    from: 'Chart.data$'
                   }))
                 }
                 

package/src/base/createBasePlugin.ts

@@ -50,13 +50,13 @@ function createPluginEntity <T extends ChartType, PluginName, PluginParams>({ ch
                 throw new Error(createValidatorErrorMessage({
                   columnName,
                   expectToBe,
-                  from: 'Chart.constructor'
+                  from: `${config.name}.params$`
                 }))
               } else if (status === 'warning') {
                 console.warn(createValidatorWarningMessage({
                   columnName,
                   expectToBe,
-                  from: 'Chart.constructor'
+                  from: `${config.name}.params$`
                 }))
               }
               

package/src/utils/commonUtils.ts

@@ -6,7 +6,8 @@ export function isPlainObject(variable: any) {
 
 // 是否為function
 export function isFunction(fn: any) {
-  return !!fn && !fn.nodename && fn.constructor != String && fn.constructor != RegExp && fn.constructor != Array && /function/i.test(fn + "");
+  // return !!fn && !fn.nodename && fn.constructor != String && fn.constructor != RegExp && fn.constructor != Array && /function/i.test(fn + "");
+  return Object.prototype.toString.call(fn) === '[object Function]'
 }
 
 // 是否為dom