@easyv/config 1.2.10 → 1.2.12

package/lib/interaction.js

@@ -94,12 +94,12 @@ var _default = function _default(_ref) {
           name: 'controls',
           displayName: '控制',
           type: 'object',
-          value: [{
+          value: [].concat((0, _toConsumableArray2["default"])(remoteControl), [{
             name: 'control',
             displayName: '控制',
             type: 'remoteOptions',
             value: '{}'
-          }]
+          }])
         }]
       }
     }].filter(function (item) {

package/lib/tooltip.js

@@ -14,8 +14,9 @@ var defaultTooltip = {
       x: 0,
       y: 0
     },
+    bgType: 'image',
     bgColor: 'rgba(48, 55, 66, 0.85)',
-    image: '',
+    image: 'components/static-image/vectorShapeV2/tipboxBg.png',
     size: {
       width: 120,
       height: 110
@@ -104,6 +105,8 @@ var _default = function _default() {
     tipTranslateX = _ref$tip$translate$x === void 0 ? defaultTooltip.tip.translate.x : _ref$tip$translate$x,
     _ref$tip$translate$y = _ref$tip$translate.y,
     tipTranslateY = _ref$tip$translate$y === void 0 ? defaultTooltip.tip.translate.y : _ref$tip$translate$y,
+    _ref$tip$bgType = _ref$tip.bgType,
+    bgType = _ref$tip$bgType === void 0 ? defaultTooltip.tip.bgType : _ref$tip$bgType,
     _ref$tip$bgColor = _ref$tip.bgColor,
     bgColor = _ref$tip$bgColor === void 0 ? defaultTooltip.tip.bgColor : _ref$tip$bgColor,
     _ref$tip$image = _ref$tip.image,
@@ -216,15 +219,30 @@ var _default = function _default() {
       name: 'tip',
       displayName: '提示框',
       value: [(0, _.translate)(tipTranslateX, tipTranslateY), {
+        name: "bgType",
+        displayName: "背景类型",
+        type: "radio",
+        value: bgType,
+        config: {
+          options: [{
+            name: "颜色",
+            value: "color"
+          }, {
+            name: "图片",
+            value: "image"
+          }]
+        }
+      }, {
+        rule: [["bgType", "$eq", "color"]],
         name: "bgColor",
-        displayName: "背景色",
+        displayName: "颜色",
         type: "color",
-        value: bgColor,
-        tip: "如果没有背景图，则启用背景色作为背景"
+        value: bgColor
       }, {
+        rule: [["bgType", "$eq", "image"]],
         type: 'uploadImage',
         name: 'image',
-        displayName: '背景',
+        displayName: '图片',
         value: image
       }, {
         name: 'size',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@easyv/config",
-  "version": "1.2.10",
+  "version": "1.2.12",
   "description": "",
   "main": "index.js",
   "scripts": {

package/src/interaction.js

@@ -105,6 +105,7 @@ export default ({ callback, remoteControl }) => ({
                     displayName: '控制',
                     type: 'object',
                     value: [
+                      ...remoteControl,
                       {
                         name: 'control',
                         displayName: '控制',

package/src/tooltip.js

@@ -5,8 +5,9 @@ const defaultTooltip = {
   interval: 4,
   tip: {
     translate: { x: 0, y: 0 },
+    bgType: 'image',
     bgColor: 'rgba(48, 55, 66, 0.85)',
-    image: '',
+    image: 'components/static-image/vectorShapeV2/tipboxBg.png',
     size: { width: 120, height: 110 },
     margin: {
       marginTop: 13,
@@ -76,6 +77,7 @@ export default ({
       x: tipTranslateX = defaultTooltip.tip.translate.x,
       y: tipTranslateY = defaultTooltip.tip.translate.y,
     } = defaultTooltip.tip.translate,
+    bgType = defaultTooltip.tip.bgType,
     bgColor = defaultTooltip.tip.bgColor,
     image = defaultTooltip.tip.image,
     size: {
@@ -176,16 +178,29 @@ export default ({
       value: [
         translate(tipTranslateX, tipTranslateY),
         {
+          name:"bgType",
+          displayName:"背景类型",
+          type:"radio",
+          value:bgType,
+          config:{
+            options:[
+              {name:"颜色",value:"color"},
+              {name:"图片",value:"image"}
+            ]
+          }
+        },
+        {
+          rule:[["bgType","$eq","color"]],
           name:"bgColor",
-          displayName:"背景色",
+          displayName:"颜色",
           type:"color",
-          value:bgColor,
-          tip:"如果没有背景图，则启用背景色作为背景"
+          value:bgColor
         },
         {
+          rule:[["bgType","$eq","image"]],
           type: 'uploadImage',
           name: 'image',
-          displayName: '背景',
+          displayName: '图片',
           value: image,
         },
         {