@fonixtree/magic-design 0.1.31 → 0.1.33

package/es/common/LinkModal/StoreTable/index.js

@@ -209,7 +209,9 @@ function StoreTable(props) {
             setLoading(true);
             return [4
             /*yield*/
-            , (0, _commonUtil.commonFetch)("/designer/v1/" + window.magicDesign.MBaseUrl + "/stores/page", params, 'GET')];
+            , (0, _commonUtil.commonFetch)("/designer/v1/" + window.magicDesign.MBaseUrl + "/stores/page", __assign(__assign({}, params), {
+              state: 'A'
+            }), 'GET')];
 
           case 1:
             res = _a.sent();
@@ -235,8 +237,8 @@ function StoreTable(props) {
         alt: "",
         src: val,
         style: {
-          width: '50px',
-          height: '50px'
+          maxWidth: '50px',
+          maxHeight: '50px'
         }
       });
     }
@@ -253,6 +255,14 @@ function StoreTable(props) {
     },
     type: 'radio'
   };
+
+  var reset = function reset() {
+    setStoreName('');
+    queryStore(__assign({
+      storeName: ''
+    }, paginationParams));
+  };
+
   return /*#__PURE__*/_react["default"].createElement("div", {
     style: {
       height: 550

package/es/common/Video/index.js

@@ -207,75 +207,26 @@ var __generator = void 0 && (void 0).__generator || function (thisArg, body) {
 /** 检查youtube依赖包 */
 var checkYoutuVIdeo = function checkYoutuVIdeo() {
   return __awaiter(void 0, void 0, void 0, function () {
-    var scriptUrl, ttPolicy, YT, YTConfig;
     return __generator(this, function (_a) {
-      if (!window.YT) {
-        scriptUrl = 'https:\/\/www.youtube.com\/s\/player\/36754c51\/www-widgetapi.vflset\/www-widgetapi.js';
-
-        try {
-          ttPolicy = window.trustedTypes.createPolicy('youtube-widget-api', {
-            createScriptURL: function createScriptURL(x) {
-              return x;
-            }
-          });
-          scriptUrl = ttPolicy.createScriptURL(scriptUrl);
-        } catch (e) {}
-
-        if (!window['YT']) YT = {
-          loading: 0,
-          loaded: 0
-        };
-        if (!window['YTConfig']) YTConfig = {
-          host: 'https://www.youtube.com'
-        };
-
-        if (!YT.loading) {
-          YT.loading = 1;
-
-          (function () {
-            var l = [];
-
-            YT.ready = function (f) {
-              if (YT.loaded) f();else l.push(f);
-            };
-
-            window.onYTReady = function () {
-              YT.loaded = 1;
-
-              for (var i = 0; i < l.length; i++) {
-                try {
-                  l[i]();
-                } catch (e$0) {}
-              }
-            };
-
-            YT.setConfig = function (c) {
-              for (var k in c) {
-                if (c.hasOwnProperty(k)) YTConfig[k] = c[k];
-              }
-            };
+      switch (_a.label) {
+        case 0:
+          if (!!window.YT) return [3
+          /*break*/
+          , 2];
+          return [4
+          /*yield*/
+          , Promise.all([(0, _commonUtil.importAsync)('https://www.youtube.com/iframe_api', 'js')])];
 
-            var a = document.createElement('script');
-            a.type = 'text/javascript';
-            a.id = 'www-widgetapi-script';
-            a.src = scriptUrl;
-            a.async = true;
-            var c = document.currentScript;
+        case 1:
+          _a.sent();
 
-            if (c) {
-              var n = c.nonce || c.getAttribute('nonce');
-              if (n) a.setAttribute('nonce', n);
-            }
+          _a.label = 2;
 
-            var b = document.getElementsByTagName('script')[0];
-            b.parentNode.insertBefore(a, b);
-          })();
-        }
+        case 2:
+          return [2
+          /*return*/
+          ];
       }
-
-      return [2
-      /*return*/
-      ];
     });
   });
 };

package/es/composite-comp/bol/components/Text/index.js

@@ -101,7 +101,10 @@ function (_super) {
     var style = ".m-text{display: flex;flex-direction: column;word-break: break-word;}.m-text .title-wrap{font-weight:500;font-size:20px;}.m-text .sub-title-text{font-size:15px;color:#b7b7b7;margin-top:10px;}.m-text .group-content-wrap{width:100%;}.m-text .group-content-wrap .group-wrap-container{" + groupWrapContainerStyle + "}.m-text .group-content-wrap .group-wrap{display:flex;flex-direction:column;width:100%;}.m-text .group-content-wrap .group-wrap .group-title{font-size:14px;}.m-text .group-content-wrap.col-1 .group-wrap{width:100%;}.m-text .group-content-wrap.col-2{display:grid;grid-template-columns:50% 50%;}.m-text .group-content-wrap.col-3{display:grid;grid-template-columns:33.3% 33.3% 33.3%;}.m-text .group-content-wrap.mobile{display:block;}";
     return /*#__PURE__*/_react["default"].createElement("div", {
       className: "m-text",
-      onClick: this.onComponentClick
+      onClick: this.onComponentClick,
+      style: {
+        flexDirection: 'column'
+      }
     }, /*#__PURE__*/_react["default"].createElement("style", null, style), nodeData.title.headline.open && /*#__PURE__*/_react["default"].createElement("div", {
       className: "title-wrap"
     }, /*#__PURE__*/_react["default"].createElement(_components.MetaText, {

package/es/composite-comp/dito/components/SignBoard/mobile/index.js

@@ -206,35 +206,30 @@ function (_super) {
 
     _this.getStoreInfo = function () {
       return __awaiter(_this, void 0, void 0, function () {
-        var storeId, res, isFollow;
-        return __generator(this, function (_a) {
-          switch (_a.label) {
+        var storeId, _a, res, isFollow;
+
+        return __generator(this, function (_b) {
+          switch (_b.label) {
             case 0:
               storeId = window.magicDesign.storeId;
               if (!storeId) return [3
               /*break*/
-              , 3];
-              return [4
-              /*yield*/
-              , (0, _commonUtil.commonFetch)("/designer/v1/h5/store/detail/" + storeId, {}, 'GET')];
-
-            case 1:
-              res = _a.sent();
+              , 2];
               return [4
               /*yield*/
-              , (0, _commonUtil.commonFetch)('/designer/v1/h5/collection/store/check', {
+              , Promise.all([(0, _commonUtil.commonFetch)("/designer/v1/h5/store/detail/" + storeId, {}, 'GET'), (0, _commonUtil.commonFetch)('/designer/v1/h5/collection/store/check', {
                 storeId: storeId
-              })];
+              })])];
 
-            case 2:
-              isFollow = _a.sent();
+            case 1:
+              _a = _b.sent(), res = _a[0], isFollow = _a[1];
               this.setState({
                 storeInfo: res,
                 isFollow: isFollow
               });
-              _a.label = 3;
+              _b.label = 2;
 
-            case 3:
+            case 2:
               return [2
               /*return*/
               ];
@@ -317,7 +312,9 @@ function (_super) {
       } else {
         window.magicDesign.history.push({
           pathname: '/sign-in',
-          state: "/chat/" + (storeInfo === null || storeInfo === void 0 ? void 0 : storeInfo.sysAccount)
+          state: {
+            redirectUrl: "/chat/" + (storeInfo === null || storeInfo === void 0 ? void 0 : storeInfo.sysAccount)
+          }
         });
       }
     };

package/es/composite-comp/dito/components/SignBoard/pc/index.js

@@ -210,36 +210,30 @@ function (_super) {
 
     _this.getStoreInfo = function () {
       return __awaiter(_this, void 0, void 0, function () {
-        var storeId, res, isFollow;
-        return __generator(this, function (_a) {
-          switch (_a.label) {
+        var storeId, _a, res, isFollow;
+
+        return __generator(this, function (_b) {
+          switch (_b.label) {
             case 0:
               storeId = window.magicDesign.storeId;
               if (!storeId) return [3
               /*break*/
-              , 3];
+              , 2];
               return [4
               /*yield*/
-              , (0, _commonUtil.commonFetch)("/designer/v1/h5/store/detail/" + storeId, {}, 'GET')];
-
-            case 1:
-              res = _a.sent();
-              return [4
-              /*yield*/
-              , (0, _commonUtil.commonFetch)('/designer/v1/h5/collection/store/check', {
+              , Promise.all([(0, _commonUtil.commonFetch)("/designer/v1/h5/store/detail/" + storeId, {}, 'GET'), (0, _commonUtil.commonFetch)('/designer/v1/h5/collection/store/check', {
                 storeId: storeId
-              })];
+              })])];
 
-            case 2:
-              isFollow = _a.sent();
-              console.log('---d', res);
+            case 1:
+              _a = _b.sent(), res = _a[0], isFollow = _a[1];
               this.setState({
                 storeInfo: res,
                 isFollow: isFollow
               });
-              _a.label = 3;
+              _b.label = 2;
 
-            case 3:
+            case 2:
               return [2
               /*return*/
               ];

package/es/core/Designer/RenderHtml/index.js

@@ -59,8 +59,16 @@ function (_super) {
           renderProps: renderProps
         }, function () {
           document.querySelector('#render-html-wrap > div').style = 'max-width:600px;margin:auto;';
+          /** 去除设计器模式下元素 */
+
+          document.querySelectorAll('#render-html-wrap > div .composite_mask').forEach(function (el) {
+            el.remove();
+          });
           var html = document.querySelector('#render-html-wrap').innerHTML;
-          resolve(html.replace(/url\("((\S|\s)*)"\)/g, 'url($1)'));
+          /** 处理背景图资源引号问题 */
+
+          html = html.replace(/url\("((\S|\s)*)"\)/g, 'url($1)');
+          resolve(html);
 
           _this.setState({
             renderProps: null

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

@@ -209,7 +209,9 @@ function StoreTable(props) {
             setLoading(true);
             return [4
             /*yield*/
-            , (0, _commonUtil.commonFetch)("/designer/v1/" + window.magicDesign.MBaseUrl + "/stores/page", params, 'GET')];
+            , (0, _commonUtil.commonFetch)("/designer/v1/" + window.magicDesign.MBaseUrl + "/stores/page", __assign(__assign({}, params), {
+              state: 'A'
+            }), 'GET')];
 
           case 1:
             res = _a.sent();
@@ -235,8 +237,8 @@ function StoreTable(props) {
         alt: "",
         src: val,
         style: {
-          width: '50px',
-          height: '50px'
+          maxWidth: '50px',
+          maxHeight: '50px'
         }
       });
     }
@@ -253,6 +255,14 @@ function StoreTable(props) {
     },
     type: 'radio'
   };
+
+  var reset = function reset() {
+    setStoreName('');
+    queryStore(__assign({
+      storeName: ''
+    }, paginationParams));
+  };
+
   return /*#__PURE__*/_react["default"].createElement("div", {
     style: {
       height: 550

package/lib/common/Video/index.js

@@ -207,75 +207,26 @@ var __generator = void 0 && (void 0).__generator || function (thisArg, body) {
 /** 检查youtube依赖包 */
 var checkYoutuVIdeo = function checkYoutuVIdeo() {
   return __awaiter(void 0, void 0, void 0, function () {
-    var scriptUrl, ttPolicy, YT, YTConfig;
     return __generator(this, function (_a) {
-      if (!window.YT) {
-        scriptUrl = 'https:\/\/www.youtube.com\/s\/player\/36754c51\/www-widgetapi.vflset\/www-widgetapi.js';
-
-        try {
-          ttPolicy = window.trustedTypes.createPolicy('youtube-widget-api', {
-            createScriptURL: function createScriptURL(x) {
-              return x;
-            }
-          });
-          scriptUrl = ttPolicy.createScriptURL(scriptUrl);
-        } catch (e) {}
-
-        if (!window['YT']) YT = {
-          loading: 0,
-          loaded: 0
-        };
-        if (!window['YTConfig']) YTConfig = {
-          host: 'https://www.youtube.com'
-        };
-
-        if (!YT.loading) {
-          YT.loading = 1;
-
-          (function () {
-            var l = [];
-
-            YT.ready = function (f) {
-              if (YT.loaded) f();else l.push(f);
-            };
-
-            window.onYTReady = function () {
-              YT.loaded = 1;
-
-              for (var i = 0; i < l.length; i++) {
-                try {
-                  l[i]();
-                } catch (e$0) {}
-              }
-            };
-
-            YT.setConfig = function (c) {
-              for (var k in c) {
-                if (c.hasOwnProperty(k)) YTConfig[k] = c[k];
-              }
-            };
+      switch (_a.label) {
+        case 0:
+          if (!!window.YT) return [3
+          /*break*/
+          , 2];
+          return [4
+          /*yield*/
+          , Promise.all([(0, _commonUtil.importAsync)('https://www.youtube.com/iframe_api', 'js')])];
 
-            var a = document.createElement('script');
-            a.type = 'text/javascript';
-            a.id = 'www-widgetapi-script';
-            a.src = scriptUrl;
-            a.async = true;
-            var c = document.currentScript;
+        case 1:
+          _a.sent();
 
-            if (c) {
-              var n = c.nonce || c.getAttribute('nonce');
-              if (n) a.setAttribute('nonce', n);
-            }
+          _a.label = 2;
 
-            var b = document.getElementsByTagName('script')[0];
-            b.parentNode.insertBefore(a, b);
-          })();
-        }
+        case 2:
+          return [2
+          /*return*/
+          ];
       }
-
-      return [2
-      /*return*/
-      ];
     });
   });
 };

package/lib/composite-comp/bol/components/Text/index.js

@@ -101,7 +101,10 @@ function (_super) {
     var style = ".m-text{display: flex;flex-direction: column;word-break: break-word;}.m-text .title-wrap{font-weight:500;font-size:20px;}.m-text .sub-title-text{font-size:15px;color:#b7b7b7;margin-top:10px;}.m-text .group-content-wrap{width:100%;}.m-text .group-content-wrap .group-wrap-container{" + groupWrapContainerStyle + "}.m-text .group-content-wrap .group-wrap{display:flex;flex-direction:column;width:100%;}.m-text .group-content-wrap .group-wrap .group-title{font-size:14px;}.m-text .group-content-wrap.col-1 .group-wrap{width:100%;}.m-text .group-content-wrap.col-2{display:grid;grid-template-columns:50% 50%;}.m-text .group-content-wrap.col-3{display:grid;grid-template-columns:33.3% 33.3% 33.3%;}.m-text .group-content-wrap.mobile{display:block;}";
     return /*#__PURE__*/_react["default"].createElement("div", {
       className: "m-text",
-      onClick: this.onComponentClick
+      onClick: this.onComponentClick,
+      style: {
+        flexDirection: 'column'
+      }
     }, /*#__PURE__*/_react["default"].createElement("style", null, style), nodeData.title.headline.open && /*#__PURE__*/_react["default"].createElement("div", {
       className: "title-wrap"
     }, /*#__PURE__*/_react["default"].createElement(_components.MetaText, {

package/lib/composite-comp/dito/components/SignBoard/mobile/index.js

@@ -206,35 +206,30 @@ function (_super) {
 
     _this.getStoreInfo = function () {
       return __awaiter(_this, void 0, void 0, function () {
-        var storeId, res, isFollow;
-        return __generator(this, function (_a) {
-          switch (_a.label) {
+        var storeId, _a, res, isFollow;
+
+        return __generator(this, function (_b) {
+          switch (_b.label) {
             case 0:
               storeId = window.magicDesign.storeId;
               if (!storeId) return [3
               /*break*/
-              , 3];
-              return [4
-              /*yield*/
-              , (0, _commonUtil.commonFetch)("/designer/v1/h5/store/detail/" + storeId, {}, 'GET')];
-
-            case 1:
-              res = _a.sent();
+              , 2];
               return [4
               /*yield*/
-              , (0, _commonUtil.commonFetch)('/designer/v1/h5/collection/store/check', {
+              , Promise.all([(0, _commonUtil.commonFetch)("/designer/v1/h5/store/detail/" + storeId, {}, 'GET'), (0, _commonUtil.commonFetch)('/designer/v1/h5/collection/store/check', {
                 storeId: storeId
-              })];
+              })])];
 
-            case 2:
-              isFollow = _a.sent();
+            case 1:
+              _a = _b.sent(), res = _a[0], isFollow = _a[1];
               this.setState({
                 storeInfo: res,
                 isFollow: isFollow
               });
-              _a.label = 3;
+              _b.label = 2;
 
-            case 3:
+            case 2:
               return [2
               /*return*/
               ];
@@ -317,7 +312,9 @@ function (_super) {
       } else {
         window.magicDesign.history.push({
           pathname: '/sign-in',
-          state: "/chat/" + (storeInfo === null || storeInfo === void 0 ? void 0 : storeInfo.sysAccount)
+          state: {
+            redirectUrl: "/chat/" + (storeInfo === null || storeInfo === void 0 ? void 0 : storeInfo.sysAccount)
+          }
         });
       }
     };

package/lib/composite-comp/dito/components/SignBoard/pc/index.js

@@ -210,36 +210,30 @@ function (_super) {
 
     _this.getStoreInfo = function () {
       return __awaiter(_this, void 0, void 0, function () {
-        var storeId, res, isFollow;
-        return __generator(this, function (_a) {
-          switch (_a.label) {
+        var storeId, _a, res, isFollow;
+
+        return __generator(this, function (_b) {
+          switch (_b.label) {
             case 0:
               storeId = window.magicDesign.storeId;
               if (!storeId) return [3
               /*break*/
-              , 3];
+              , 2];
               return [4
               /*yield*/
-              , (0, _commonUtil.commonFetch)("/designer/v1/h5/store/detail/" + storeId, {}, 'GET')];
-
-            case 1:
-              res = _a.sent();
-              return [4
-              /*yield*/
-              , (0, _commonUtil.commonFetch)('/designer/v1/h5/collection/store/check', {
+              , Promise.all([(0, _commonUtil.commonFetch)("/designer/v1/h5/store/detail/" + storeId, {}, 'GET'), (0, _commonUtil.commonFetch)('/designer/v1/h5/collection/store/check', {
                 storeId: storeId
-              })];
+              })])];
 
-            case 2:
-              isFollow = _a.sent();
-              console.log('---d', res);
+            case 1:
+              _a = _b.sent(), res = _a[0], isFollow = _a[1];
               this.setState({
                 storeInfo: res,
                 isFollow: isFollow
               });
-              _a.label = 3;
+              _b.label = 2;
 
-            case 3:
+            case 2:
               return [2
               /*return*/
               ];

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

@@ -59,8 +59,16 @@ function (_super) {
           renderProps: renderProps
         }, function () {
           document.querySelector('#render-html-wrap > div').style = 'max-width:600px;margin:auto;';
+          /** 去除设计器模式下元素 */
+
+          document.querySelectorAll('#render-html-wrap > div .composite_mask').forEach(function (el) {
+            el.remove();
+          });
           var html = document.querySelector('#render-html-wrap').innerHTML;
-          resolve(html.replace(/url\("((\S|\s)*)"\)/g, 'url($1)'));
+          /** 处理背景图资源引号问题 */
+
+          html = html.replace(/url\("((\S|\s)*)"\)/g, 'url($1)');
+          resolve(html);
 
           _this.setState({
             renderProps: null

package/package.json

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