@fonixtree/magic-design 2.0.114 → 2.0.115

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

@@ -188,18 +188,18 @@ function InterestedMerchants(props) {
       _fetch = props._fetch;
 
   var _a = (0, _react.useState)([]),
-      platformList = _a[0],
-      setPlatformList = _a[1];
+      list = _a[0],
+      setList = _a[1];
 
   var _b = (0, _react.useState)(false),
       loading = _b[0],
       setLoading = _b[1];
 
   var _c = (0, _react.useState)(''),
-      platformName = _c[0],
-      setPlatformName = _c[1];
+      interestName = _c[0],
+      setInterestName = _c[1];
 
-  var queryPlatform = function queryPlatform(params) {
+  var queryData = function queryData(params) {
     return __awaiter(_this, void 0, void 0, function () {
       var res;
       return __generator(this, function (_a) {
@@ -208,12 +208,12 @@ function InterestedMerchants(props) {
             setLoading(true);
             return [4
             /*yield*/
-            , _fetch("/designer/v1/" + window.magicDesign.MBaseUrl + "/distribution/platform/page", params, 'GET')];
+            , _fetch("/designer/v1/" + window.magicDesign.MBaseUrl + "/interest/page", params, 'GET')];
 
           case 1:
             res = _a.sent();
             paginationParams.total = res.total;
-            setPlatformList(res.list);
+            setList(res.list);
             setLoading(false);
             return [2
             /*return*/
@@ -224,11 +224,11 @@ function InterestedMerchants(props) {
   };
 
   (0, _react.useEffect)(function () {
-    queryPlatform(paginationParams);
+    queryData(paginationParams);
   }, []);
   var columns = [{
-    title: 'Platform Name',
-    dataIndex: 'platformName'
+    title: 'InterestName',
+    dataIndex: 'interestName'
   }, {
     title: 'Logo',
     dataIndex: 'logo',
@@ -246,17 +246,17 @@ function InterestedMerchants(props) {
   var rowSelection = {
     onChange: function onChange(selectedRowKeys, selectedRow) {
       _onChange({
-        value: selectedRow[0].distributionPlatformId,
-        name: selectedRow[0].platformName
+        value: selectedRow[0].interestId,
+        name: selectedRow[0].interestName
       });
     },
     type: 'radio'
   };
 
   var reset = function reset() {
-    setPlatformName('');
-    queryPlatform(__assign({
-      platformName: ''
+    setInterestName('');
+    queryData(__assign({
+      interestName: ''
     }, paginationParams));
   };
 
@@ -274,21 +274,21 @@ function InterestedMerchants(props) {
   }, /*#__PURE__*/_react["default"].createElement(_antd.Col, {
     span: 16
   }, /*#__PURE__*/_react["default"].createElement(_antd.Form.Item, {
-    label: "Platform Name"
+    label: "Interest Name"
   }, /*#__PURE__*/_react["default"].createElement(_antd.Input, {
     onChange: function onChange(e) {
-      return setPlatformName(e.target.value);
+      return setInterestName(e.target.value);
     },
     size: "small",
-    value: platformName
+    value: interestName
   }))), /*#__PURE__*/_react["default"].createElement(_antd.Col, {
     span: 6
   }, /*#__PURE__*/_react["default"].createElement(_antd.Button, {
     onClick: function onClick() {
       setLoading(true);
       paginationParams.pageIndex = 1;
-      queryPlatform(__assign({
-        platformName: platformName
+      queryData(__assign({
+        interestName: interestName
       }, paginationParams));
     },
     size: "small",
@@ -304,19 +304,19 @@ function InterestedMerchants(props) {
   }, (0, _locale.i18n)('CANCEL'))))), /*#__PURE__*/_react["default"].createElement(_antd.Table, {
     bordered: false,
     columns: columns,
-    dataSource: platformList,
+    dataSource: list,
     defaultExpandAllRows: true,
     loading: loading,
     pagination: __assign(__assign({}, paginationParams), {
       onChange: function onChange(page) {
         paginationParams.pageIndex = page;
-        queryPlatform(__assign(__assign({}, paginationParams), {
-          platformName: platformName
+        queryData(__assign(__assign({}, paginationParams), {
+          interestName: interestName
         }));
       },
       showSizeChanger: false
     }),
-    rowKey: "distributionPlatformId",
+    rowKey: "interestId",
     rowSelection: rowSelection,
     scroll: {
       y: 400

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

@@ -5,7 +5,7 @@ function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" =
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports["default"] = InterestedProducts;
+exports["default"] = InterestedMerchants;
 
 var _react = _interopRequireWildcard(require("react"));
 
@@ -181,25 +181,25 @@ var paginationParams = {
   pageIndex: 1
 };
 
-function InterestedProducts(props) {
+function InterestedMerchants(props) {
   var _this = this;
 
   var _onChange = props.onChange,
       _fetch = props._fetch;
 
   var _a = (0, _react.useState)([]),
-      platformList = _a[0],
-      setPlatformList = _a[1];
+      list = _a[0],
+      setList = _a[1];
 
   var _b = (0, _react.useState)(false),
       loading = _b[0],
       setLoading = _b[1];
 
   var _c = (0, _react.useState)(''),
-      platformName = _c[0],
-      setPlatformName = _c[1];
+      interestName = _c[0],
+      setInterestName = _c[1];
 
-  var queryPlatform = function queryPlatform(params) {
+  var queryData = function queryData(params) {
     return __awaiter(_this, void 0, void 0, function () {
       var res;
       return __generator(this, function (_a) {
@@ -208,12 +208,12 @@ function InterestedProducts(props) {
             setLoading(true);
             return [4
             /*yield*/
-            , _fetch("/designer/v1/" + window.magicDesign.MBaseUrl + "/distribution/platform/page", params, 'GET')];
+            , _fetch("/designer/v1/" + window.magicDesign.MBaseUrl + "/interest/page", params, 'GET')];
 
           case 1:
             res = _a.sent();
             paginationParams.total = res.total;
-            setPlatformList(res.list);
+            setList(res.list);
             setLoading(false);
             return [2
             /*return*/
@@ -224,11 +224,11 @@ function InterestedProducts(props) {
   };
 
   (0, _react.useEffect)(function () {
-    queryPlatform(paginationParams);
+    queryData(paginationParams);
   }, []);
   var columns = [{
-    title: 'Platform Name',
-    dataIndex: 'platformName'
+    title: 'InterestName',
+    dataIndex: 'interestName'
   }, {
     title: 'Logo',
     dataIndex: 'logo',
@@ -246,17 +246,17 @@ function InterestedProducts(props) {
   var rowSelection = {
     onChange: function onChange(selectedRowKeys, selectedRow) {
       _onChange({
-        value: selectedRow[0].distributionPlatformId,
-        name: selectedRow[0].platformName
+        value: selectedRow[0].interestId,
+        name: selectedRow[0].interestName
       });
     },
     type: 'radio'
   };
 
   var reset = function reset() {
-    setPlatformName('');
-    queryPlatform(__assign({
-      platformName: ''
+    setInterestName('');
+    queryData(__assign({
+      interestName: ''
     }, paginationParams));
   };
 
@@ -274,21 +274,21 @@ function InterestedProducts(props) {
   }, /*#__PURE__*/_react["default"].createElement(_antd.Col, {
     span: 16
   }, /*#__PURE__*/_react["default"].createElement(_antd.Form.Item, {
-    label: "Platform Name"
+    label: "Interest Name"
   }, /*#__PURE__*/_react["default"].createElement(_antd.Input, {
     onChange: function onChange(e) {
-      return setPlatformName(e.target.value);
+      return setInterestName(e.target.value);
     },
     size: "small",
-    value: platformName
+    value: interestName
   }))), /*#__PURE__*/_react["default"].createElement(_antd.Col, {
     span: 6
   }, /*#__PURE__*/_react["default"].createElement(_antd.Button, {
     onClick: function onClick() {
       setLoading(true);
       paginationParams.pageIndex = 1;
-      queryPlatform(__assign({
-        platformName: platformName
+      queryData(__assign({
+        interestName: interestName
       }, paginationParams));
     },
     size: "small",
@@ -304,19 +304,19 @@ function InterestedProducts(props) {
   }, (0, _locale.i18n)('CANCEL'))))), /*#__PURE__*/_react["default"].createElement(_antd.Table, {
     bordered: false,
     columns: columns,
-    dataSource: platformList,
+    dataSource: list,
     defaultExpandAllRows: true,
     loading: loading,
     pagination: __assign(__assign({}, paginationParams), {
       onChange: function onChange(page) {
         paginationParams.pageIndex = page;
-        queryPlatform(__assign(__assign({}, paginationParams), {
-          platformName: platformName
+        queryData(__assign(__assign({}, paginationParams), {
+          interestName: interestName
         }));
       },
       showSizeChanger: false
     }),
-    rowKey: "distributionPlatformId",
+    rowKey: "interestId",
     rowSelection: rowSelection,
     scroll: {
       y: 400

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

@@ -229,7 +229,7 @@ function MerchantStory(props) {
     queryData(paginationParams);
   }, []);
   var columns = [{
-    title: 'store Name',
+    title: 'StoreName',
     dataIndex: 'storeName'
   }, {
     title: 'Logo',

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

@@ -129,10 +129,11 @@ function (_super) {
 
     _this.isShowSetTemplate = function () {
       return _constants.pageStateMap.DRAFT === _this.props.pageState;
-    };
+    }; // 拒绝审核 和 草稿状态展示保存按钮
+
 
     _this.isShowSave = function () {
-      return !(0, _coreUtil.isAutoAudit)() && [_constants.pageStateMap.REJECTED, _constants.pageStateMap.DRAFT].includes(_this.props.pageState);
+      return [_constants.pageStateMap.REJECTED, _constants.pageStateMap.DRAFT].includes(_this.props.pageState);
     };
 
     return _this;

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

@@ -188,18 +188,18 @@ function InterestedMerchants(props) {
       _fetch = props._fetch;
 
   var _a = (0, _react.useState)([]),
-      platformList = _a[0],
-      setPlatformList = _a[1];
+      list = _a[0],
+      setList = _a[1];
 
   var _b = (0, _react.useState)(false),
       loading = _b[0],
       setLoading = _b[1];
 
   var _c = (0, _react.useState)(''),
-      platformName = _c[0],
-      setPlatformName = _c[1];
+      interestName = _c[0],
+      setInterestName = _c[1];
 
-  var queryPlatform = function queryPlatform(params) {
+  var queryData = function queryData(params) {
     return __awaiter(_this, void 0, void 0, function () {
       var res;
       return __generator(this, function (_a) {
@@ -208,12 +208,12 @@ function InterestedMerchants(props) {
             setLoading(true);
             return [4
             /*yield*/
-            , _fetch("/designer/v1/" + window.magicDesign.MBaseUrl + "/distribution/platform/page", params, 'GET')];
+            , _fetch("/designer/v1/" + window.magicDesign.MBaseUrl + "/interest/page", params, 'GET')];
 
           case 1:
             res = _a.sent();
             paginationParams.total = res.total;
-            setPlatformList(res.list);
+            setList(res.list);
             setLoading(false);
             return [2
             /*return*/
@@ -224,11 +224,11 @@ function InterestedMerchants(props) {
   };
 
   (0, _react.useEffect)(function () {
-    queryPlatform(paginationParams);
+    queryData(paginationParams);
   }, []);
   var columns = [{
-    title: 'Platform Name',
-    dataIndex: 'platformName'
+    title: 'InterestName',
+    dataIndex: 'interestName'
   }, {
     title: 'Logo',
     dataIndex: 'logo',
@@ -246,17 +246,17 @@ function InterestedMerchants(props) {
   var rowSelection = {
     onChange: function onChange(selectedRowKeys, selectedRow) {
       _onChange({
-        value: selectedRow[0].distributionPlatformId,
-        name: selectedRow[0].platformName
+        value: selectedRow[0].interestId,
+        name: selectedRow[0].interestName
       });
     },
     type: 'radio'
   };
 
   var reset = function reset() {
-    setPlatformName('');
-    queryPlatform(__assign({
-      platformName: ''
+    setInterestName('');
+    queryData(__assign({
+      interestName: ''
     }, paginationParams));
   };
 
@@ -274,21 +274,21 @@ function InterestedMerchants(props) {
   }, /*#__PURE__*/_react["default"].createElement(_antd.Col, {
     span: 16
   }, /*#__PURE__*/_react["default"].createElement(_antd.Form.Item, {
-    label: "Platform Name"
+    label: "Interest Name"
   }, /*#__PURE__*/_react["default"].createElement(_antd.Input, {
     onChange: function onChange(e) {
-      return setPlatformName(e.target.value);
+      return setInterestName(e.target.value);
     },
     size: "small",
-    value: platformName
+    value: interestName
   }))), /*#__PURE__*/_react["default"].createElement(_antd.Col, {
     span: 6
   }, /*#__PURE__*/_react["default"].createElement(_antd.Button, {
     onClick: function onClick() {
       setLoading(true);
       paginationParams.pageIndex = 1;
-      queryPlatform(__assign({
-        platformName: platformName
+      queryData(__assign({
+        interestName: interestName
       }, paginationParams));
     },
     size: "small",
@@ -304,19 +304,19 @@ function InterestedMerchants(props) {
   }, (0, _locale.i18n)('CANCEL'))))), /*#__PURE__*/_react["default"].createElement(_antd.Table, {
     bordered: false,
     columns: columns,
-    dataSource: platformList,
+    dataSource: list,
     defaultExpandAllRows: true,
     loading: loading,
     pagination: __assign(__assign({}, paginationParams), {
       onChange: function onChange(page) {
         paginationParams.pageIndex = page;
-        queryPlatform(__assign(__assign({}, paginationParams), {
-          platformName: platformName
+        queryData(__assign(__assign({}, paginationParams), {
+          interestName: interestName
         }));
       },
       showSizeChanger: false
     }),
-    rowKey: "distributionPlatformId",
+    rowKey: "interestId",
     rowSelection: rowSelection,
     scroll: {
       y: 400

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

@@ -5,7 +5,7 @@ function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" =
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports["default"] = InterestedProducts;
+exports["default"] = InterestedMerchants;
 
 var _react = _interopRequireWildcard(require("react"));
 
@@ -181,25 +181,25 @@ var paginationParams = {
   pageIndex: 1
 };
 
-function InterestedProducts(props) {
+function InterestedMerchants(props) {
   var _this = this;
 
   var _onChange = props.onChange,
       _fetch = props._fetch;
 
   var _a = (0, _react.useState)([]),
-      platformList = _a[0],
-      setPlatformList = _a[1];
+      list = _a[0],
+      setList = _a[1];
 
   var _b = (0, _react.useState)(false),
       loading = _b[0],
       setLoading = _b[1];
 
   var _c = (0, _react.useState)(''),
-      platformName = _c[0],
-      setPlatformName = _c[1];
+      interestName = _c[0],
+      setInterestName = _c[1];
 
-  var queryPlatform = function queryPlatform(params) {
+  var queryData = function queryData(params) {
     return __awaiter(_this, void 0, void 0, function () {
       var res;
       return __generator(this, function (_a) {
@@ -208,12 +208,12 @@ function InterestedProducts(props) {
             setLoading(true);
             return [4
             /*yield*/
-            , _fetch("/designer/v1/" + window.magicDesign.MBaseUrl + "/distribution/platform/page", params, 'GET')];
+            , _fetch("/designer/v1/" + window.magicDesign.MBaseUrl + "/interest/page", params, 'GET')];
 
           case 1:
             res = _a.sent();
             paginationParams.total = res.total;
-            setPlatformList(res.list);
+            setList(res.list);
             setLoading(false);
             return [2
             /*return*/
@@ -224,11 +224,11 @@ function InterestedProducts(props) {
   };
 
   (0, _react.useEffect)(function () {
-    queryPlatform(paginationParams);
+    queryData(paginationParams);
   }, []);
   var columns = [{
-    title: 'Platform Name',
-    dataIndex: 'platformName'
+    title: 'InterestName',
+    dataIndex: 'interestName'
   }, {
     title: 'Logo',
     dataIndex: 'logo',
@@ -246,17 +246,17 @@ function InterestedProducts(props) {
   var rowSelection = {
     onChange: function onChange(selectedRowKeys, selectedRow) {
       _onChange({
-        value: selectedRow[0].distributionPlatformId,
-        name: selectedRow[0].platformName
+        value: selectedRow[0].interestId,
+        name: selectedRow[0].interestName
       });
     },
     type: 'radio'
   };
 
   var reset = function reset() {
-    setPlatformName('');
-    queryPlatform(__assign({
-      platformName: ''
+    setInterestName('');
+    queryData(__assign({
+      interestName: ''
     }, paginationParams));
   };
 
@@ -274,21 +274,21 @@ function InterestedProducts(props) {
   }, /*#__PURE__*/_react["default"].createElement(_antd.Col, {
     span: 16
   }, /*#__PURE__*/_react["default"].createElement(_antd.Form.Item, {
-    label: "Platform Name"
+    label: "Interest Name"
   }, /*#__PURE__*/_react["default"].createElement(_antd.Input, {
     onChange: function onChange(e) {
-      return setPlatformName(e.target.value);
+      return setInterestName(e.target.value);
     },
     size: "small",
-    value: platformName
+    value: interestName
   }))), /*#__PURE__*/_react["default"].createElement(_antd.Col, {
     span: 6
   }, /*#__PURE__*/_react["default"].createElement(_antd.Button, {
     onClick: function onClick() {
       setLoading(true);
       paginationParams.pageIndex = 1;
-      queryPlatform(__assign({
-        platformName: platformName
+      queryData(__assign({
+        interestName: interestName
       }, paginationParams));
     },
     size: "small",
@@ -304,19 +304,19 @@ function InterestedProducts(props) {
   }, (0, _locale.i18n)('CANCEL'))))), /*#__PURE__*/_react["default"].createElement(_antd.Table, {
     bordered: false,
     columns: columns,
-    dataSource: platformList,
+    dataSource: list,
     defaultExpandAllRows: true,
     loading: loading,
     pagination: __assign(__assign({}, paginationParams), {
       onChange: function onChange(page) {
         paginationParams.pageIndex = page;
-        queryPlatform(__assign(__assign({}, paginationParams), {
-          platformName: platformName
+        queryData(__assign(__assign({}, paginationParams), {
+          interestName: interestName
         }));
       },
       showSizeChanger: false
     }),
-    rowKey: "distributionPlatformId",
+    rowKey: "interestId",
     rowSelection: rowSelection,
     scroll: {
       y: 400

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

@@ -229,7 +229,7 @@ function MerchantStory(props) {
     queryData(paginationParams);
   }, []);
   var columns = [{
-    title: 'store Name',
+    title: 'StoreName',
     dataIndex: 'storeName'
   }, {
     title: 'Logo',

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

@@ -129,10 +129,11 @@ function (_super) {
 
     _this.isShowSetTemplate = function () {
       return _constants.pageStateMap.DRAFT === _this.props.pageState;
-    };
+    }; // 拒绝审核 和 草稿状态展示保存按钮
+
 
     _this.isShowSave = function () {
-      return !(0, _coreUtil.isAutoAudit)() && [_constants.pageStateMap.REJECTED, _constants.pageStateMap.DRAFT].includes(_this.props.pageState);
+      return [_constants.pageStateMap.REJECTED, _constants.pageStateMap.DRAFT].includes(_this.props.pageState);
     };
 
     return _this;

package/package.json

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