@fonixtree/magic-design 0.0.102 → 0.0.104

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

@@ -319,24 +319,24 @@ var BundleCampaign = function BundleCampaign(props) {
   }, /*#__PURE__*/_react["default"].createElement("span", {
     className: "labelStyle"
   }, "Campaign Name"), /*#__PURE__*/_react["default"].createElement(_antd.Input, {
-    value: campaignName,
+    className: "inputStyle",
     onChange: function onChange(e) {
       setCampaignName(e.target.value);
     },
-    className: "inputStyle"
+    value: campaignName
   })), /*#__PURE__*/_react["default"].createElement(_antd.Col, {
     span: 12
   }, /*#__PURE__*/_react["default"].createElement("span", {
     className: "labelStyle"
   }, "Store"), /*#__PURE__*/_react["default"].createElement(_antd.Select, {
-    showSearch: true,
-    optionFilterProp: "children",
     className: "inputStyle",
-    placeholder: "Please select",
-    value: storeId,
     onChange: function onChange(value) {
       return setStoreId(value);
-    }
+    },
+    optionFilterProp: "children",
+    placeholder: "Please select",
+    showSearch: true,
+    value: storeId
   }, storeList && storeList.length > 0 && storeList.map(function (v) {
     return /*#__PURE__*/_react["default"].createElement(Option, {
       key: v.storeId,
@@ -352,10 +352,10 @@ var BundleCampaign = function BundleCampaign(props) {
   }, /*#__PURE__*/_react["default"].createElement("span", {
     className: "labelStyle"
   }, "Campaign State"), /*#__PURE__*/_react["default"].createElement(_antd.Select, {
+    className: "inputStyle",
     defaultValue: "A,B",
-    value: cmpState,
     onChange: changeCamState,
-    className: "inputStyle"
+    value: cmpState
   }, stateMap && stateMap.length > 0 && stateMap.map(function (v) {
     return /*#__PURE__*/_react["default"].createElement(Option, {
       key: v.key,
@@ -365,24 +365,24 @@ var BundleCampaign = function BundleCampaign(props) {
     span: 12
   }, /*#__PURE__*/_react["default"].createElement(_antd.Button, {
     onClick: queryFunc,
-    type: "primary",
     style: {
       marginRight: 10
-    }
+    },
+    type: "primary"
   }, "Query"), /*#__PURE__*/_react["default"].createElement(_antd.Button, {
     onClick: function onClick() {
       reset();
     }
   }, "Cancel"))), /*#__PURE__*/_react["default"].createElement(_antd.Table, {
-    scroll: {
-      y: 340
-    },
-    loading: loading,
     bordered: false,
+    columns: columns,
+    dataSource: bundleList,
+    loading: loading,
     rowKey: "campaignId",
     rowSelection: rowSelection,
-    columns: columns,
-    dataSource: bundleList
+    scroll: {
+      y: 340
+    }
   }));
 };
 

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

@@ -200,6 +200,7 @@ function CustomTable(props) {
     queryCus({
       pageType: 'Customized',
       verType: 'Formal',
+      configVersion: 'V2',
       state: 'Using'
     });
   }, []);
@@ -208,8 +209,8 @@ function CustomTable(props) {
     dataIndex: 'pageName'
   }];
   var rowSelection = {
-    onChange: function onChange(selectedRowKeys) {
-      _onChange("customized-" + selectedRowKeys[0]);
+    onChange: function onChange(selectedRowKeys, selectedRows) {
+      _onChange("customized-" + (selectedRows[0].pageCode || selectedRows[0].bdPageId || ''));
     },
     type: 'radio'
   };

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

@@ -517,13 +517,13 @@ var FilteredProductModal = function FilteredProductModal(props) {
     queryStore();
   }, []);
   return /*#__PURE__*/_react["default"].createElement("div", {
-    className: "filteredProductModal"
+    className: "mFilteredProductModal"
   }, /*#__PURE__*/_react["default"].createElement("div", {
     className: "proModalWrap"
   }, /*#__PURE__*/_react["default"].createElement("div", {
     className: "info"
   }, (0, _locale.i18n)('THE_PRODUCT_QUANTITY_WILL_BE_AUTOMATICALLY_UPDATED_WITH_THE_ITEMS_THAT_MEET_THE_CATEGORY_CONDITIONS')), /*#__PURE__*/_react["default"].createElement("div", {
-    className: "filteredProductModalContent"
+    className: "mFilteredProductModalContent"
   }, /*#__PURE__*/_react["default"].createElement("div", {
     className: "leftCot"
   }, /*#__PURE__*/_react["default"].createElement(_antd.Form, {

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

@@ -1,5 +1,4 @@
-.filteredProductModal {
-
+.mFilteredProductModal {
   .proModalWrap {
     .info {
       background: #ecf1fd;
@@ -17,7 +16,7 @@
       background-size: contain;
     }
 
-    .filteredProductModalContent {
+    .mFilteredProductModalContent {
       display: flex;
 
       .rightCot {

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

@@ -232,7 +232,7 @@ var ProductDetailPage = function ProductDetailPage(props) {
 
   var _j = (0, _react.useState)({
     pageSize: 20,
-    current: 1
+    pageIndex: 1
   }),
       paginationParams = _j[0],
       setPaginationParams = _j[1];
@@ -399,7 +399,7 @@ var ProductDetailPage = function ProductDetailPage(props) {
   }, /*#__PURE__*/_react["default"].createElement(_antd.Button, {
     onClick: function onClick() {
       setLoading(true);
-      paginationParams.current = 1;
+      paginationParams.pageIndex = 1;
 
       var total = paginationParams.total,
           params = __rest(paginationParams, ["total"]);
@@ -468,7 +468,7 @@ var ProductDetailPage = function ProductDetailPage(props) {
     pagination: __assign(__assign({}, paginationParams), {
       onChange: function onChange(page) {
         setLoading(true);
-        paginationParams.current = page;
+        paginationParams.pageIndex = page;
 
         var total = paginationParams.total,
             params = __rest(paginationParams, ["total"]);

package/lib/common/LinkModal/index.less

@@ -1,5 +1,5 @@
 .linkModal {
-  width: 1000px;
+  width: 1200px;
   right: unset !important;
   left: unset !important;
 

package/lib/common/MagicLink/index.js

@@ -0,0 +1,89 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.onAClick = exports.getLinkUrl = exports["default"] = void 0;
+
+var _react = _interopRequireDefault(require("react"));
+
+var _businessUtil = require("src/components/utils/businessUtil");
+
+var _coreUtil = require("src/components/utils/coreUtil");
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
+
+var __extends = void 0 && (void 0).__extends || function () {
+  var _extendStatics = function extendStatics(d, b) {
+    _extendStatics = Object.setPrototypeOf || {
+      __proto__: []
+    } instanceof Array && function (d, b) {
+      d.__proto__ = b;
+    } || function (d, b) {
+      for (var p in b) {
+        if (b.hasOwnProperty(p)) d[p] = b[p];
+      }
+    };
+
+    return _extendStatics(d, b);
+  };
+
+  return function (d, b) {
+    _extendStatics(d, b);
+
+    function __() {
+      this.constructor = d;
+    }
+
+    d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+  };
+}();
+
+var onAClick = function onAClick(e, url) {
+  e.preventDefault();
+
+  if (window.magicDesign.mode === 'renderer') {
+    (0, _coreUtil.clickUrl)(url);
+  }
+};
+
+exports.onAClick = onAClick;
+
+var getLinkUrl = function getLinkUrl(url) {
+  var h5Link = (0, _businessUtil.parseUrl)(url).h5Link;
+  return h5Link;
+};
+
+exports.getLinkUrl = getLinkUrl;
+
+var MagicLink =
+/** @class */
+function (_super) {
+  __extends(MagicLink, _super);
+
+  function MagicLink() {
+    var _this = _super !== null && _super.apply(this, arguments) || this;
+
+    _this.state = {};
+    return _this;
+  }
+
+  MagicLink.prototype.render = function () {
+    var _a = this.props,
+        url = _a.url,
+        children = _a.children;
+    var href = getLinkUrl(url);
+    return /*#__PURE__*/_react["default"].createElement("a", {
+      href: href,
+      onClick: function onClick(e) {
+        return onAClick(e, url);
+      }
+    }, children);
+  };
+
+  MagicLink.defaultProps = {};
+  return MagicLink;
+}(_react["default"].Component);
+
+var _default = MagicLink;
+exports["default"] = _default;

package/lib/common/ProductModal/index.js

@@ -745,7 +745,7 @@ var ProductModal = function ProductModal(props) {
     rowKey: "productId",
     rowSelection: rowSelection,
     scroll: {
-      y: 300
+      y: 500
     }
   }), /*#__PURE__*/_react["default"].createElement("div", {
     className: "selectedCot"

package/lib/common/ProductModal/index.less

@@ -11,13 +11,15 @@
     .content {
       display: flex;
       margin-bottom: 8px;
+
       .rightCot {
         width: calc(100% - 260px);
         margin-left: 16px;
         display: flex;
         flex-direction: column;
         justify-content: space-between;
-         .prodImg {
+
+        .prodImg {
           display: inline-block;
           width: 36px;
           height: 36px;
@@ -25,16 +27,18 @@
           background-position: 50% 50%;
           background-repeat: no-repeat;
         }
+
         .selectedCot {
+          padding-right: 18px;
           margin-left: 4px;
-          height: 148px;
+          height: 78px;
           background: #f8f8f8;
           border: 1px solid #e0e0e0;
           border-radius: 2px;
           display: flex;
           flex-direction: row;
-          flex-wrap: wrap;
-          overflow-y: auto;
+          // flex-wrap: wrap;
+          overflow-x: auto;
 
           .selectedItem {
             box-sizing: border-box;
@@ -71,9 +75,9 @@
               cursor: pointer;
             }
 
-            &:nth-child(n + 11) {
-              margin-top: 5px !important;
-            }
+            // &:nth-child(n + 11) {
+            //   margin-top: 5px !important;
+            // }
 
             .selectedItemImg {
               height: 52px;
@@ -94,6 +98,7 @@
         padding-right: 14px;
         box-sizing: border-box;
         border-right: 1px solid #e0e0e0;
+
         .divider {
           width: 10%;
           display: inline-block;

package/lib/common/SystemNotification/Confirm/index.js

@@ -0,0 +1,263 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports["default"] = Confirm;
+
+var _react = _interopRequireDefault(require("react"));
+
+var _antd = require("antd");
+
+var _Button = _interopRequireDefault(require("../../Button"));
+
+var _Iconfont = _interopRequireDefault(require("../../Iconfont"));
+
+require("./index.less");
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
+
+function _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
+
+var __awaiter = void 0 && (void 0).__awaiter || function (thisArg, _arguments, P, generator) {
+  function adopt(value) {
+    return value instanceof P ? value : new P(function (resolve) {
+      resolve(value);
+    });
+  }
+
+  return new (P || (P = Promise))(function (resolve, reject) {
+    function fulfilled(value) {
+      try {
+        step(generator.next(value));
+      } catch (e) {
+        reject(e);
+      }
+    }
+
+    function rejected(value) {
+      try {
+        step(generator["throw"](value));
+      } catch (e) {
+        reject(e);
+      }
+    }
+
+    function step(result) {
+      result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected);
+    }
+
+    step((generator = generator.apply(thisArg, _arguments || [])).next());
+  });
+};
+
+var __generator = void 0 && (void 0).__generator || function (thisArg, body) {
+  var _ = {
+    label: 0,
+    sent: function sent() {
+      if (t[0] & 1) throw t[1];
+      return t[1];
+    },
+    trys: [],
+    ops: []
+  },
+      f,
+      y,
+      t,
+      g;
+  return g = {
+    next: verb(0),
+    "throw": verb(1),
+    "return": verb(2)
+  }, typeof Symbol === "function" && (g[Symbol.iterator] = function () {
+    return this;
+  }), g;
+
+  function verb(n) {
+    return function (v) {
+      return step([n, v]);
+    };
+  }
+
+  function step(op) {
+    if (f) throw new TypeError("Generator is already executing.");
+
+    while (_) {
+      try {
+        if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
+        if (y = 0, t) op = [op[0] & 2, t.value];
+
+        switch (op[0]) {
+          case 0:
+          case 1:
+            t = op;
+            break;
+
+          case 4:
+            _.label++;
+            return {
+              value: op[1],
+              done: false
+            };
+
+          case 5:
+            _.label++;
+            y = op[1];
+            op = [0];
+            continue;
+
+          case 7:
+            op = _.ops.pop();
+
+            _.trys.pop();
+
+            continue;
+
+          default:
+            if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) {
+              _ = 0;
+              continue;
+            }
+
+            if (op[0] === 3 && (!t || op[1] > t[0] && op[1] < t[3])) {
+              _.label = op[1];
+              break;
+            }
+
+            if (op[0] === 6 && _.label < t[1]) {
+              _.label = t[1];
+              t = op;
+              break;
+            }
+
+            if (t && _.label < t[2]) {
+              _.label = t[2];
+
+              _.ops.push(op);
+
+              break;
+            }
+
+            if (t[2]) _.ops.pop();
+
+            _.trys.pop();
+
+            continue;
+        }
+
+        op = body.call(thisArg, _);
+      } catch (e) {
+        op = [6, e];
+        y = 0;
+      } finally {
+        f = t = 0;
+      }
+    }
+
+    if (op[0] & 5) throw op[1];
+    return {
+      value: op[0] ? op[1] : void 0,
+      done: true
+    };
+  }
+};
+
+var __rest = void 0 && (void 0).__rest || function (s, e) {
+  var t = {};
+
+  for (var p in s) {
+    if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0) t[p] = s[p];
+  }
+
+  if (s != null && typeof Object.getOwnPropertySymbols === "function") for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
+    if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i])) t[p[i]] = s[p[i]];
+  }
+  return t;
+};
+
+var debug = require('debug')('worker:confirm');
+
+function Confirm(props) {
+  var _this = this;
+
+  var okText = props.okText,
+      cancelText = props.cancelText,
+      title = props.title,
+      content = props.content,
+      onOk = props.onOk,
+      onCancel = props.onCancel,
+      onClose = props.onClose,
+      rest = __rest(props, ["okText", "cancelText", "title", "content", "onOk", "onCancel", "onClose"]);
+
+  var onOkClick = function onOkClick() {
+    return __awaiter(_this, void 0, void 0, function () {
+      var error_1;
+      return __generator(this, function (_a) {
+        switch (_a.label) {
+          case 0:
+            _a.trys.push([0, 2,, 3]);
+
+            return [4
+            /*yield*/
+            , onOk()];
+
+          case 1:
+            _a.sent();
+
+            onClose();
+            return [3
+            /*break*/
+            , 3];
+
+          case 2:
+            error_1 = _a.sent();
+            debug(error_1);
+            return [3
+            /*break*/
+            , 3];
+
+          case 3:
+            return [2
+            /*return*/
+            ];
+        }
+      });
+    });
+  };
+
+  var onCancelClick = function onCancelClick() {
+    try {
+      onCancel();
+      onClose();
+    } catch (error) {
+      debug(error);
+    }
+  };
+
+  return /*#__PURE__*/_react["default"].createElement(_antd.Modal, _extends({}, rest, {
+    closable: false,
+    footer: null
+  }), /*#__PURE__*/_react["default"].createElement("div", {
+    className: "confirm_wrap"
+  }, title && /*#__PURE__*/_react["default"].createElement("div", {
+    className: "confirm_title"
+  }, /*#__PURE__*/_react["default"].createElement(_Iconfont["default"], {
+    color: "#FFBF1B",
+    size: 24,
+    type: "icon-notice1"
+  }), /*#__PURE__*/_react["default"].createElement("span", {
+    className: "confirm_title_text"
+  }, title)), content && /*#__PURE__*/_react["default"].createElement("div", {
+    className: "confirm_content"
+  }, content), /*#__PURE__*/_react["default"].createElement("div", {
+    className: "confirm_footer"
+  }, /*#__PURE__*/_react["default"].createElement(_Button["default"], {
+    onClick: onCancelClick,
+    size: "small",
+    type: "light"
+  }, cancelText), /*#__PURE__*/_react["default"].createElement(_Button["default"], {
+    onClick: onOkClick,
+    size: "small",
+    type: "primary"
+  }, okText))));
+}

package/lib/common/SystemNotification/Confirm/index.less

@@ -0,0 +1,33 @@
+
+.confirm_wrap {
+  padding: 16px 16px 12px 16px;
+  .confirm_title {
+    display: flex;
+    align-items: center;
+    font-family: 'Open Sans';
+    font-style: normal;
+    font-weight: 600;
+    font-size: 16px;
+    line-height: 24px;
+    color: #232F46;
+    .confirm_title_text {
+      margin-left: 16px;
+    }
+  }
+  .confirm_content {
+    font-family: 'Open Sans';
+    font-style: normal;
+    font-weight: 400;
+    font-size: 13px;
+    line-height: 18px;
+    color: #232F46;
+    margin-left: 40px;
+    margin-top: 10px;
+  }
+  .confirm_footer {
+    margin-top: 24px;
+    display: flex;
+    align-items: center;
+    justify-content: flex-end;
+  }
+}