@fonixtree/magic-design 0.0.48 → 0.0.49
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/es/composite-comp/dito/components/Recommend/index.js +1 -5
- package/es/composite-comp/dito/components/Recommend/mobile/index.js +2 -11
- package/es/composite-comp/dito/config-panels/RecommendConfig/index.js +3 -17
- package/es/composite-comp/dito/second-config-panels/RecommendSecondConfig/index.js +2 -10
- package/es/constants/layout.js +6 -24
- package/lib/composite-comp/dito/components/Recommend/index.js +1 -5
- package/lib/composite-comp/dito/components/Recommend/mobile/index.js +2 -11
- package/lib/composite-comp/dito/config-panels/RecommendConfig/index.js +3 -17
- package/lib/composite-comp/dito/second-config-panels/RecommendSecondConfig/index.js +2 -10
- package/lib/constants/layout.js +6 -24
- package/package.json +1 -1
|
@@ -9,8 +9,6 @@ var _react = _interopRequireWildcard(require("react"));
|
|
|
9
9
|
|
|
10
10
|
var _mobile = _interopRequireDefault(require("./mobile"));
|
|
11
11
|
|
|
12
|
-
var _pc = _interopRequireDefault(require("./pc"));
|
|
13
|
-
|
|
14
12
|
var _defaultJSON = require("./defaultJSON");
|
|
15
13
|
|
|
16
14
|
var _coreUtil = require("../../../../utils/coreUtil");
|
|
@@ -77,9 +75,7 @@ function (_super) {
|
|
|
77
75
|
var wrapStyle = (0, _businessUtil.computeStyle)(nodeData, window.magicDesign.device);
|
|
78
76
|
return /*#__PURE__*/_react["default"].createElement("div", {
|
|
79
77
|
style: wrapStyle
|
|
80
|
-
}, (0, _coreUtil.isPc)() ? /*#__PURE__*/_react["default"].createElement(
|
|
81
|
-
panelProps: nodeData
|
|
82
|
-
}) : /*#__PURE__*/_react["default"].createElement(_mobile["default"], {
|
|
78
|
+
}, (0, _coreUtil.isPc)() ? null : /*#__PURE__*/_react["default"].createElement(_mobile["default"], {
|
|
83
79
|
panelProps: nodeData
|
|
84
80
|
}));
|
|
85
81
|
};
|
|
@@ -566,10 +566,7 @@ function (_super) {
|
|
|
566
566
|
var products = this.state["products" + tabIndex] || [];
|
|
567
567
|
var isDivide = groupSource.length <= 3;
|
|
568
568
|
var layout = panelProps.customize.layout.h5Layout || panelProps.customize.layout; // 后面删除
|
|
569
|
-
|
|
570
|
-
var _seeAll = (0, _commonUtil.ensure)(function () {
|
|
571
|
-
return groupSource[tabIndex].seeAll;
|
|
572
|
-
}, '');
|
|
569
|
+
// const _seeAll = ensure(() => groupSource[tabIndex].seeAll, '');
|
|
573
570
|
|
|
574
571
|
var imgHeight = (0, _commonUtil.ensure)(function () {
|
|
575
572
|
return LAYOUT_IMAGE_SIZE[layout].h;
|
|
@@ -637,9 +634,6 @@ function (_super) {
|
|
|
637
634
|
panelProps: panelProps.content,
|
|
638
635
|
showProgress: false
|
|
639
636
|
}));
|
|
640
|
-
}), _seeAll.open && products.length > 0 && /*#__PURE__*/_react["default"].createElement(_components.MetaButton, {
|
|
641
|
-
className: "btnSeeAll",
|
|
642
|
-
data: _seeAll
|
|
643
637
|
})) : /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, /*#__PURE__*/_react["default"].createElement("div", {
|
|
644
638
|
key: "macyContainer",
|
|
645
639
|
className: "macyContainer"
|
|
@@ -657,10 +651,7 @@ function (_super) {
|
|
|
657
651
|
panelProps: panelProps.content,
|
|
658
652
|
showProgress: false
|
|
659
653
|
});
|
|
660
|
-
}))
|
|
661
|
-
className: "btnSeeAll",
|
|
662
|
-
data: _seeAll
|
|
663
|
-
})));
|
|
654
|
+
}))));
|
|
664
655
|
};
|
|
665
656
|
|
|
666
657
|
RecommendMobile.defaultProps = {
|
|
@@ -15,8 +15,6 @@ var _coreUtil = require("../../../../utils/coreUtil");
|
|
|
15
15
|
|
|
16
16
|
var _layout = require("../../../../constants/layout");
|
|
17
17
|
|
|
18
|
-
var _SpacingConfig = _interopRequireDefault(require("../../../common/config-panels/SpacingConfig"));
|
|
19
|
-
|
|
20
18
|
var _BackgroundConfig = _interopRequireDefault(require("../../../common/config-panels/BackgroundConfig"));
|
|
21
19
|
|
|
22
20
|
var _CustomizeConfig = _interopRequireDefault(require("../../../common/config-panels/CustomizeConfig"));
|
|
@@ -83,8 +81,6 @@ function (_super) {
|
|
|
83
81
|
}
|
|
84
82
|
|
|
85
83
|
RecommendConfig.prototype.render = function () {
|
|
86
|
-
var _this = this;
|
|
87
|
-
|
|
88
84
|
var data = this.props.data;
|
|
89
85
|
return /*#__PURE__*/_react["default"].createElement("div", null, /*#__PURE__*/_react["default"].createElement(_Collapse["default"], {
|
|
90
86
|
divider: "bold",
|
|
@@ -101,24 +97,14 @@ function (_super) {
|
|
|
101
97
|
value: /*#__PURE__*/_react["default"].createElement(_RecommendConfigContent["default"], {
|
|
102
98
|
panelProps: data.content
|
|
103
99
|
})
|
|
104
|
-
}, {
|
|
105
|
-
|
|
106
|
-
name: (0, _locale.i18n)('SPACING'),
|
|
107
|
-
value: /*#__PURE__*/_react["default"].createElement(_SpacingConfig["default"], {
|
|
108
|
-
configCompSpace: true,
|
|
109
|
-
configPaddingLR: true,
|
|
110
|
-
data: data.spacing
|
|
111
|
-
})
|
|
112
|
-
}, {
|
|
100
|
+
}, // { key: '3', name: i18n('SPACING'), value: <SpacingConfig configCompSpace configPaddingLR data={data.spacing} /> },
|
|
101
|
+
{
|
|
113
102
|
key: '4',
|
|
114
103
|
name: (0, _locale.i18n)('CUSTOMIZE'),
|
|
115
104
|
value: /*#__PURE__*/_react["default"].createElement(_CustomizeConfig["default"], {
|
|
116
105
|
data: data.customize,
|
|
117
106
|
isHideAlign: true,
|
|
118
|
-
layoutSource: (0, _coreUtil.isPc)() ? _layout.recommendLayoutPc : _layout.recommendLayoutMobile
|
|
119
|
-
selectedLayoutFun: function selectedLayoutFun(v) {
|
|
120
|
-
_this.getLayout(v);
|
|
121
|
-
}
|
|
107
|
+
layoutSource: (0, _coreUtil.isPc)() ? _layout.recommendLayoutPc : _layout.recommendLayoutMobile
|
|
122
108
|
})
|
|
123
109
|
}, {
|
|
124
110
|
key: '5',
|
|
@@ -17,8 +17,6 @@ var _common = require("../../../../common");
|
|
|
17
17
|
|
|
18
18
|
var _ImageConfig = _interopRequireDefault(require("../../../../meta-comp/config-panels/ImageConfig"));
|
|
19
19
|
|
|
20
|
-
var _ButtonConfig = _interopRequireDefault(require("../../../../meta-comp/config-panels/ButtonConfig"));
|
|
21
|
-
|
|
22
20
|
var _TextConfig = _interopRequireDefault(require("../../../../meta-comp/config-panels/TextConfig"));
|
|
23
21
|
|
|
24
22
|
var _BaseConfig = _interopRequireDefault(require("../../../../meta-comp/config-panels/BaseConfig"));
|
|
@@ -160,14 +158,8 @@ function (_super) {
|
|
|
160
158
|
data: panelProps.groupName
|
|
161
159
|
}),
|
|
162
160
|
metaOption: panelProps.groupName
|
|
163
|
-
}, {
|
|
164
|
-
|
|
165
|
-
name: (0, _locale.i18n)('SEE_ALL'),
|
|
166
|
-
value: /*#__PURE__*/_react["default"].createElement(_ButtonConfig["default"], {
|
|
167
|
-
data: panelProps.seeAll
|
|
168
|
-
}),
|
|
169
|
-
metaOption: panelProps.seeAll
|
|
170
|
-
}, {
|
|
161
|
+
}, // { key: 'defaultSource_3', name: i18n('SEE_ALL'), value: <ButtonConfig data={panelProps.seeAll} />, metaOption: panelProps.seeAll },
|
|
162
|
+
{
|
|
171
163
|
key: 'defaultSource_4',
|
|
172
164
|
name: (0, _locale.i18n)('SECOND_CATEGORY'),
|
|
173
165
|
value: productSource,
|
package/es/constants/layout.js
CHANGED
|
@@ -39,13 +39,11 @@ var _newsletter = _interopRequireDefault(require("../assets/images/layout-icon/n
|
|
|
39
39
|
|
|
40
40
|
var _layoutRecommend = _interopRequireDefault(require("../assets/images/layout-icon/layout-recommend-1.png"));
|
|
41
41
|
|
|
42
|
-
var _layoutRecommend2 = _interopRequireDefault(require("../assets/images/layout-icon/layout-recommend-
|
|
42
|
+
var _layoutRecommend2 = _interopRequireDefault(require("../assets/images/layout-icon/layout-recommend-3.png"));
|
|
43
43
|
|
|
44
|
-
var _layoutRecommend3 = _interopRequireDefault(require("../assets/images/layout-icon/layout-recommend-
|
|
44
|
+
var _layoutRecommend3 = _interopRequireDefault(require("../assets/images/layout-icon/layout-recommend-4.png"));
|
|
45
45
|
|
|
46
|
-
var _layoutRecommend4 = _interopRequireDefault(require("../assets/images/layout-icon/layout-recommend-
|
|
47
|
-
|
|
48
|
-
var _layoutRecommend5 = _interopRequireDefault(require("../assets/images/layout-icon/layout-recommend-5.png"));
|
|
46
|
+
var _layoutRecommend4 = _interopRequireDefault(require("../assets/images/layout-icon/layout-recommend-5.png"));
|
|
49
47
|
|
|
50
48
|
var _layoutNavigationNewline = _interopRequireDefault(require("../assets/images/layout-icon/layout-navigation-newline.png"));
|
|
51
49
|
|
|
@@ -136,36 +134,20 @@ var recommendLayoutMobile = [{
|
|
|
136
134
|
id: 'layout1',
|
|
137
135
|
name: 'layout1',
|
|
138
136
|
image: _layoutRecommend["default"]
|
|
139
|
-
}, {
|
|
140
|
-
id: 'layout2',
|
|
141
|
-
name: 'layout2',
|
|
142
|
-
image: _layoutRecommend2["default"]
|
|
143
|
-
}, {
|
|
144
|
-
id: 'layout3',
|
|
145
|
-
name: 'layout3',
|
|
146
|
-
image: _layoutRecommend3["default"]
|
|
147
|
-
}, {
|
|
148
|
-
id: 'layout4',
|
|
149
|
-
name: 'layout4',
|
|
150
|
-
image: _layoutRecommend4["default"]
|
|
151
|
-
}, {
|
|
152
|
-
id: 'layout5',
|
|
153
|
-
name: 'layout5',
|
|
154
|
-
image: _layoutRecommend5["default"]
|
|
155
137
|
}];
|
|
156
138
|
exports.recommendLayoutMobile = recommendLayoutMobile;
|
|
157
139
|
var recommendLayoutPc = [{
|
|
158
140
|
id: 'layout1',
|
|
159
141
|
name: 'layout1',
|
|
160
|
-
image:
|
|
142
|
+
image: _layoutRecommend2["default"]
|
|
161
143
|
}, {
|
|
162
144
|
id: 'layout2',
|
|
163
145
|
name: 'layout2',
|
|
164
|
-
image:
|
|
146
|
+
image: _layoutRecommend3["default"]
|
|
165
147
|
}, {
|
|
166
148
|
id: 'layout3',
|
|
167
149
|
name: 'layout3',
|
|
168
|
-
image:
|
|
150
|
+
image: _layoutRecommend4["default"]
|
|
169
151
|
}];
|
|
170
152
|
exports.recommendLayoutPc = recommendLayoutPc;
|
|
171
153
|
var mobileNavigationLayout = [{
|
|
@@ -9,8 +9,6 @@ var _react = _interopRequireWildcard(require("react"));
|
|
|
9
9
|
|
|
10
10
|
var _mobile = _interopRequireDefault(require("./mobile"));
|
|
11
11
|
|
|
12
|
-
var _pc = _interopRequireDefault(require("./pc"));
|
|
13
|
-
|
|
14
12
|
var _defaultJSON = require("./defaultJSON");
|
|
15
13
|
|
|
16
14
|
var _coreUtil = require("../../../../utils/coreUtil");
|
|
@@ -77,9 +75,7 @@ function (_super) {
|
|
|
77
75
|
var wrapStyle = (0, _businessUtil.computeStyle)(nodeData, window.magicDesign.device);
|
|
78
76
|
return /*#__PURE__*/_react["default"].createElement("div", {
|
|
79
77
|
style: wrapStyle
|
|
80
|
-
}, (0, _coreUtil.isPc)() ? /*#__PURE__*/_react["default"].createElement(
|
|
81
|
-
panelProps: nodeData
|
|
82
|
-
}) : /*#__PURE__*/_react["default"].createElement(_mobile["default"], {
|
|
78
|
+
}, (0, _coreUtil.isPc)() ? null : /*#__PURE__*/_react["default"].createElement(_mobile["default"], {
|
|
83
79
|
panelProps: nodeData
|
|
84
80
|
}));
|
|
85
81
|
};
|
|
@@ -566,10 +566,7 @@ function (_super) {
|
|
|
566
566
|
var products = this.state["products" + tabIndex] || [];
|
|
567
567
|
var isDivide = groupSource.length <= 3;
|
|
568
568
|
var layout = panelProps.customize.layout.h5Layout || panelProps.customize.layout; // 后面删除
|
|
569
|
-
|
|
570
|
-
var _seeAll = (0, _commonUtil.ensure)(function () {
|
|
571
|
-
return groupSource[tabIndex].seeAll;
|
|
572
|
-
}, '');
|
|
569
|
+
// const _seeAll = ensure(() => groupSource[tabIndex].seeAll, '');
|
|
573
570
|
|
|
574
571
|
var imgHeight = (0, _commonUtil.ensure)(function () {
|
|
575
572
|
return LAYOUT_IMAGE_SIZE[layout].h;
|
|
@@ -637,9 +634,6 @@ function (_super) {
|
|
|
637
634
|
panelProps: panelProps.content,
|
|
638
635
|
showProgress: false
|
|
639
636
|
}));
|
|
640
|
-
}), _seeAll.open && products.length > 0 && /*#__PURE__*/_react["default"].createElement(_components.MetaButton, {
|
|
641
|
-
className: "btnSeeAll",
|
|
642
|
-
data: _seeAll
|
|
643
637
|
})) : /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, /*#__PURE__*/_react["default"].createElement("div", {
|
|
644
638
|
key: "macyContainer",
|
|
645
639
|
className: "macyContainer"
|
|
@@ -657,10 +651,7 @@ function (_super) {
|
|
|
657
651
|
panelProps: panelProps.content,
|
|
658
652
|
showProgress: false
|
|
659
653
|
});
|
|
660
|
-
}))
|
|
661
|
-
className: "btnSeeAll",
|
|
662
|
-
data: _seeAll
|
|
663
|
-
})));
|
|
654
|
+
}))));
|
|
664
655
|
};
|
|
665
656
|
|
|
666
657
|
RecommendMobile.defaultProps = {
|
|
@@ -15,8 +15,6 @@ var _coreUtil = require("../../../../utils/coreUtil");
|
|
|
15
15
|
|
|
16
16
|
var _layout = require("../../../../constants/layout");
|
|
17
17
|
|
|
18
|
-
var _SpacingConfig = _interopRequireDefault(require("../../../common/config-panels/SpacingConfig"));
|
|
19
|
-
|
|
20
18
|
var _BackgroundConfig = _interopRequireDefault(require("../../../common/config-panels/BackgroundConfig"));
|
|
21
19
|
|
|
22
20
|
var _CustomizeConfig = _interopRequireDefault(require("../../../common/config-panels/CustomizeConfig"));
|
|
@@ -83,8 +81,6 @@ function (_super) {
|
|
|
83
81
|
}
|
|
84
82
|
|
|
85
83
|
RecommendConfig.prototype.render = function () {
|
|
86
|
-
var _this = this;
|
|
87
|
-
|
|
88
84
|
var data = this.props.data;
|
|
89
85
|
return /*#__PURE__*/_react["default"].createElement("div", null, /*#__PURE__*/_react["default"].createElement(_Collapse["default"], {
|
|
90
86
|
divider: "bold",
|
|
@@ -101,24 +97,14 @@ function (_super) {
|
|
|
101
97
|
value: /*#__PURE__*/_react["default"].createElement(_RecommendConfigContent["default"], {
|
|
102
98
|
panelProps: data.content
|
|
103
99
|
})
|
|
104
|
-
}, {
|
|
105
|
-
|
|
106
|
-
name: (0, _locale.i18n)('SPACING'),
|
|
107
|
-
value: /*#__PURE__*/_react["default"].createElement(_SpacingConfig["default"], {
|
|
108
|
-
configCompSpace: true,
|
|
109
|
-
configPaddingLR: true,
|
|
110
|
-
data: data.spacing
|
|
111
|
-
})
|
|
112
|
-
}, {
|
|
100
|
+
}, // { key: '3', name: i18n('SPACING'), value: <SpacingConfig configCompSpace configPaddingLR data={data.spacing} /> },
|
|
101
|
+
{
|
|
113
102
|
key: '4',
|
|
114
103
|
name: (0, _locale.i18n)('CUSTOMIZE'),
|
|
115
104
|
value: /*#__PURE__*/_react["default"].createElement(_CustomizeConfig["default"], {
|
|
116
105
|
data: data.customize,
|
|
117
106
|
isHideAlign: true,
|
|
118
|
-
layoutSource: (0, _coreUtil.isPc)() ? _layout.recommendLayoutPc : _layout.recommendLayoutMobile
|
|
119
|
-
selectedLayoutFun: function selectedLayoutFun(v) {
|
|
120
|
-
_this.getLayout(v);
|
|
121
|
-
}
|
|
107
|
+
layoutSource: (0, _coreUtil.isPc)() ? _layout.recommendLayoutPc : _layout.recommendLayoutMobile
|
|
122
108
|
})
|
|
123
109
|
}, {
|
|
124
110
|
key: '5',
|
|
@@ -17,8 +17,6 @@ var _common = require("../../../../common");
|
|
|
17
17
|
|
|
18
18
|
var _ImageConfig = _interopRequireDefault(require("../../../../meta-comp/config-panels/ImageConfig"));
|
|
19
19
|
|
|
20
|
-
var _ButtonConfig = _interopRequireDefault(require("../../../../meta-comp/config-panels/ButtonConfig"));
|
|
21
|
-
|
|
22
20
|
var _TextConfig = _interopRequireDefault(require("../../../../meta-comp/config-panels/TextConfig"));
|
|
23
21
|
|
|
24
22
|
var _BaseConfig = _interopRequireDefault(require("../../../../meta-comp/config-panels/BaseConfig"));
|
|
@@ -160,14 +158,8 @@ function (_super) {
|
|
|
160
158
|
data: panelProps.groupName
|
|
161
159
|
}),
|
|
162
160
|
metaOption: panelProps.groupName
|
|
163
|
-
}, {
|
|
164
|
-
|
|
165
|
-
name: (0, _locale.i18n)('SEE_ALL'),
|
|
166
|
-
value: /*#__PURE__*/_react["default"].createElement(_ButtonConfig["default"], {
|
|
167
|
-
data: panelProps.seeAll
|
|
168
|
-
}),
|
|
169
|
-
metaOption: panelProps.seeAll
|
|
170
|
-
}, {
|
|
161
|
+
}, // { key: 'defaultSource_3', name: i18n('SEE_ALL'), value: <ButtonConfig data={panelProps.seeAll} />, metaOption: panelProps.seeAll },
|
|
162
|
+
{
|
|
171
163
|
key: 'defaultSource_4',
|
|
172
164
|
name: (0, _locale.i18n)('SECOND_CATEGORY'),
|
|
173
165
|
value: productSource,
|
package/lib/constants/layout.js
CHANGED
|
@@ -39,13 +39,11 @@ var _newsletter = _interopRequireDefault(require("../assets/images/layout-icon/n
|
|
|
39
39
|
|
|
40
40
|
var _layoutRecommend = _interopRequireDefault(require("../assets/images/layout-icon/layout-recommend-1.png"));
|
|
41
41
|
|
|
42
|
-
var _layoutRecommend2 = _interopRequireDefault(require("../assets/images/layout-icon/layout-recommend-
|
|
42
|
+
var _layoutRecommend2 = _interopRequireDefault(require("../assets/images/layout-icon/layout-recommend-3.png"));
|
|
43
43
|
|
|
44
|
-
var _layoutRecommend3 = _interopRequireDefault(require("../assets/images/layout-icon/layout-recommend-
|
|
44
|
+
var _layoutRecommend3 = _interopRequireDefault(require("../assets/images/layout-icon/layout-recommend-4.png"));
|
|
45
45
|
|
|
46
|
-
var _layoutRecommend4 = _interopRequireDefault(require("../assets/images/layout-icon/layout-recommend-
|
|
47
|
-
|
|
48
|
-
var _layoutRecommend5 = _interopRequireDefault(require("../assets/images/layout-icon/layout-recommend-5.png"));
|
|
46
|
+
var _layoutRecommend4 = _interopRequireDefault(require("../assets/images/layout-icon/layout-recommend-5.png"));
|
|
49
47
|
|
|
50
48
|
var _layoutNavigationNewline = _interopRequireDefault(require("../assets/images/layout-icon/layout-navigation-newline.png"));
|
|
51
49
|
|
|
@@ -136,36 +134,20 @@ var recommendLayoutMobile = [{
|
|
|
136
134
|
id: 'layout1',
|
|
137
135
|
name: 'layout1',
|
|
138
136
|
image: _layoutRecommend["default"]
|
|
139
|
-
}, {
|
|
140
|
-
id: 'layout2',
|
|
141
|
-
name: 'layout2',
|
|
142
|
-
image: _layoutRecommend2["default"]
|
|
143
|
-
}, {
|
|
144
|
-
id: 'layout3',
|
|
145
|
-
name: 'layout3',
|
|
146
|
-
image: _layoutRecommend3["default"]
|
|
147
|
-
}, {
|
|
148
|
-
id: 'layout4',
|
|
149
|
-
name: 'layout4',
|
|
150
|
-
image: _layoutRecommend4["default"]
|
|
151
|
-
}, {
|
|
152
|
-
id: 'layout5',
|
|
153
|
-
name: 'layout5',
|
|
154
|
-
image: _layoutRecommend5["default"]
|
|
155
137
|
}];
|
|
156
138
|
exports.recommendLayoutMobile = recommendLayoutMobile;
|
|
157
139
|
var recommendLayoutPc = [{
|
|
158
140
|
id: 'layout1',
|
|
159
141
|
name: 'layout1',
|
|
160
|
-
image:
|
|
142
|
+
image: _layoutRecommend2["default"]
|
|
161
143
|
}, {
|
|
162
144
|
id: 'layout2',
|
|
163
145
|
name: 'layout2',
|
|
164
|
-
image:
|
|
146
|
+
image: _layoutRecommend3["default"]
|
|
165
147
|
}, {
|
|
166
148
|
id: 'layout3',
|
|
167
149
|
name: 'layout3',
|
|
168
|
-
image:
|
|
150
|
+
image: _layoutRecommend4["default"]
|
|
169
151
|
}];
|
|
170
152
|
exports.recommendLayoutPc = recommendLayoutPc;
|
|
171
153
|
var mobileNavigationLayout = [{
|