@fonixtree/magic-design 1.0.4 → 2.0.2

package/lib/common/ImageModal/index.js

@@ -23,6 +23,8 @@ var _CommonSelPicCard = _interopRequireDefault(require("./CommonSelPicCard"));
 
 var _const2 = require("./const");
 
+var _utils = require("./utils");
+
 var _Iconfont = _interopRequireDefault(require("../Iconfont"));
 
 var _commonUtil = require("../../utils/commonUtil");
@@ -487,7 +489,7 @@ function ImageModal(_a) {
 
   var handleUpload = function handleUpload(file) {
     return __awaiter(_this, void 0, void 0, function () {
-      var form, result;
+      var config, result, form, result;
       return __generator(this, function (_a) {
         switch (_a.label) {
           case 0:
@@ -505,6 +507,37 @@ function ImageModal(_a) {
               }
             }
 
+            console.log('file: ', file);
+            return [4
+            /*yield*/
+            , (0, _utils.getUploadParamCodeConfig)()];
+
+          case 1:
+            config = _a.sent();
+            if (!(file.size > config.maxSize)) return [3
+            /*break*/
+            , 3];
+            setSpinning(true);
+            setProcess(0);
+            return [4
+            /*yield*/
+            , (0, _utils.chunksUpload)({
+              file: file,
+              contentCatgId: selectedKeys[0]
+            }, function (process) {
+              // console.log('process', process);
+              setProcess(process);
+            })];
+
+          case 2:
+            result = _a.sent();
+            setProcess(null);
+            setSpinning(false);
+            return [2
+            /*return*/
+            , result];
+
+          case 3:
             form = new FormData();
             form.append('file', file); // 文件对象
 
@@ -518,7 +551,7 @@ function ImageModal(_a) {
             /*yield*/
             , onUpload(form)];
 
-          case 1:
+          case 4:
             result = _a.sent();
             return [2
             /*return*/

package/lib/common/ImagePicker/index.js

@@ -17,8 +17,12 @@ var _ImageModal = _interopRequireDefault(require("../ImageModal"));
 
 var _ = require("..");
 
+var _AiImageGenerator = _interopRequireDefault(require("../../core/Designer/AiImageGenerator"));
+
 var _Iconfont = _interopRequireDefault(require("../Iconfont"));
 
+var _coreUtil = require("../../utils/coreUtil");
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 
 var __extends = void 0 && (void 0).__extends || function () {
@@ -66,8 +70,8 @@ function (_super) {
 
     _this.state = {
       visible: false,
-      imageWay: 'upload',
-      inputVal: ''
+      inputVal: '',
+      aiImageVisible: false
     };
 
     _this.onChange = function (v) {
@@ -92,6 +96,12 @@ function (_super) {
       }
     };
 
+    _this.onAiImageClick = function () {
+      _this.setState({
+        aiImageVisible: true
+      });
+    };
+
     _this.getImagePick = function () {
       var visible = _this.state.visible;
       var value = _this.props.value;
@@ -161,6 +171,19 @@ function (_super) {
       }));
     };
 
+    _this.onAiImageConfirm = function (data) {
+      _this.setState({
+        aiImageVisible: false
+      });
+
+      _this.props.onChange({
+        contentTitle: data.fileName,
+        contentType: 'File',
+        imgUrl: data.oriUrl,
+        url: data.oriUrl
+      });
+    };
+
     _this.getImageUrl = function () {
       var onChange = _this.props.onChange;
       var inputVal = _this.state.inputVal;
@@ -198,6 +221,21 @@ function (_super) {
       }))));
     };
 
+    _this.changePickerWay = function (way) {
+      var tempObj = _this.props.imageSelectedWay;
+
+      if ((0, _coreUtil.isPc)()) {
+        tempObj.pc = way;
+        if (!tempObj.mobile) tempObj.mobile = way;
+      } else {
+        tempObj.mobile = way;
+        if (!tempObj.pc) tempObj.pc = way;
+      }
+
+      var onChange = _this.props.onChange;
+      onChange(null, tempObj);
+    };
+
     return _this;
   }
 
@@ -218,7 +256,9 @@ function (_super) {
   ImagePicker.prototype.render = function () {
     var _this = this;
 
-    var imageWay = this.state.imageWay;
+    var imageSelectedWay = this.props.imageSelectedWay;
+    var way = (0, _coreUtil.isPc)() ? imageSelectedWay.pc : imageSelectedWay.mobile;
+    var aiImageVisible = this.state.aiImageVisible;
     return /*#__PURE__*/_react["default"].createElement("div", {
       className: "image-picker-wrap"
     }, /*#__PURE__*/_react["default"].createElement(_.Field, {
@@ -228,23 +268,43 @@ function (_super) {
     }, /*#__PURE__*/_react["default"].createElement(_antd.Select, {
       className: "image-picker-select",
       onChange: function onChange(value) {
-        _this.setState({
-          imageWay: value
-        });
+        _this.changePickerWay(value);
       },
       size: "large",
-      value: imageWay
+      value: way || 'upload'
     }, selectList.map(function (v) {
       return /*#__PURE__*/_react["default"].createElement(Option, {
         key: v.key,
         value: v.key
       }, v.value);
-    })))), imageWay === 'upload' ? this.getImagePick() : this.getImageUrl());
+    })), /*#__PURE__*/_react["default"].createElement("div", {
+      className: "ai-btn",
+      onClick: this.onAiImageClick
+    }, /*#__PURE__*/_react["default"].createElement(_Iconfont["default"], {
+      color: "#2F54EB",
+      size: 20,
+      type: "icon-ai"
+    }), /*#__PURE__*/_react["default"].createElement("span", {
+      className: "btn-txt"
+    }, (0, _locale.i18n)('AI_IMAGE'))))), way === 'url' ? this.getImageUrl() : this.getImagePick(), /*#__PURE__*/_react["default"].createElement(_AiImageGenerator["default"], {
+      onClose: function onClose() {
+        return _this.setState({
+          aiImageVisible: false
+        });
+      },
+      onConfirm: this.onAiImageConfirm,
+      single: true,
+      visible: aiImageVisible
+    }));
   };
 
   ImagePicker.defaultProps = {
     value: '',
-    onChange: function onChange() {}
+    onChange: function onChange() {},
+    imageSelectedWay: {
+      pc: '',
+      mobile: ''
+    }
   };
   return ImagePicker;
 }(_react["default"].Component);

package/lib/common/ImagePicker/index.less

@@ -7,6 +7,7 @@
     justify-content: space-between;
     align-items: center;
     .ai-btn {
+      cursor: pointer;
       background: #FFFFFF;
       border: 1px solid #2F54EB;
       border-radius: 8px;

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

@@ -0,0 +1,348 @@
+"use strict";
+
+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); }
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports["default"] = AffiliateProductTable;
+
+var _react = _interopRequireWildcard(require("react"));
+
+var _antd = require("antd");
+
+var _commonUtil = require("../../../utils/commonUtil");
+
+var _locale = require("../../../locale");
+
+var _currencyUtil = require("../../../utils/currencyUtil");
+
+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); }
+
+function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { "default": obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj["default"] = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
+
+var __assign = void 0 && (void 0).__assign || function () {
+  __assign = Object.assign || function (t) {
+    for (var s, i = 1, n = arguments.length; i < n; i++) {
+      s = arguments[i];
+
+      for (var p in s) {
+        if (Object.prototype.hasOwnProperty.call(s, p)) t[p] = s[p];
+      }
+    }
+
+    return t;
+  };
+
+  return __assign.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 paginationParams = {
+  pageSize: 80,
+  pageIndex: 1
+};
+
+function AffiliateProductTable(props) {
+  var _this = this;
+
+  var _onChange = props.onChange;
+
+  var _a = (0, _react.useState)([]),
+      productList = _a[0],
+      setProductList = _a[1];
+
+  var _b = (0, _react.useState)(false),
+      loading = _b[0],
+      setLoading = _b[1];
+
+  var _c = (0, _react.useState)({}),
+      formInfo = _c[0],
+      setFormInfo = _c[1];
+
+  var form = _antd.Form.useForm()[0];
+
+  var queryProduct = function queryProduct(params) {
+    return __awaiter(_this, void 0, void 0, function () {
+      var res;
+      return __generator(this, function (_a) {
+        switch (_a.label) {
+          case 0:
+            setLoading(true);
+            return [4
+            /*yield*/
+            , (0, _commonUtil.commonFetch)("/designer/v1/" + window.magicDesign.MBaseUrl + "/distributor/product/list", __assign(__assign({}, params), {
+              state: 'Valid'
+            }), 'GET')];
+
+          case 1:
+            res = _a.sent();
+            paginationParams.total = res.total;
+            setProductList(res.list);
+            setLoading(false);
+            return [2
+            /*return*/
+            ];
+        }
+      });
+    });
+  };
+
+  (0, _react.useEffect)(function () {
+    queryProduct(paginationParams);
+  }, []);
+  var columns = [{
+    title: 'Image',
+    dataIndex: 'imgUrls',
+    width: 100,
+    render: function render(val) {
+      return /*#__PURE__*/_react["default"].createElement("img", {
+        alt: "",
+        src: val && val[0],
+        style: {
+          maxWidth: '50px',
+          maxHeight: '50px'
+        }
+      });
+    }
+  }, {
+    title: 'Product Name',
+    dataIndex: 'productName',
+    ellipsis: true
+  }, {
+    title: 'Product Code',
+    dataIndex: 'affiliateProductCode'
+  }, {
+    title: 'Price',
+    dataIndex: 'productPrice',
+    width: 150,
+    render: function render(val) {
+      return (0, _currencyUtil.formatCurrencyWithSymbol)(val);
+    }
+  }];
+  var rowSelection = {
+    onChange: function onChange(selectedRowKeys, selectedRow) {
+      _onChange({
+        value: selectedRow[0].productName,
+        name: selectedRow[0].productName,
+        productId: selectedRow[0].affiliateProductId
+      });
+    },
+    type: 'radio'
+  };
+
+  var reset = function reset() {
+    form.resetFields(['productName', 'affiliateProductCode']);
+    queryProduct(__assign({}, paginationParams));
+  };
+
+  var onQueryClick = function onQueryClick() {
+    setLoading(true);
+    var data = form.getFieldsValue();
+    paginationParams.pageIndex = 1;
+    queryProduct(__assign(__assign({}, data), paginationParams));
+  };
+
+  return /*#__PURE__*/_react["default"].createElement("div", {
+    style: {
+      height: 550
+    }
+  }, /*#__PURE__*/_react["default"].createElement(_antd.Form, {
+    form: form,
+    initialValues: formInfo,
+    labelCol: {
+      span: 8
+    },
+    layout: "horizontal"
+  }, /*#__PURE__*/_react["default"].createElement(_antd.Row, {
+    gutter: 24
+  }, /*#__PURE__*/_react["default"].createElement(_antd.Col, {
+    span: 9
+  }, /*#__PURE__*/_react["default"].createElement(_antd.Form.Item, {
+    label: "Product Name",
+    name: "productName"
+  }, /*#__PURE__*/_react["default"].createElement(_antd.Input, {
+    size: "small"
+  }))), /*#__PURE__*/_react["default"].createElement(_antd.Col, {
+    span: 9
+  }, /*#__PURE__*/_react["default"].createElement(_antd.Form.Item, {
+    label: "Sku Code",
+    name: "affiliateProductCode"
+  }, /*#__PURE__*/_react["default"].createElement(_antd.Input, {
+    size: "small"
+  }))), /*#__PURE__*/_react["default"].createElement(_antd.Col, {
+    span: 6
+  }, /*#__PURE__*/_react["default"].createElement(_antd.Button, {
+    onClick: onQueryClick,
+    size: "small",
+    style: {
+      marginRight: 10
+    },
+    type: "primary"
+  }, (0, _locale.i18n)('QUERY')), /*#__PURE__*/_react["default"].createElement(_antd.Button, {
+    onClick: function onClick() {
+      reset();
+    },
+    size: "small"
+  }, (0, _locale.i18n)('CANCEL'))))), /*#__PURE__*/_react["default"].createElement(_antd.Table, {
+    bordered: false,
+    columns: columns,
+    dataSource: productList,
+    defaultExpandAllRows: true,
+    loading: loading,
+    pagination: __assign(__assign({}, paginationParams), {
+      onChange: function onChange(page) {
+        paginationParams.pageIndex = page;
+        queryProduct(__assign({}, paginationParams));
+      },
+      showSizeChanger: false
+    }),
+    rowKey: "affiliateProductId",
+    rowSelection: rowSelection,
+    scroll: {
+      y: 350
+    }
+  }));
+}

package/lib/common/LinkModal/index.js

@@ -35,6 +35,8 @@ var _StoreTable = _interopRequireDefault(require("./StoreTable"));
 
 var _StoreCatgTable = _interopRequireDefault(require("./StoreCatgTable"));
 
+var _AffiliateProductTable = _interopRequireDefault(require("./AffiliateProductTable"));
+
 var _locale = require("../../locale");
 
 var _commonUtil = require("../../utils/commonUtil");
@@ -341,6 +343,10 @@ var LinkModal = function LinkModal(props) {
       onChange: function onChange(value) {
         return setLinkUrl(value);
       }
+    }), item.linkTypeCode === 'AffiliateProduct' && /*#__PURE__*/_react["default"].createElement(_AffiliateProductTable["default"], {
+      onChange: function onChange(value) {
+        return setLinkUrl(value);
+      }
     }));
   })), /*#__PURE__*/_react["default"].createElement("div", {
     className: "footer"

package/lib/composite-comp/bol/components/Banner/defaultJSON.js

@@ -207,7 +207,7 @@ var bannerGroupSourceJSON = function bannerGroupSourceJSON() {
     },
     background: {
       opacity: 100,
-      color: '#232F46',
+      color: 'rgba(255, 255, 255, 0)',
       image: '',
       bgType: 'color'
     }

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

@@ -66,7 +66,21 @@ function (_super) {
 
   function Banner() {
     return _super !== null && _super.apply(this, arguments) || this;
-  }
+  } // componentWillMount() {
+  //   // 兼容新功能： 轮播的 dots 点 区分pc 移动
+  //   const { nodeData } = this.props;
+  //   if (!nodeData.setting.dots.color.pc || !nodeData.setting.dots.hoverColor.pc || !nodeData.setting.dots.size.pc) {
+  //     nodeData.setting.dots = { ...nodeData.setting.dots,
+  //       ...{
+  //         color: { pc: '#fff', mobile: '#fff' },
+  //         hoverColor: { pc: '#fff', mobile: '#fff' },
+  //         size: { pc: 16, mobile: 8 },
+  //         hoverSize: { pc: 16, mobile: 8 },
+  //       },
+  //     };
+  //   }
+  // }
+
 
   Banner.prototype.render = function () {
     var nodeData = this.props.nodeData; // console.log('---banner', nodeData);

package/lib/composite-comp/bol/components/Banner/mobile/index.js

@@ -182,10 +182,7 @@ function (_super) {
         carouseIndex = _a.carouseIndex,
         hoverState = _a.hoverState;
     var autoplay = data.setting.autoplay.open;
-    var GAData = {
-      moduleId: data.id,
-      moduleName: data.moduleIndex + '.' + data.type
-    };
+    var GAData = (0, _commonUtil.getGAData)(data);
     /** 设计器模式下 如果选中特定group 自动播放关闭 */
 
     if ((0, _coreUtil.isDesignMode)() && _mobx.store.clickedGroup) {