@easyv/config 1.1.9 → 1.1.10

package/.babelrc

@@ -1,9 +1,9 @@
-{
-  "presets": ["@babel/preset-env", "@babel/preset-react"],
-  "plugins": [
-    "@babel/plugin-proposal-export-default-from",
-    "@babel/plugin-transform-runtime",
-    "@babel/plugin-proposal-class-properties",
-    "babel-plugin-transform-import-styles"
-  ]
-}
+{
+  "presets": ["@babel/preset-env", "@babel/preset-react"],
+  "plugins": [
+    "@babel/plugin-proposal-export-default-from",
+    "@babel/plugin-transform-runtime",
+    "@babel/plugin-proposal-class-properties",
+    "babel-plugin-transform-import-styles"
+  ]
+}

package/CHANGELOG.md

@@ -1,17 +1,17 @@
-# Changelog
-
-All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
-
-## [1.1.0](https://gitlab.prod.dtstack.cn:10022/visdev/visApplication/easyv-config/compare/v1.0.53...v1.1.0) (2022-04-27)
-
-
-### Features
-
-* **animation.js:** 增加数据动画配置项 ([aae17b3](https://gitlab.prod.dtstack.cn:10022/visdev/visApplication/easyv-config/commit/aae17b34bf57b6cd4055ee622c6830dd8d2d1dab))
-* **animation.js:** interval配置项可选 ([8d49a7a](https://gitlab.prod.dtstack.cn:10022/visdev/visApplication/easyv-config/commit/8d49a7a7cefde401eb2ccf23ef68e97105baf729))
-
-### [1.0.53](https://gitlab.prod.dtstack.cn:10022/visdev/visApplication/easyv-config/compare/v1.0.52...v1.0.53) (2022-04-08)
-
-### [1.0.52](https://gitlab.prod.dtstack.cn:10022/visdev/visApplication/easyv-config/compare/v1.0.51...v1.0.52) (2022-04-02)
-
-### 1.0.51 (2022-04-02)
+# Changelog
+
+All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
+
+## [1.1.0](https://gitlab.prod.dtstack.cn:10022/visdev/visApplication/easyv-config/compare/v1.0.53...v1.1.0) (2022-04-27)
+
+
+### Features
+
+* **animation.js:** 增加数据动画配置项 ([aae17b3](https://gitlab.prod.dtstack.cn:10022/visdev/visApplication/easyv-config/commit/aae17b34bf57b6cd4055ee622c6830dd8d2d1dab))
+* **animation.js:** interval配置项可选 ([8d49a7a](https://gitlab.prod.dtstack.cn:10022/visdev/visApplication/easyv-config/commit/8d49a7a7cefde401eb2ccf23ef68e97105baf729))
+
+### [1.0.53](https://gitlab.prod.dtstack.cn:10022/visdev/visApplication/easyv-config/compare/v1.0.52...v1.0.53) (2022-04-08)
+
+### [1.0.52](https://gitlab.prod.dtstack.cn:10022/visdev/visApplication/easyv-config/compare/v1.0.51...v1.0.52) (2022-04-02)
+
+### 1.0.51 (2022-04-02)

package/index.js

@@ -1,3 +1,3 @@
-const config = require('./lib');
-
-module.exports = config;
+const config = require('./lib');
+
+module.exports = config;

package/lib/axes.js

@@ -13,9 +13,9 @@ var _ = require(".");
 
 var _label = require("./label");
 
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
 
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { (0, _defineProperty2["default"])(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { (0, _defineProperty2["default"])(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
 
 var defaultFont = (0, _.font)();
 var defaultFontAxisY = (0, _.font)({

package/lib/baseLine.js

@@ -11,9 +11,9 @@ var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/de
 
 var _ = require(".");
 
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
 
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { (0, _defineProperty2["default"])(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { (0, _defineProperty2["default"])(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
 
 var defaultBaseLine = {
   line: {

package/lib/interaction.js

@@ -9,8 +9,8 @@ exports["default"] = void 0;
 
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 
-/**
- * TODO:有个触发回调的类型
+/**
+ * TODO:有个触发回调的类型
  */
 var defaultAction = 'click';
 var defaultCallback = {

package/lib/label.js

@@ -11,9 +11,9 @@ var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/de
 
 var _ = require(".");
 
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
 
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { (0, _defineProperty2["default"])(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { (0, _defineProperty2["default"])(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
 
 var defaultFont = (0, _.font)();
 var defaultLabel = {

package/lib/legend.js

@@ -11,9 +11,9 @@ var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers
 
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
 
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { (0, _defineProperty2["default"])(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { (0, _defineProperty2["default"])(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
 
 var _require = require('.'),
     translateConfig = _require.translate,

package/lib/mutiColor.js

@@ -1,52 +1,52 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports["default"] = void 0;
-var defaultMutiColor = {
-  type: 'linear',
-  pure: '#fff',
-  linear: {
-    stops: [{
-      offset: 0,
-      color: '#fff'
-    }, {
-      offset: 50,
-      color: '#ff0'
-    }, {
-      offset: 100,
-      color: '#f0f'
-    }],
-    angle: 30,
-    opacity: 1
-  }
-};
-
-var _default = function _default() {
-  var _ref = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : defaultMutiColor,
-      _ref$type = _ref.type,
-      type = _ref$type === void 0 ? defaultMutiColor.type : _ref$type,
-      _ref$pure = _ref.pure,
-      pure = _ref$pure === void 0 ? defaultMutiColor.pure : _ref$pure,
-      _ref$linear = _ref.linear;
-
-  _ref$linear = _ref$linear === void 0 ? defaultMutiColor.linear : _ref$linear;
-  var _ref$linear$stops = _ref$linear.stops,
-      stops = _ref$linear$stops === void 0 ? defaultMutiColor.linear.stops : _ref$linear$stops,
-      _ref$linear$angle = _ref$linear.angle,
-      angle = _ref$linear$angle === void 0 ? defaultMutiColor.linear.angle : _ref$linear$angle,
-      _ref$linear$opacity = _ref$linear.opacity,
-      opacity = _ref$linear$opacity === void 0 ? defaultMutiColor.linear.opacity : _ref$linear$opacity;
-  return {
-    type: type,
-    pure: pure,
-    linear: {
-      stops: stops,
-      angle: angle,
-      opacity: opacity
-    }
-  };
-};
-
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports["default"] = void 0;
+var defaultMutiColor = {
+  type: 'linear',
+  pure: '#fff',
+  linear: {
+    stops: [{
+      offset: 0,
+      color: '#fff'
+    }, {
+      offset: 50,
+      color: '#ff0'
+    }, {
+      offset: 100,
+      color: '#f0f'
+    }],
+    angle: 30,
+    opacity: 1
+  }
+};
+
+var _default = function _default() {
+  var _ref = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : defaultMutiColor,
+      _ref$type = _ref.type,
+      type = _ref$type === void 0 ? defaultMutiColor.type : _ref$type,
+      _ref$pure = _ref.pure,
+      pure = _ref$pure === void 0 ? defaultMutiColor.pure : _ref$pure,
+      _ref$linear = _ref.linear;
+
+  _ref$linear = _ref$linear === void 0 ? defaultMutiColor.linear : _ref$linear;
+  var _ref$linear$stops = _ref$linear.stops,
+      stops = _ref$linear$stops === void 0 ? defaultMutiColor.linear.stops : _ref$linear$stops,
+      _ref$linear$angle = _ref$linear.angle,
+      angle = _ref$linear$angle === void 0 ? defaultMutiColor.linear.angle : _ref$linear$angle,
+      _ref$linear$opacity = _ref$linear.opacity,
+      opacity = _ref$linear$opacity === void 0 ? defaultMutiColor.linear.opacity : _ref$linear$opacity;
+  return {
+    type: type,
+    pure: pure,
+    linear: {
+      stops: stops,
+      angle: angle,
+      opacity: opacity
+    }
+  };
+};
+
 exports["default"] = _default;

package/lib/pie.js

@@ -11,9 +11,9 @@ var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/de
 
 var _ = require("./");
 
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
 
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { (0, _defineProperty2["default"])(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { (0, _defineProperty2["default"])(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
 
 var defaultBasePie = {
   chart: {

package/lib/sc.js

@@ -9,9 +9,9 @@ exports["default"] = void 0;
 
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
 
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { (0, _defineProperty2["default"])(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { (0, _defineProperty2["default"])(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
 
 var _default = function _default(name, displayName) {
   var type = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : "";
@@ -24,7 +24,12 @@ var _default = function _default(name, displayName) {
     value: value
   };
   if (type) res["type"] = type;
-  if (config) res['config'] = config;
+
+  if (config) {
+    if (config.other) res = _objectSpread(_objectSpread({}, res), config.other);
+    res['config'] = config;
+  }
+
   if (rule) res = _objectSpread(_objectSpread({}, rule), res);
   return res;
 };

package/lib/unit.js

@@ -9,9 +9,9 @@ exports["default"] = void 0;
 
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
 
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { (0, _defineProperty2["default"])(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { (0, _defineProperty2["default"])(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
 
 var _require = require('.'),
     translate = _require.translate;

package/package.json

@@ -1,31 +1,31 @@
-{
-  "name": "@easyv/config",
-  "version": "1.1.9",
-  "description": "",
-  "main": "index.js",
-  "scripts": {
-    "make": "babel src -d lib",
-    "release": "standard-version"
-  },
-  "keywords": [],
-  "author": "",
-  "license": "ISC",
-  "devDependencies": {
-    "@babel/cli": "^7.6.0",
-    "@babel/core": "^7.11.5",
-    "@babel/plugin-proposal-class-properties": "^7.10.4",
-    "@babel/plugin-proposal-export-default-from": "^7.10.4",
-    "@babel/plugin-transform-runtime": "^7.11.5",
-    "@babel/preset-env": "^7.11.5",
-    "@babel/preset-react": "^7.10.4",
-    "@babel/runtime": "^7.17.7",
-    "babel-plugin-transform-import-styles": "0.0.11",
-    "babel-preset-env": "^1.7.0",
-    "standard-version": "^9.3.2"
-  },
-  "standard-version": {
-    "skip": {
-      "commit": true
-    }
-  }
+{
+  "name": "@easyv/config",
+  "version": "1.1.10",
+  "description": "",
+  "main": "index.js",
+  "scripts": {
+    "make": "babel src -d lib",
+    "release": "standard-version"
+  },
+  "keywords": [],
+  "author": "",
+  "license": "ISC",
+  "devDependencies": {
+    "@babel/cli": "^7.6.0",
+    "@babel/core": "^7.11.5",
+    "@babel/plugin-proposal-class-properties": "^7.10.4",
+    "@babel/plugin-proposal-export-default-from": "^7.10.4",
+    "@babel/plugin-transform-runtime": "^7.11.5",
+    "@babel/preset-env": "^7.11.5",
+    "@babel/preset-react": "^7.10.4",
+    "@babel/runtime": "^7.17.7",
+    "babel-plugin-transform-import-styles": "0.0.11",
+    "babel-preset-env": "^1.7.0",
+    "standard-version": "^9.3.2"
+  },
+  "standard-version": {
+    "skip": {
+      "commit": true
+    }
+  }
 }