@fonixtree/magic-design 0.0.150 → 0.0.151

package/es/meta-comp/components/Text/index.js

@@ -319,7 +319,8 @@ function (_super) {
       node.appendChild(closeNode);
     };
 
-    _this.renderText = function (data) {
+    _this.renderText = function (data, mode) {
+      var outputType = _this.props.outputType || window.magicDesign.outputType;
       if (!_this.textRef.current) return;
 
       _this.textRef.current.blur();
@@ -332,23 +333,57 @@ function (_super) {
       /** 渲染html */
 
       if (data.specialContent.length == 0) {
-        _this.textRef.current.innerHTML = data.text;
+        if (outputType == 'html' && mode == 'renderer') {
+          if (data === null || data === void 0 ? void 0 : data.content.clickUrl) {
+            var a = document.createElement('a');
+            a.href = data.content.clickUrl;
+            a.target = '_blank';
+            a.innerHTML = data.text;
+            _this.textRef.current.innerHTML = '';
+
+            _this.textRef.current.appendChild(a);
+          } else {
+            _this.textRef.current.innerHTML = data.text;
+          }
+        } else {
+          _this.textRef.current.innerHTML = data.text;
+        }
       } else {
         _this.textRef.current.innerHTML = '';
         data.specialContent.forEach(function (c, index) {
-          var _a;
+          var _a, _b, _c;
 
           var node = document.createElement('span');
           node.style = (0, _commonUtil.styleStringify)(contentStyle(c.content));
-          node.innerText = (_a = data.text).slice.apply(_a, c.range);
 
-          node.onclick = function (e) {
-            if (c.content.clickUrl) {
-              e.stopPropagation();
-            }
+          if (c === null || c === void 0 ? void 0 : c.content.clickUrl) {
+            if (outputType == 'html' && mode == 'renderer') {
+              var a = document.createElement('a');
+              a.href = c.content.clickUrl;
+              a.target = '_blank';
+
+              if (mode == 'designer') {
+                a.onclick = function (e) {
+                  e.preventDefault();
+                };
+              }
 
-            (0, _coreUtil.clickUrl)(c.content.clickUrl);
-          };
+              a.innerText = (_a = data.text).slice.apply(_a, c.range);
+              node.appendChild(a);
+            } else {
+              node.innerText = (_b = data.text).slice.apply(_b, c.range);
+
+              node.onclick = function (e) {
+                if (c.content.clickUrl) {
+                  e.stopPropagation();
+                }
+
+                (0, _coreUtil.clickUrl)(c.content.clickUrl);
+              };
+            }
+          } else {
+            node.innerText = (_c = data.text).slice.apply(_c, c.range);
+          }
 
           _this.selectionRefMap[JSON.stringify(c.range)] = node;
 
@@ -356,7 +391,7 @@ function (_super) {
           /** 找到当前选中的区域 */
 
 
-          if (_mobx.store.textSelection == c.content) {
+          if (_mobx.store.textSelection == (c === null || c === void 0 ? void 0 : c.content)) {
             /** 添加删除按钮 */
             _this.createHoverClose(node, function () {
               /** 第一步去除选中区域 */
@@ -402,14 +437,14 @@ function (_super) {
   Text.prototype.componentDidMount = function () {
     var _this = this;
 
-    this.renderText(this.props.data);
+    this.renderText(this.props.data, this.props.mode);
     initSelectionEvent();
     appendSelectionTarget({
       target: this.textRef.current,
       data: this.props.data,
       selectionRefMap: this.selectionRefMap,
       refresh: function refresh() {
-        _this.renderText(_this.props.data);
+        _this.renderText(_this.props.data, _this.props.mode);
       }
     });
   };
@@ -421,7 +456,7 @@ function (_super) {
     var result = should1 || should2 || should3;
 
     if (result) {
-      this.renderText(nextProps.data);
+      this.renderText(nextProps.data, this.props.mode);
     }
 
     return result;
@@ -438,7 +473,8 @@ function (_super) {
         data = _a.data,
         className = _a.className,
         readonly = _a.readonly,
-        onTextInput = _a.onTextInput;
+        onTextInput = _a.onTextInput,
+        mode = _a.mode;
     var style = contentStyle(data.content);
 
     if (data.underline) {
@@ -461,12 +497,14 @@ function (_super) {
     //   textDecorationColor: data?.underline.textDecorationColor,
     //   textDecorationStyle: data?.underline.textDecorationStyle,
     // };
+    // mode == 'designer' && !readonly
+    // console.log('!readonly: ', mode, readonly);
 
 
     return /*#__PURE__*/_react["default"].createElement("div", {
       ref: this.textRef,
       className: (0, _classnames["default"])('m-meta-text', className),
-      contentEditable: (0, _coreUtil.isDesignMode)() && !readonly,
+      contentEditable: mode == 'designer' && !readonly,
       onClick: function onClick() {
         (0, _coreUtil.clickUrl)(data.content.clickUrl);
       },
@@ -495,6 +533,7 @@ function (_super) {
 
   Text.defaultProps = {
     readonly: false,
+    mode: 'designer',
     onTextInput: function onTextInput() {}
   };
   Text = __decorate([_decorator.metaDecorator], Text);

package/es/utils/businessUtil.js

@@ -57,12 +57,12 @@ var parseUrl = function parseUrl(url) {
 
     case _constants.urlType.CUSTOMIZED:
       // 自定义页面
-      pcLink = "/group/" + arg1;
-      h5Link = "/group/" + arg1;
+      pcLink = "/poster/" + arg1;
+      h5Link = "/poster/" + arg1;
       params = {
         type: 'CUSTOMIZED',
         data: {
-          url: "/group/" + arg1
+          url: "/poster/" + arg1
         }
       };
       break;

package/es/utils/commonUtil.js

@@ -9,6 +9,7 @@ exports.checkFileName = exports.calcLastTime = void 0;
 exports.commonFetch = commonFetch;
 exports.convertImageUrl = convertImageUrl;
 exports.copy2ClipBoard = copy2ClipBoard;
+exports.covertKey = covertKey;
 exports.dragSource = void 0;
 exports.ensure = ensure;
 exports.getColorRgba = void 0;
@@ -22,6 +23,8 @@ exports.styleStringify = void 0;
 
 var _axios = _interopRequireDefault(require("axios"));
 
+var _lodash = require("lodash");
+
 var _qs = _interopRequireDefault(require("qs"));
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
@@ -463,4 +466,12 @@ function pushGA(data) {
     pageName_moduleName_groupName: 'pageName_moduleName_groupName' + random,
     pageName_moduleName_groupName_elementNam: 'pageName_moduleName_groupName_elementNam' + random
   }, data)); // }, 1000);
+}
+/** react key 计算 */
+
+
+function covertKey(data, func) {
+  var newData = (0, _lodash.cloneDeep)(data);
+  func(newData);
+  return JSON.stringify(newData);
 }

package/es/utils/coreUtil.js

@@ -287,9 +287,9 @@ var getCoupon = function getCoupon(couponId) {
 };
 
 var clickUrl = function clickUrl(url) {
-  console.log('url', url);
+  console.log('clickUrl...', url);
 
-  if (window.magicDesign.readOnly || window.magicDesign.mode !== 'renderer' || !url) {
+  if (window.magicDesign.readOnly || window.magicDesign.mode !== 'renderer' || !url || window.magicDesign.outputType == 'html') {
     return;
   }
 
@@ -310,9 +310,13 @@ var clickUrl = function clickUrl(url) {
     if (url.startsWith('/')) {
       (0, _commonUtil.navigateTo)(url);
     } else {
-      // location.href = url;
       var newUrl = isPc() ? pcLink : h5Link;
-      (0, _commonUtil.navigateTo)(newUrl);
+
+      if (newUrl.startsWith('/')) {
+        (0, _commonUtil.navigateTo)(newUrl);
+      } else {
+        window.location.href = newUrl;
+      }
     }
 
     return;

package/lib/common/ImageModal/index.js

@@ -243,45 +243,49 @@ function ImageModal(_a) {
       selectedPics = _f[0],
       setSelectedPics = _f[1];
 
-  var _g = (0, _react.useState)([]),
-      contents = _g[0],
-      setContents = _g[1];
+  var _g = (0, _react.useState)(''),
+      wapUrl = _g[0],
+      setWapUrl = _g[1];
 
-  var _h = (0, _react.useState)(0),
-      total = _h[0],
-      setTotal = _h[1];
+  var _h = (0, _react.useState)([]),
+      contents = _h[0],
+      setContents = _h[1];
 
-  var _j = (0, _react.useState)(1),
-      pageIndex = _j[0],
-      setPageIndex = _j[1];
+  var _j = (0, _react.useState)(0),
+      total = _j[0],
+      setTotal = _j[1];
 
-  var _k = (0, _react.useState)(20),
-      pageSize = _k[0],
-      setPageSize = _k[1];
+  var _k = (0, _react.useState)(1),
+      pageIndex = _k[0],
+      setPageIndex = _k[1];
 
-  var _l = (0, _react.useState)(false),
-      spinning = _l[0],
-      setSpinning = _l[1];
+  var _l = (0, _react.useState)(20),
+      pageSize = _l[0],
+      setPageSize = _l[1];
 
-  var _m = (0, _react.useState)(''),
-      name = _m[0],
-      setName = _m[1];
+  var _m = (0, _react.useState)(false),
+      spinning = _m[0],
+      setSpinning = _m[1];
 
-  var _o = (0, _react.useState)([]),
-      contentcatgsList = _o[0],
-      setContentcatgsList = _o[1];
+  var _o = (0, _react.useState)(''),
+      name = _o[0],
+      setName = _o[1];
 
-  var _p = (0, _react.useState)(''),
-      searchValue = _p[0],
-      setSearchValue = _p[1];
+  var _p = (0, _react.useState)([]),
+      contentcatgsList = _p[0],
+      setContentcatgsList = _p[1];
 
-  var _q = (0, _react.useState)([]),
-      expandedKeys = _q[0],
-      setExpandedKeys = _q[1];
+  var _q = (0, _react.useState)(''),
+      searchValue = _q[0],
+      setSearchValue = _q[1];
 
-  var _r = (0, _react.useState)(true),
-      autoExpandParent = _r[0],
-      setAutoExpandParent = _r[1]; // const currentUser = sessionUtil.getUser() || {};
+  var _r = (0, _react.useState)([]),
+      expandedKeys = _r[0],
+      setExpandedKeys = _r[1];
+
+  var _s = (0, _react.useState)(true),
+      autoExpandParent = _s[0],
+      setAutoExpandParent = _s[1]; // const currentUser = sessionUtil.getUser() || {};
   // const { _csrf } = currentUser;
   // const headers = {};
   // if (_csrf && _csrf.headerName) {
@@ -425,8 +429,44 @@ function ImageModal(_a) {
     });
   };
 
+  var getPreConfig = function getPreConfig() {
+    return __awaiter(_this, void 0, void 0, function () {
+      var wapUrl_1, error_1;
+      return __generator(this, function (_a) {
+        switch (_a.label) {
+          case 0:
+            _a.trys.push([0, 2,, 3]);
+
+            return [4
+            /*yield*/
+            , (0, _commonUtil.commonFetch)(window.magicDesign.MBaseUrl + "/pages/platforminfo")];
+
+          case 1:
+            wapUrl_1 = _a.sent().wapUrl;
+            setWapUrl(wapUrl_1);
+            return [3
+            /*break*/
+            , 3];
+
+          case 2:
+            error_1 = _a.sent();
+            console.error(error_1);
+            return [3
+            /*break*/
+            , 3];
+
+          case 3:
+            return [2
+            /*return*/
+            ];
+        }
+      });
+    });
+  };
+
   (0, _react.useEffect)(function () {
     getContentCatgs();
+    getPreConfig();
   }, []);
 
   var selectFolder = function selectFolder(id) {
@@ -676,7 +716,11 @@ function ImageModal(_a) {
     },
     onCancel: onCancel,
     onOk: function onOk() {
-      return _onOk(selectedPics);
+      return _onOk(selectedPics.map(function (item) {
+        return __assign(__assign({}, item), {
+          url: wapUrl + item.url
+        });
+      }));
     },
     visible: visible
   }, /*#__PURE__*/_react["default"].createElement(_antd.Row, {

package/lib/common/LinkModal/BundleCampaign/index.js

@@ -251,7 +251,7 @@ var BundleCampaign = function BundleCampaign(props) {
           case 0:
             return [4
             /*yield*/
-            , (0, _commonUtil.commonFetch)(window.magicDesign.MBaseUrl + "/bundle/list", params, 'GET')];
+            , (0, _commonUtil.commonFetch)(window.magicDesign.MBaseUrl + "/operation/v1/bundle/list", params, 'GET')];
 
           case 1:
             res = _a.sent();
@@ -284,7 +284,7 @@ var BundleCampaign = function BundleCampaign(props) {
           case 0:
             return [4
             /*yield*/
-            , (0, _commonUtil.commonFetch)(window.magicDesign.MBaseUrl + "/stores/list", {}, 'GET')];
+            , (0, _commonUtil.commonFetch)(window.magicDesign.MBaseUrl + "/operation/v1/stores/list", {}, 'GET')];
 
           case 1:
             res = _a.sent();

package/lib/common/LinkModal/CatgTable/index.js

@@ -184,7 +184,7 @@ function CatgTable(props) {
             setLoading(true);
             return [4
             /*yield*/
-            , (0, _commonUtil.commonFetch)(window.magicDesign.MBaseUrl + "/offercatgs/list", {}, 'GET')];
+            , (0, _commonUtil.commonFetch)(window.magicDesign.MBaseUrl + "/operation/v1/offercatgs/list", {}, 'GET')];
 
           case 1:
             res = _a.sent();

package/lib/common/LinkModal/CouponTable/index.js

@@ -250,7 +250,7 @@ function CouponTable(props) {
             setLoading(true);
             return [4
             /*yield*/
-            , (0, _commonUtil.commonFetch)(window.magicDesign.MBaseUrl + "/coupons/couponList/page?tableFlag=effective&isPublic=Y&state=A&pageTotal=false&couponLocation=Promotion", params, 'GET')];
+            , (0, _commonUtil.commonFetch)(window.magicDesign.MBaseUrl + "/operation/v1/coupons/couponList/page?tableFlag=effective&isPublic=Y&state=A&pageTotal=false&couponLocation=Promotion", params, 'GET')];
 
           case 1:
             res = _a.sent();

package/lib/common/LinkModal/FilteredProductModal/index.js

@@ -346,7 +346,7 @@ var FilteredProductModal = function FilteredProductModal(props) {
           case 0:
             return [4
             /*yield*/
-            , (0, _commonUtil.commonFetch)(window.magicDesign.MBaseUrl + "/offercatgs/list", {}, 'GET')];
+            , (0, _commonUtil.commonFetch)(window.magicDesign.MBaseUrl + "/operation/v1/offercatgs/list", {}, 'GET')];
 
           case 1:
             res = _a.sent();
@@ -368,7 +368,7 @@ var FilteredProductModal = function FilteredProductModal(props) {
           case 0:
             return [4
             /*yield*/
-            , (0, _commonUtil.commonFetch)(window.magicDesign.MBaseUrl + "/brands/list", {}, 'GET')];
+            , (0, _commonUtil.commonFetch)(window.magicDesign.MBaseUrl + "/operation/v1/brands/list", {}, 'GET')];
 
           case 1:
             res = _a.sent();
@@ -390,7 +390,7 @@ var FilteredProductModal = function FilteredProductModal(props) {
           case 0:
             return [4
             /*yield*/
-            , (0, _commonUtil.commonFetch)(window.magicDesign.MBaseUrl + "/labels/list", {}, 'GET')];
+            , (0, _commonUtil.commonFetch)(window.magicDesign.MBaseUrl + "/operation/v1/labels/list", {}, 'GET')];
 
           case 1:
             res = _a.sent();
@@ -412,7 +412,7 @@ var FilteredProductModal = function FilteredProductModal(props) {
           case 0:
             return [4
             /*yield*/
-            , (0, _commonUtil.commonFetch)(window.magicDesign.MBaseUrl + "/stores/list", {}, 'GET')];
+            , (0, _commonUtil.commonFetch)(window.magicDesign.MBaseUrl + "/operation/v1/stores/list", {}, 'GET')];
 
           case 1:
             res = _a.sent();
@@ -468,7 +468,7 @@ var FilteredProductModal = function FilteredProductModal(props) {
               };
               return [4
               /*yield*/
-              , (0, _commonUtil.commonFetch)(window.magicDesign.MBaseUrl + "/offers/es", params, 'POST')];
+              , (0, _commonUtil.commonFetch)(window.magicDesign.MBaseUrl + "/operation/v1/offers/es", params, 'POST')];
 
             case 1:
               res = _a.sent(); // const res = await commonFetch(`${window.magicDesign.MBaseUrl}/products`, params, 'GET');

package/lib/common/LinkModal/FunctionTable/index.js

@@ -193,7 +193,7 @@ function FunctionTable(props) {
             setLoading(true);
             return [4
             /*yield*/
-            , (0, _commonUtil.commonFetch)(window.magicDesign.MBaseUrl + "/pages/functions", {}, 'GET')];
+            , (0, _commonUtil.commonFetch)(window.magicDesign.MBaseUrl + "/operation/v1/pages/functions", {}, 'GET')];
 
           case 1:
             res = _a.sent();

package/lib/common/LinkModal/ProductDetailPage/index.js

@@ -279,7 +279,7 @@ var ProductDetailPage = function ProductDetailPage(props) {
           case 0:
             return [4
             /*yield*/
-            , (0, _commonUtil.commonFetch)(window.magicDesign.MBaseUrl + "/products", params, 'GET')];
+            , (0, _commonUtil.commonFetch)(window.magicDesign.MBaseUrl + "/operation/v1/products", params, 'GET')];
 
           case 1:
             res = _a.sent();
@@ -304,7 +304,7 @@ var ProductDetailPage = function ProductDetailPage(props) {
           case 0:
             return [4
             /*yield*/
-            , (0, _commonUtil.commonFetch)(window.magicDesign.MBaseUrl + "/brands/list", {}, 'GET')];
+            , (0, _commonUtil.commonFetch)(window.magicDesign.MBaseUrl + "/operation/v1/brands/list", {}, 'GET')];
 
           case 1:
             res = _a.sent();
@@ -326,7 +326,7 @@ var ProductDetailPage = function ProductDetailPage(props) {
           case 0:
             return [4
             /*yield*/
-            , (0, _commonUtil.commonFetch)(window.magicDesign.MBaseUrl + "/stores/list", {}, 'GET')];
+            , (0, _commonUtil.commonFetch)(window.magicDesign.MBaseUrl + "/operation/v1/stores/list", {}, 'GET')];
 
           case 1:
             res = _a.sent();

package/lib/common/LinkModal/index.js

@@ -276,11 +276,11 @@ var LinkModal = function LinkModal(props) {
     onChange: function onChange(value) {
       return setLinkUrl(value);
     }
-  }), selected === 'ProductDetailsPage' && /*#__PURE__*/_react["default"].createElement(_ProductDetailPage["default"], {
+  }), selected === 'ProductDetailPage' && /*#__PURE__*/_react["default"].createElement(_ProductDetailPage["default"], {
     setUrl: function setUrl(url) {
       return setLinkUrl(url);
     }
-  }), selected === 'FilteredProducts' && /*#__PURE__*/_react["default"].createElement(_FilteredProductModal["default"], {
+  }), selected === 'FilteredProduct' && /*#__PURE__*/_react["default"].createElement(_FilteredProductModal["default"], {
     onDataChange: function onDataChange(url, t) {
       setLinkUrl(url);
       setTotal(t);

package/lib/common/ProductModal/index.js

@@ -356,7 +356,7 @@ var ProductModal = function ProductModal(props) {
           case 0:
             return [4
             /*yield*/
-            , (0, _commonUtil.commonFetch)(window.magicDesign.MBaseUrl + "/products", data, 'GET')];
+            , (0, _commonUtil.commonFetch)(window.magicDesign.MBaseUrl + "/operation/v1/products", data, 'GET')];
 
           case 1:
             res = _a.sent();
@@ -407,7 +407,7 @@ var ProductModal = function ProductModal(props) {
           case 0:
             return [4
             /*yield*/
-            , (0, _commonUtil.commonFetch)(window.magicDesign.MBaseUrl + "/offerdiscatgs/brands", {}, 'GET')];
+            , (0, _commonUtil.commonFetch)(window.magicDesign.MBaseUrl + "/operation/v1/offerdiscatgs/brands", {}, 'GET')];
 
           case 1:
             res = _a.sent();
@@ -429,7 +429,7 @@ var ProductModal = function ProductModal(props) {
           case 0:
             return [4
             /*yield*/
-            , (0, _commonUtil.commonFetch)(window.magicDesign.MBaseUrl + "/labels/list", {}, 'GET')];
+            , (0, _commonUtil.commonFetch)(window.magicDesign.MBaseUrl + "/operation/v1/labels/list", {}, 'GET')];
 
           case 1:
             res = _a.sent();
@@ -451,7 +451,7 @@ var ProductModal = function ProductModal(props) {
           case 0:
             return [4
             /*yield*/
-            , (0, _commonUtil.commonFetch)(window.magicDesign.MBaseUrl + "/stores/list", {}, 'GET')];
+            , (0, _commonUtil.commonFetch)(window.magicDesign.MBaseUrl + "/operation/v1/stores/list", {}, 'GET')];
 
           case 1:
             res = _a.sent();

package/lib/common/UrlPicker/index.js

@@ -80,7 +80,7 @@ function (_super) {
       value: value
     }), /*#__PURE__*/_react["default"].createElement("div", {
       className: "icon-btns"
-    }, /*#__PURE__*/_react["default"].createElement(_Iconfont["default"], {
+    }, window.magicDesign.outputType != 'html' && /*#__PURE__*/_react["default"].createElement(_Iconfont["default"], {
       color: "#000",
       onClick: function onClick() {
         return _this.setState({

package/lib/common/Video/index.js

@@ -9,6 +9,8 @@ var _react = _interopRequireDefault(require("react"));
 
 var _components = _interopRequireDefault(require("./components"));
 
+var _closeImg = _interopRequireDefault(require("./closeImg.png"));
+
 var _commonUtil = require("../../utils/commonUtil");
 
 require("./index.less");
@@ -329,9 +331,20 @@ function (_super) {
       var videoDom = document.createElement('div');
       videoDom.id = 'video-modal-' + videoId;
       contentWrap.appendChild(videoDom);
+      var closeImgDom = document.createElement('img');
+      closeImgDom.src = _closeImg["default"];
+      closeImgDom.className = 'close-img-wrap';
+
+      closeImgDom.onclick = function () {
+        var _a;
+
+        (_a = document.querySelector("[video-id=\"" + videoId + "\"]")) === null || _a === void 0 ? void 0 : _a.remove();
+      };
+
+      contentWrap.appendChild(closeImgDom);
       modelWrap.appendChild(shadowWrap);
       modelWrap.appendChild(contentWrap);
-      document.body.appendChild(modelWrap);
+      (document.querySelector('[magic_designer]') || document.body).document.body.appendChild(modelWrap);
       createVideo('-modal-' + videoId, __assign(__assign({}, _this.props.opts), {
         autoplay: true
       }));

package/lib/common/Video/index.less

@@ -1,12 +1,7 @@
 .video-container {
   position: relative;
   height: 100%;
-  background: url(./background.png);
-  background-size: cover;
-  // .prism-player .prism-liveshift-progress,
-  // .prism-player .prism-progress {
-  //   bottom: 10px !important;
-  // }
+  background-image: linear-gradient(0, rgba(0, 0, 0, .2), rgba(0, 0, 0, .1), rgba(0, 0, 0, .2));
 
   .prism-player .prism-cover {
     z-index: 0;
@@ -43,5 +38,14 @@
     border-radius: 5px;
     z-index: 1001;
     position: fixed;
+
+    .close-img-wrap {
+      position: absolute;
+      right: 14px;
+      top: 14px;
+      width: 20px;
+      height: 20px;
+      cursor: pointer;
+    }
   }
 }