@fonixtree/magic-design 2.0.205 → 2.0.206

package/lib/core/Designer/ConfigPanel/index.js

@@ -144,6 +144,10 @@ var getSecondConfigName = function getSecondConfigName(selectedNode, clickedGrou
     case 'PERSONAL_INFOMATION':
       groupName = panelProps.sourceType;
       break;
+
+    case 'CAMPAIGN':
+      groupName = panelProps.type;
+      break;
   }
 
   return groupName || 'Group Name';
@@ -377,8 +381,8 @@ function (_super) {
       className: "config_header"
     }, /*#__PURE__*/_react["default"].createElement("span", {
       className: "title",
-      title: (_a = _constants.compInfoMap[selectedNode === null || selectedNode === void 0 ? void 0 : selectedNode.type]) === null || _a === void 0 ? void 0 : _a.name
-    }, (_b = _constants.compInfoMap[selectedNode === null || selectedNode === void 0 ? void 0 : selectedNode.type]) === null || _b === void 0 ? void 0 : _b.name), /*#__PURE__*/_react["default"].createElement("div", {
+      title: (selectedNode === null || selectedNode === void 0 ? void 0 : selectedNode.label) || ((_a = _constants.compInfoMap[selectedNode === null || selectedNode === void 0 ? void 0 : selectedNode.type]) === null || _a === void 0 ? void 0 : _a.name)
+    }, (selectedNode === null || selectedNode === void 0 ? void 0 : selectedNode.label) || ((_b = _constants.compInfoMap[selectedNode === null || selectedNode === void 0 ? void 0 : selectedNode.type]) === null || _b === void 0 ? void 0 : _b.name)), /*#__PURE__*/_react["default"].createElement("div", {
       className: "right_wrap"
     }, /*#__PURE__*/_react["default"].createElement(_TerminalSelect["default"], {
       onChange: this.onTerminalChange,

package/lib/core/Designer/PageCompList/index.js

@@ -293,7 +293,7 @@ function PageCompList(_a) {
       type: "icon-drag"
     }), /*#__PURE__*/_react["default"].createElement("span", {
       className: "card-title ml16"
-    }, index + 1, ". ", (_b = _constants.compInfoMap[comp.type]) === null || _b === void 0 ? void 0 : _b.name)), pageType !== 'Menu' && /*#__PURE__*/_react["default"].createElement(_antd.Dropdown, {
+    }, index + 1, ". ", comp.label || ((_b = _constants.compInfoMap[comp.type]) === null || _b === void 0 ? void 0 : _b.name))), pageType !== 'Menu' && /*#__PURE__*/_react["default"].createElement(_antd.Dropdown, {
       overlay: menu,
       placement: "bottomRight",
       trigger: ['click']

package/lib/core/Designer/index.js

@@ -427,7 +427,8 @@ function (_super) {
 
     _this.addComponent = function (_a) {
       var type = _a.type,
-          terminalType = _a.terminalType;
+          terminalType = _a.terminalType,
+          label = _a.label;
       var MPageData = _this.state.MPageData;
       var compType = _componentTypes.componentMap[type];
 
@@ -440,7 +441,8 @@ function (_super) {
 
       var newData = __spreadArrays(MPageData, [__assign(__assign({}, compInst), {
         terminalType: terminalType,
-        activeTerminal: terminalType
+        activeTerminal: terminalType,
+        label: label
       })]);
 
       _this.history.push(newData);

package/lib/meta-comp/config-panels/ImageConfig/index.js

@@ -360,8 +360,6 @@ function (_super) {
     }];
 
     if (needHover) {
-      console.log('needHover', needHover);
-
       var HoverSetting = /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, /*#__PURE__*/_react["default"].createElement(_common.Field, {
         split: data.hover.backgroundType === 'new',
         title: (0, _locale.i18n)('IMAGE')

package/lib/meta-comp/config-panels/TextConfig/index.js

@@ -177,7 +177,8 @@ function (_super) {
 
     var _a = this.props,
         data = _a.data,
-        outputType = _a.outputType;
+        outputType = _a.outputType,
+        editText = _a.editText;
     var textData = _mobx.store.textSelection ? _mobx.store.textSelection : data.content;
 
     if (!data.spacing) {
@@ -361,11 +362,19 @@ function (_super) {
 
     return /*#__PURE__*/_react["default"].createElement("div", {
       ref: this.containerRef,
-      className: "m-text-config",
-      style: {
-        paddingTop: 0
-      }
-    }, /*#__PURE__*/_react["default"].createElement(_common.Collapse // divider="dashed"
+      className: "m-text-config"
+    }, editText && /*#__PURE__*/_react["default"].createElement(_common.Field, {
+      className: "text-input",
+      split: "solid",
+      title: (0, _locale.i18n)('TEXT')
+    }, /*#__PURE__*/_react["default"].createElement(_antd.Input, {
+      onChange: function onChange(e) {
+        data.text = e.target.value;
+
+        _this.selfRender();
+      },
+      value: data.text
+    })), /*#__PURE__*/_react["default"].createElement(_common.Collapse // divider="dashed"
     // headerSize="small"
     , {
       onRefresh: this.selfRender,
@@ -375,7 +384,8 @@ function (_super) {
   };
 
   TextConfig.defaultProps = {
-    data: null
+    data: null,
+    editText: false
   };
   return TextConfig;
 }(_BaseConfig["default"]);

package/lib/meta-comp/config-panels/TextConfig/index.less

@@ -6,6 +6,13 @@
   background-color: #F5F6F7;
   border-radius: 6px;
 
+  .text-input {
+    margin-top: 20px;
+    margin-bottom: 0;
+    padding-bottom: 24px;
+    border-color: #EDF0F4 !important;
+  }
+
   .edit-text-btn {
     margin: 8px auto;
     padding: 6px 16px;

package/lib/utils/commonUtil.js

@@ -21,7 +21,6 @@ exports.getUrlParams = void 0;
 exports.goLogin = goLogin;
 exports.importAsync = void 0;
 exports.isLogin = isLogin;
-exports.jumpUrlConfig = void 0;
 exports.navigateBack = navigateBack;
 exports.onListenTouch = exports.nextTick = exports.needReverse = exports.navigateTo = void 0;
 exports.pushGA = pushGA;
@@ -46,8 +45,6 @@ var _androidUtil = require("./androidUtil");
 
 var _storeUtil = require("./storeUtil");
 
-var _businessUtil = require("./businessUtil");
-
 var _coreUtil = require("./coreUtil");
 
 var _constants = require("../constants");
@@ -574,99 +571,72 @@ var JsonToUrl = function JsonToUrl(data) {
 
   var urlParamsStr = tempArr.join('&');
   return urlParamsStr;
-};
-
-exports.JsonToUrl = JsonToUrl;
-
-var jumpUrlConfig = function jumpUrlConfig(item) {
-  var _a, _b, _c;
-
-  var _d = item || {},
-      objType = _d.objType,
-      objValue = _d.objValue;
-
-  var jumpUrl = '';
-
-  switch (objType) {
-    // 新增case
-    case 'ProductList':
-      {
-        var offerIdList = objValue.filteredProductsRela.offerIdList;
-        jumpUrl = "/product/list?from=home&objType=ProductList&offerIdList=" + offerIdList;
-        break;
-      }
-
-    case 'Category':
-      jumpUrl = (0, _coreUtil.isPc)() ? "/product/list?from=home&objType=Category&catgIds=" + objValue.objId : "/product/list/" + objValue.objId;
-      break;
-
-    case 'StoreCategory':
-      jumpUrl = (0, _coreUtil.isPc)() ? "/product/list?from=home&objType=Category&catgIds=" + objValue.objId + "&storeCatgIds=" + objValue.objId : "/product/list/" + objValue.objId + "?storeCatgIds=" + objValue.objId;
-      break;
-
-    case 'Coupons':
-      (0, _businessUtil.getAdCoupon)(objValue.objId);
-      return;
-
-    case 'ProductDetail':
-      {
-        var offerId = objValue.objId && objValue.objId.split(',')[0];
-        var productId = objValue.objId && objValue.objId.split(',')[1];
-        jumpUrl = "/product/detail/" + offerId + "?productId=" + productId;
-        break;
-      }
+}; // export const jumpUrlConfig = item => {
+//   const { objType, objValue } = item || {};
+//   let jumpUrl = '';
+//   switch (objType) {
+//     // 新增case
+//     case 'ProductList': {
+//       const { offerIdList } = objValue.filteredProductsRela;
+//       jumpUrl = `/product/list?from=home&objType=ProductList&offerIdList=${offerIdList}`;
+//       break;
+//     }
+//     case 'Category':
+//       jumpUrl = isPc() ? `/product/list?from=home&objType=Category&catgIds=${objValue.objId}` : `/product/list/${objValue.objId}`;
+//       break;
+//     case 'StoreCategory':
+//       jumpUrl = isPc() ? `/product/list?from=home&objType=Category&catgIds=${objValue.objId}&storeCatgIds=${objValue.objId}` : `/product/list/${objValue.objId}?storeCatgIds=${objValue.objId}`;
+//       break;
+//     case 'Coupons':
+//       getAdCoupon(objValue.objId);
+//       return;
+//     case 'ProductDetail': {
+//       const offerId = objValue.objId && objValue.objId.split(',')[0];
+//       const productId = objValue.objId && objValue.objId.split(',')[1];
+//       jumpUrl = `/product/detail/${offerId}?productId=${productId}`;
+//       break;
+//     }
+//     case 'ProductDetailPage': {
+//       const offerId = objValue.objId && objValue.objId.split(',')[0];
+//       const productId = objValue.objId && objValue.objId.split(',')[1];
+//       jumpUrl = `/product/detail/${offerId}?productId=${productId}`;
+//       break;
+//     }
+//     case 'FilteredProducts': {
+//       let params = JsonToUrl(objValue.filteredProductsRela);
+//       params = params.replace('productName', 'q').replace('cmpTypeId', 'campaignType');
+//       jumpUrl = isPc() ? `/product/list?from=home&objType=FilteredProducts&${params}` : `/product/list/null?${params}`;
+//       break;
+//     }
+//     case 'FunctionPage': {
+//       const url = objValue.objId && objValue.objId.split(',')[1];
+//       jumpUrl = `${url}`;
+//       break;
+//     }
+//     case 'CustomizedPage':
+//       jumpUrl = `/poster/${objValue.objId}`;
+//       break;
+//     case 'URL': {
+//       if (objValue.urlRelaDto?.openMode === 'new') {
+//         window.open(objValue.urlRelaDto.url);
+//       } else {
+//         window.location.href = objValue?.urlRelaDto?.url ?? objValue.url;
+//       }
+//       return;
+//     }
+//     default:
+//       break;
+//   }
+//   clickUrl(jumpUrl);
+// };
 
-    case 'ProductDetailPage':
-      {
-        var offerId = objValue.objId && objValue.objId.split(',')[0];
-        var productId = objValue.objId && objValue.objId.split(',')[1];
-        jumpUrl = "/product/detail/" + offerId + "?productId=" + productId;
-        break;
-      }
-
-    case 'FilteredProducts':
-      {
-        var params = JsonToUrl(objValue.filteredProductsRela);
-        params = params.replace('productName', 'q').replace('cmpTypeId', 'campaignType');
-        jumpUrl = (0, _coreUtil.isPc)() ? "/product/list?from=home&objType=FilteredProducts&" + params : "/product/list/null?" + params;
-        break;
-      }
-
-    case 'FunctionPage':
-      {
-        var url = objValue.objId && objValue.objId.split(',')[1];
-        jumpUrl = "" + url;
-        break;
-      }
-
-    case 'CustomizedPage':
-      jumpUrl = "/poster/" + objValue.objId;
-      break;
-
-    case 'URL':
-      {
-        if (((_a = objValue.urlRelaDto) === null || _a === void 0 ? void 0 : _a.openMode) === 'new') {
-          window.open(objValue.urlRelaDto.url);
-        } else {
-          window.location.href = (_c = (_b = objValue === null || objValue === void 0 ? void 0 : objValue.urlRelaDto) === null || _b === void 0 ? void 0 : _b.url) !== null && _c !== void 0 ? _c : objValue.url;
-        }
-
-        return;
-      }
-
-    default:
-      break;
-  }
-
-  (0, _coreUtil.clickUrl)(jumpUrl);
-};
 /**
  * 补0 函数
  * @param {*} num 数字
  */
 
 
-exports.jumpUrlConfig = jumpUrlConfig;
+exports.JsonToUrl = JsonToUrl;
 
 var addZero = function addZero(num) {
   return String(num).length === 1 ? "0" + String(num) : String(num);

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@fonixtree/magic-design",
   "author": "Cylon Team",
-  "version": "2.0.205",
+  "version": "2.0.206",
   "description": "Magic Design",
   "license": "MIT",
   "module": "es/index.js",