@fonixtree/magic-design 0.0.126 → 0.0.131

package/es/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/es/composite-comp/bol/components/Carousel/defaultJSON.js

@@ -44,8 +44,8 @@ var imagesGroupSourceJSON = function imagesGroupSourceJSON(compId) {
         fontFamily: 'Open Sans',
         fontWeight: 600,
         fontSize: 16,
+        pcFontSize: 42,
         color: '#232F46',
-        // width: 200,
         textAlign: 'center'
       },
       underline: {
@@ -67,8 +67,8 @@ var imagesGroupSourceJSON = function imagesGroupSourceJSON(compId) {
         fontFamily: 'Open Sans',
         fontWeight: 400,
         fontSize: 14,
+        pcFontSize: 28,
         color: '##232F46',
-        // width: 230,
         textAlign: 'center'
       },
       underline: {},
@@ -107,8 +107,9 @@ var imagesGroupSourceJSON = function imagesGroupSourceJSON(compId) {
       buttonText: {
         sizeType: 'Customize font styles',
         fontFamily: 'Open Sans',
-        fontWeight: 600,
-        fontSize: 14,
+        fontWeight: 400,
+        fontSize: 13,
+        pcFontSize: 16,
         fontStyle: 'normal',
         color: '#8493AF'
       },

package/es/composite-comp/bol/components/Carousel/mobile/index.js

@@ -69,22 +69,23 @@ var __assign = void 0 && (void 0).__assign || function () {
   return __assign.apply(this, arguments);
 };
 
-var MOBILE_IMG_SIZE = [{
-  maxW: 375,
-  maxH: 160
-}, {
-  maxW: 169,
-  maxH: 126
-}, {
-  maxW: 109,
-  maxH: 82
-}, {
-  maxW: 78,
-  maxH: 58
-}, {
-  maxW: 50,
-  maxH: 50
-}];
+var MOBILE_IMG_SIZE = {
+  1: {
+    maxH: 282
+  },
+  2: {
+    maxH: 137
+  },
+  3: {
+    maxH: 87
+  },
+  4: {
+    maxH: 66
+  },
+  5: {
+    maxH: 50
+  }
+};
 
 var CarouselMobile =
 /** @class */
@@ -226,7 +227,7 @@ function (_super) {
         className: "img"
       }, /*#__PURE__*/_react["default"].createElement(_components.MetaImage, {
         data: item.image,
-        maxHeight: MOBILE_IMG_SIZE[colNum - 1].maxH
+        maxHeight: MOBILE_IMG_SIZE[colNum].maxH
       })), showText && /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, item.title.open && /*#__PURE__*/_react["default"].createElement("div", {
         className: "title"
       }, /*#__PURE__*/_react["default"].createElement(_components.MetaText, {

package/es/composite-comp/bol/components/Carousel/mobile/index.less

@@ -48,7 +48,7 @@
       .text {
         display: flex;
         justify-content: center;
-        margin-top: 2px;
+        margin-top: 6px;
       }
 
       .tags {

package/es/composite-comp/bol/components/Carousel/pc/index.js

@@ -55,37 +55,38 @@ var __extends = void 0 && (void 0).__extends || function () {
   };
 }();
 
-var PC_IMG_SIZE = [{
-  minW: 150,
-  maxW: 1072,
-  minH: 150,
-  maxH: 400
-}, {
-  minW: 150,
-  maxW: 524,
-  minH: 150,
-  maxH: 524
-}, {
-  minW: 100,
-  maxW: 341,
-  minH: 100,
-  maxH: 341
-}, {
-  minW: 100,
-  maxW: 251,
-  minH: 100,
-  maxH: 251
-}, {
-  minW: 100,
-  maxW: 195,
-  minH: 100,
-  maxH: 195
-}, {
-  minW: 100,
-  maxW: 168,
-  minH: 100,
-  maxH: 168
-}];
+var PC_IMG_SIZE = {
+  1: {
+    minW: 150,
+    minH: 150,
+    maxH: 680
+  },
+  2: {
+    minW: 150,
+    minH: 150,
+    maxH: 524
+  },
+  3: {
+    minW: 100,
+    minH: 100,
+    maxH: 341
+  },
+  4: {
+    minW: 100,
+    minH: 100,
+    maxH: 251
+  },
+  5: {
+    minW: 100,
+    minH: 100,
+    maxH: 195
+  },
+  6: {
+    minW: 100,
+    minH: 100,
+    maxH: 168
+  }
+};
 
 var CarouselPc =
 /** @class */
@@ -232,9 +233,9 @@ function (_super) {
         className: "img"
       }, /*#__PURE__*/_react["default"].createElement(_components.MetaImage, {
         data: item.image,
-        maxHeight: PC_IMG_SIZE[colNum - 1].maxH,
-        minHeight: PC_IMG_SIZE[colNum - 1].minH,
-        minWidth: PC_IMG_SIZE[colNum - 1].minW
+        maxHeight: PC_IMG_SIZE[colNum].maxH,
+        minHeight: PC_IMG_SIZE[colNum].minH,
+        minWidth: PC_IMG_SIZE[colNum].minW
       })), showText && /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, item.title.open && !((0, _coreUtil.isPc)() && item.title.pcText === '') && /*#__PURE__*/_react["default"].createElement("div", {
         className: "title"
       }, /*#__PURE__*/_react["default"].createElement(_components.MetaText, {

package/es/composite-comp/bol/components/Carousel/pc/index.less

@@ -56,18 +56,18 @@
       .title {
         display: flex;
         justify-content: center;
-        margin-top: 12px;
+        margin-top: 24px;
       }
 
       .text {
         display: flex;
         justify-content: center;
-        margin-top: 2px;
+        margin-top: 6px;
       }
 
       .tags {
-        margin-top: 8px;
-        margin-bottom: 12px;
+        margin-top: 12px;
+        margin-bottom: 20px;
         display: flex;
         flex-direction: row;
         align-items: center;

package/es/composite-comp/bol/components/ImageGallery/mobile/index.js

@@ -57,27 +57,22 @@ var __spreadArrays = void 0 && (void 0).__spreadArrays || function () {
 
 var MOBILE_IMG_SIZE = {
   1: {
-    maxW: 343,
     maxH: 258,
     gap: 12
   },
   2: {
-    maxW: 165,
     maxH: 124,
     gap: 12
   },
   3: {
-    maxW: 106,
     maxH: 80,
     gap: 12
   },
   4: {
-    maxW: 77,
     maxH: 56,
     gap: 12
   },
   5: {
-    maxW: 62,
     maxH: 45,
     gap: 8
   }

package/es/composite-comp/bol/components/ImageGallery/pc/index.js

@@ -58,7 +58,6 @@ var __spreadArrays = void 0 && (void 0).__spreadArrays || function () {
 var PC_IMG_SIZE = {
   1: {
     minW: 150,
-    maxW: 1280,
     minH: 150,
     maxH: 960,
     defW: 1072,
@@ -67,35 +66,30 @@ var PC_IMG_SIZE = {
   },
   2: {
     minW: 150,
-    maxW: 628,
     minH: 150,
     maxH: 471,
     gap: 24
   },
   3: {
     minW: 100,
-    maxW: 410,
     minH: 100,
     maxH: 308,
     gap: 24
   },
   4: {
     minW: 100,
-    maxW: 302,
     minH: 100,
     maxH: 227,
     gap: 24
   },
   5: {
     minW: 100,
-    maxW: 236,
     minH: 100,
     maxH: 177,
     gap: 24
   },
   6: {
     minW: 100,
-    maxW: 193,
     minH: 100,
     maxH: 145,
     gap: 24

package/es/composite-comp/bol/components/ImageText/mobile/index.less

@@ -116,10 +116,11 @@
       flex-direction: column;
       .card-image-wrap {
         width: 100%;
+        padding: 8px;
         .card-image {
           // max-height: 107px;
           width: fit-content;
-          margin: 0 auto 7px;
+          margin: 0 auto;
         }
       }
 

package/es/composite-comp/bol/components/Tag/defaultJSON.js

@@ -28,8 +28,7 @@ var tagGroupSourceJSON = function tagGroupSourceJSON() {
         fontWeight: 600,
         fontSize: 12,
         fontStyle: 'normal',
-        color: '#8493AF',
-        padding: '2px 8px'
+        color: '#8493AF'
       },
       buttonBorder: {
         open: true,
@@ -40,6 +39,20 @@ var tagGroupSourceJSON = function tagGroupSourceJSON() {
         iconUrl: '',
         layout: 'right'
       },
+      spacing: {
+        pc: {
+          paddingTop: 2,
+          paddingBottom: 2,
+          paddingLeft: 8,
+          paddingRight: 8
+        },
+        mobile: {
+          paddingTop: 2,
+          paddingBottom: 2,
+          paddingLeft: 8,
+          paddingRight: 8
+        }
+      },
       text: 'Button Tag',
       hover: null
     }

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

@@ -82,7 +82,7 @@ function (_super) {
     }, /*#__PURE__*/_react["default"].createElement(_components.MetaImage, {
       data: nodeData.content.image
     })), nodeData.groupSource && nodeData.groupSource.map(function (m) {
-      return /*#__PURE__*/_react["default"].createElement("div", {
+      return m.button.open && /*#__PURE__*/_react["default"].createElement("div", {
         className: "first-button"
       }, /*#__PURE__*/_react["default"].createElement(_components.MetaButton, {
         data: m.button

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

@@ -9,14 +9,14 @@ var _react = _interopRequireWildcard(require("react"));
 
 var _classnames = _interopRequireDefault(require("classnames"));
 
+var _styledComponents = _interopRequireDefault(require("styled-components"));
+
 var _defaultJSON = require("./defaultJSON");
 
 var _components = require("../../../../meta-comp/components");
 
 var _compositeDecorator = _interopRequireDefault(require("../../../../decorator/compositeDecorator"));
 
-require("./index.less");
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
@@ -25,6 +25,18 @@ function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj &&
 
 function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
 
+var __makeTemplateObject = void 0 && (void 0).__makeTemplateObject || function (cooked, raw) {
+  if (Object.defineProperty) {
+    Object.defineProperty(cooked, "raw", {
+      value: raw
+    });
+  } else {
+    cooked.raw = raw;
+  }
+
+  return cooked;
+};
+
 var __extends = void 0 && (void 0).__extends || function () {
   var _extendStatics = function extendStatics(d, b) {
     _extendStatics = Object.setPrototypeOf || {
@@ -61,6 +73,10 @@ var __decorate = void 0 && (void 0).__decorate || function (decorators, target,
   return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
 
+// import './index.less';
+// less to css 在线地址 https://tool.oschina.net/less
+var AppStyle = _styledComponents["default"].div(templateObject_1 || (templateObject_1 = __makeTemplateObject(["\n.m-text .title-wrap {\n  font-weight: 500;\n  font-size: 20px;\n}\n.m-text .sub-title {\n  font-size: 15px;\n  color: #b7b7b7;\n  margin-top: 10px;\n}\n.m-text .group-content-wrap {\n  width: 100%;\n}\n.m-text .group-content-wrap .group-wrap-container {\n  padding: 20px;\n}\n.m-text .group-content-wrap .group-wrap {\n  display: flex;\n  flex-direction: column;\n  margin-top: 20px;\n  width: 100%;\n}\n.m-text .group-content-wrap .group-wrap .group-title {\n  font-size: 14px;\n}\n.m-text .group-content-wrap.col-1 .group-wrap {\n  width: 100%;\n}\n.m-text .group-content-wrap.col-2 {\n  display: grid;\n  grid-template-columns: 50% 50%;\n}\n.m-text .group-content-wrap.col-3 {\n  display: grid;\n  grid-template-columns: 33.3% 33.3% 33.3%;\n}\n.m-text .group-content-wrap.mobile {\n  display: block;\n}\n"], ["\n.m-text .title-wrap {\n  font-weight: 500;\n  font-size: 20px;\n}\n.m-text .sub-title {\n  font-size: 15px;\n  color: #b7b7b7;\n  margin-top: 10px;\n}\n.m-text .group-content-wrap {\n  width: 100%;\n}\n.m-text .group-content-wrap .group-wrap-container {\n  padding: 20px;\n}\n.m-text .group-content-wrap .group-wrap {\n  display: flex;\n  flex-direction: column;\n  margin-top: 20px;\n  width: 100%;\n}\n.m-text .group-content-wrap .group-wrap .group-title {\n  font-size: 14px;\n}\n.m-text .group-content-wrap.col-1 .group-wrap {\n  width: 100%;\n}\n.m-text .group-content-wrap.col-2 {\n  display: grid;\n  grid-template-columns: 50% 50%;\n}\n.m-text .group-content-wrap.col-3 {\n  display: grid;\n  grid-template-columns: 33.3% 33.3% 33.3%;\n}\n.m-text .group-content-wrap.mobile {\n  display: block;\n}\n"])));
+
 var Text =
 /** @class */
 function (_super) {
@@ -74,7 +90,7 @@ function (_super) {
     var _a;
 
     var nodeData = this.props.nodeData;
-    return /*#__PURE__*/_react["default"].createElement("div", {
+    return /*#__PURE__*/_react["default"].createElement(AppStyle, null, /*#__PURE__*/_react["default"].createElement("div", {
       className: "m-text",
       onClick: this.onComponentClick
     }, nodeData.title.headline.open && /*#__PURE__*/_react["default"].createElement("div", {
@@ -105,7 +121,7 @@ function (_super) {
       }, /*#__PURE__*/_react["default"].createElement(_components.MetaText, {
         data: group.content.text
       }))));
-    })));
+    }))));
   };
 
   Text.defaultProps = {};
@@ -116,4 +132,5 @@ function (_super) {
 }(_react.Component);
 
 var _default = Text;
-exports["default"] = _default;
+exports["default"] = _default;
+var templateObject_1;

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

@@ -1,7 +1,4 @@
 .m-text {
-  // display: flex;
-  // flex-direction: column;
-  // align-items: center;
 
   .title-wrap {
     font-weight: 500;

package/es/composite-comp/bol/second-config-panels/CarouselSecondConfig/index.js

@@ -120,6 +120,7 @@ function (_super) {
 
     var getConfig = function getConfig() {
       return /*#__PURE__*/_react["default"].createElement(_Collapse["default"], {
+        headerSize: "middle",
         onRefresh: function onRefresh() {
           return (0, _coreUtil.renderPreview)();
         },

package/es/composite-comp/dito/components/MobileNavigation/mobile/index.less

@@ -1,7 +1,7 @@
 .mobile-navigation-mobile {
   // display: flex;
   // flex-direction: column;
-  padding-top: 18px;
+  // padding-top: 18px;
   .group-wrap {
     padding: 0 20px;
     display: flex;

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

@@ -256,7 +256,7 @@ var jumpUrlConfig = function jumpUrlConfig(item) {
       }
 
     case 'CustomizedPage':
-      jumpUrl = "/group/" + objValue.objId;
+      jumpUrl = "/poster/" + objValue.objId;
       (0, _commonUtil.navigateTo)(jumpUrl);
       break;
 

package/es/composite-comp/dito/components/PcNavigation/pc/index.less

@@ -7,7 +7,7 @@
     display: flex;
     align-items: center;
     min-width: 130px;
-    margin-right: 180px;
+    margin-right: 44px;
 
     &:hover {
       @keyframes show-active{
@@ -39,6 +39,7 @@
     .menu-drop {
       display: flex;
       align-items: center;
+      flex-shrink: 0;
       &> img {
         width: 16px;
         margin-right: 10px;

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

@@ -548,7 +548,7 @@ function (_super) {
     var curContent = JSON.stringify(panelProps.content);
     var curSpacing = JSON.stringify(panelProps.spacing);
 
-    if (curSpacing !== this.preSpacing) {
+    if (curLayout !== this.preLayout || curSpacing !== this.preSpacing) {
       this.listenWidth();
     }