@fonixtree/magic-design 0.0.54 → 0.0.55

package/README.md

@@ -0,0 +1,320 @@
+# 快捷指令使用
+
+## 1、发布 -- npm run pub
+
+## 2、新增国际化 -- npm run cl "Hello world"
+
+## 3、更新iconfont -- npm run iconfont
+
+
+# 设计器二期
+
+## 1、基本概念
+
+### 1.1、元组件：构成复合组件的最小单位
+
+Text、Image、Button、Divider、Video 等
+
+### 1.2、复合组件：由若干个元组件构成的一个大组件
+
+Text、Banner、Image Gallery、Image and Text、Carousel、Reward、Newsletter 等
+
+### 1.3、业务公共组件：项目中复用的公共组件
+
+所有的公共组件需要开放 value 和 onChange Api（除 Button、Iconfont）
+
+Button、Iconfont、AlignSelecter、Collapse、ColorPicker、ImagePicker、LayoutSelecter、Slider、UrlPicker
+
+## 2、元组件
+
+### 2.1
+
+元组件类型：
+
+TEXT、IMAGE、BUTTON、DIVIDER、VIDEO
+
+元组件报文格式：
+
+```json
+{
+  id:'xxxx' //元组件key
+  type: 'TYPE', //元组件类型
+  style:{
+  	fontFamily:'xxx', //字体
+  	...css  //属性名称尽量使用标准css名称
+	},
+	hoverStyle:{
+
+  }
+}
+```
+
+动态设置 hover 效果
+
+onMouseEnter={e => { e.target.style.color = 'red'; }}
+
+onMouseLeave={e => { e.target.style.color = 'white'; }}
+
+文本可编辑
+
+contenteditable="true"
+
+### 2.2 、元组件报文
+
+#### Text
+
+```json
+{
+  id:'xxxx' //元组件key
+  type: 'TYPE', //元组件类型
+  content:'this is text',
+  style:{
+    fontFamily:'xxx', //字体
+    fontSize: '14px',
+    width: '200px',
+    ...css
+	}
+}
+```
+
+#### Image
+
+```json
+{
+  id:'xxxx' //元组件key
+  type: 'IMAGE', //元组件类型
+  name:'123.png',
+  src:'../image.png', //图片地址
+  url:'www.baidu.com', //图片跳转地址
+  style:{
+    width: '200px',
+    ...css
+	},
+	hoverStyle:{     //hover 类型为new时保存src，类型为enlarge时保存scale
+    scale: '2',
+    src:'../image1.png',
+  }
+}
+```
+
+#### Button
+
+```json
+{
+  id:'xxxx' //元组件key
+  type: 'BUTTON', //元组件类型
+  name:'Submit',
+  url: 'www.baidu.com',
+  style:{
+  	buttonIconSrc:'../img.png',
+ 	  buttonIconPlace: 'left',
+  	color:'#FEFEFE',
+  	border: '1px solid red',
+  	borderRadius:'10px',
+    fontFamily:'xxx', //字体
+    fontSize: '14px',
+    ...css
+	},
+	hoverStyle {
+    color:'#FEFEFE',
+  	border: '1px solid red',
+    fontFamily:'xxx', //字体
+    fontSize: '14px',
+    ...css
+  }
+}
+```
+
+## 2、复合组件
+
+### 2.1
+
+元组件类型：
+
+TEXT、BANNER、IMAGE_GALLERT、IMAGE_TEXT、CAROUSEL、REWARD、NEWSLETTER
+
+复合组件报文格式：
+
+```json
+{
+  id:'xxxx' //复合组件key
+  type: 'TYPE', //复合组件类型
+  setting:{     //开关类型的配置及属性配置放在这里
+  	autoplays: 3, //3秒轮播
+	},
+	groupSource:[],  //元组件集合组数据放在这里
+	metas:{
+    title:{
+      open:false,
+      type:'IMAGE'
+      ...metaCompJson
+    },
+    subTitle:{
+      open:false,
+        type:'IMAGE'
+        ...metaCompJson
+    }
+  },
+	customize:{
+    layout:'',
+    background:{
+
+    }
+  }
+}
+```
+
+#### Text
+
+```js
+{
+	id: 'xxxx', //复合组件key
+  type: 'TEXT', //复合组件类型
+  setting:{
+    layout:'left', // 模块布局 left/center/right ，每一个layout可能都是一个不同的组件
+    title:{
+      type:'TEXT'
+       ...metaCompJson
+    },
+    subtitle:{
+      type:'TEXT'
+       ...metaCompJson
+    },
+  },
+  source:[
+    {                   //此处可以抽出业务组件
+      title:{
+        type:'TEXT'
+       ...metaCompJson
+      },
+      content:{
+        type:'TEXT'
+       ...metaCompJson
+      }
+    }
+  ],
+  style:{
+  	align:'left',  //文本布局 left/center/right
+  	backgroundColor: 'red',
+  	backgroundImage:'../image.png'
+	}
+}
+```
+
+#### Banner
+
+modifySetting
+
+```json
+{
+  "comositeId": "1111",
+
+  "value": {
+    "autoplays": 4
+  }
+}
+```
+
+```json
+{
+	id: 'xxxx',
+	type: 'BANNER',
+	setting:{
+    open:false
+  	autoplays: 3, //3秒轮播
+    arrows:{      // 滚动箭头
+    	open:false,
+    	color:'red',
+    	size:'',
+    	hoverSize:'',
+      hoverColor:'green',
+  	},
+    dots:{       //面板指示点
+      open:false,
+      color: 'red',
+      size:'',
+      hoverSize:''
+      hoverColor:'green',
+    },
+	},
+  groupSource:[
+    {                     //此处可以作为一个业务组件
+      id:'xxxxx',
+      image:{
+        open:false,
+        type:'IMAGE'
+        ...metaCompJson
+      },
+      title:{
+        open:false,
+        type:'TEXT',
+        ...metaCompJson
+      },
+      content:{
+        open:false,
+        type:'TEXT',
+        ...metaCompJson
+      },
+      button:{
+        type:'BUTTON',
+        ...metaCompJson
+      },
+      secondaryButton:{
+        type:'BUTTON',
+        ...metaCompJson
+      },
+      layout:'center',
+      align:'left',
+      //文本布局 left/center/right
+    }
+  ]
+}
+```
+
+#### Image Gallery
+
+```json
+
+```
+
+#### Image and Text
+
+```json
+{
+  id:'xxxx'
+  type: 'IMAGE_TEXT',
+  setting:{
+  	layout:'left',
+  	title:{},
+		subtitle:{},
+		button:{},
+		secondaryButton:{}
+	},
+	source:[
+
+  ],
+  style:{
+    align:'left',
+    backgroundColor:'red',
+    backgroundImage:'./img.png'
+  }
+}
+```
+
+疑问：
+
+Text 元组件
+
+文字链接配置好之后，怎么删除
+
+链接配置的规则，按单词还是字符
+
+image 元组件
+
+属性控制进度条和输入框是否要限制最大最小值
+
+button 元组件
+
+是否需要 icon 的 hover 效果
+
+banner 中的 text Align 放在元组件里？

package/es/common/ImageModal/index.js

@@ -219,7 +219,6 @@ var modalSize = _const.size;
 var Search = _antd.Input.Search;
 var picAccept = '.gif,.jpg,.png';
 var videoAccept = '.AVI,.mov,.rmvb,.rm,.FLV,.mp4,.3GP';
-var pageSize = 24;
 
 function ImageModal(_a) {
   var _this = this;
@@ -256,29 +255,33 @@ function ImageModal(_a) {
       pageIndex = _j[0],
       setPageIndex = _j[1];
 
-  var _k = (0, _react.useState)(false),
-      spinning = _k[0],
-      setSpinning = _k[1];
+  var _k = (0, _react.useState)(20),
+      pageSize = _k[0],
+      setPageSize = _k[1];
 
-  var _l = (0, _react.useState)(''),
-      name = _l[0],
-      setName = _l[1];
+  var _l = (0, _react.useState)(false),
+      spinning = _l[0],
+      setSpinning = _l[1];
 
-  var _m = (0, _react.useState)([]),
-      contentcatgsList = _m[0],
-      setContentcatgsList = _m[1];
+  var _m = (0, _react.useState)(''),
+      name = _m[0],
+      setName = _m[1];
 
-  var _o = (0, _react.useState)(''),
-      searchValue = _o[0],
-      setSearchValue = _o[1];
+  var _o = (0, _react.useState)([]),
+      contentcatgsList = _o[0],
+      setContentcatgsList = _o[1];
 
-  var _p = (0, _react.useState)([]),
-      expandedKeys = _p[0],
-      setExpandedKeys = _p[1];
+  var _p = (0, _react.useState)(''),
+      searchValue = _p[0],
+      setSearchValue = _p[1];
 
-  var _q = (0, _react.useState)(true),
-      autoExpandParent = _q[0],
-      setAutoExpandParent = _q[1]; // const currentUser = sessionUtil.getUser() || {};
+  var _q = (0, _react.useState)([]),
+      expandedKeys = _q[0],
+      setExpandedKeys = _q[1];
+
+  var _r = (0, _react.useState)(true),
+      autoExpandParent = _r[0],
+      setAutoExpandParent = _r[1]; // const currentUser = sessionUtil.getUser() || {};
   // const { _csrf } = currentUser;
   // const headers = {};
   // if (_csrf && _csrf.headerName) {
@@ -574,11 +577,13 @@ function ImageModal(_a) {
     current: pageIndex,
     pageSize: pageSize,
     total: total,
-    onChange: function onChange(page) {
-      setPageIndex(page);
+    onChange: function onChange(pageIndex, pageSize) {
+      setPageIndex(pageIndex);
+      setPageSize(pageSize);
       qryImageContents({
         contentCatgId: selectedKeys[0],
-        pageIndex: page
+        pageIndex: pageIndex,
+        pageSize: pageSize
       });
     }
   };

package/es/common/ImgArea/components/Crop.js

@@ -0,0 +1,267 @@
+"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"] = exports.coordinateType = void 0;
+
+var _interactjs = _interopRequireDefault(require("interactjs"));
+
+var _propTypes = _interopRequireDefault(require("prop-types"));
+
+var _ramda = require("ramda");
+
+var _react = _interopRequireWildcard(require("react"));
+
+var _Icons = require("./Icons");
+
+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; }
+
+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 __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 Crop =
+/** @class */
+function (_super) {
+  __extends(Crop, _super);
+
+  function Crop() {
+    var _this = _super !== null && _super.apply(this, arguments) || this; // shouldComponentUpdate(nextProps) {
+    //   // reduce uncessary update
+    //   return !equals(nextProps.coordinate.inputVal, this.state.inputVal)||!equals(nextProps.coordinate, this.props.coordinate)
+    //     || (nextProps.index !== this.props.index)
+    // }
+
+
+    _this.handleResizeMove = function (e) {
+      var _a = _this.props,
+          index = _a.index,
+          coordinate = _a.coordinate,
+          _b = _a.coordinate,
+          x = _b.x,
+          y = _b.y,
+          coordinates = _a.coordinates,
+          onResize = _a.onResize,
+          onChange = _a.onChange,
+          onSave = _a.onSave;
+      var _c = e.rect,
+          width = _c.width,
+          height = _c.height;
+      var _d = e.deltaRect,
+          left = _d.left,
+          top = _d.top; // console.log(x, left, y, top);
+      // if (x + left < 0 || y + top < 0 || x + left + width > 500 || y + top + height > 500) {
+      //   return;
+      // }
+
+      var nextCoordinate = __assign(__assign({}, coordinate), {
+        x: x + left,
+        y: y + top,
+        width: width,
+        height: height
+      });
+
+      var nextCoordinates = (0, _ramda.update)(index, nextCoordinate)(coordinates);
+
+      if ((0, _ramda.is)(Function, onResize)) {
+        onResize(nextCoordinate, index, nextCoordinates);
+      }
+
+      if ((0, _ramda.is)(Function, onChange)) {
+        onChange(nextCoordinate, index, nextCoordinates);
+      }
+    };
+
+    _this.handleDragMove = function (e) {
+      var _a = _this.props,
+          index = _a.index,
+          coordinate = _a.coordinate,
+          _b = _a.coordinate,
+          x = _b.x,
+          y = _b.y,
+          coordinates = _a.coordinates,
+          onDrag = _a.onDrag,
+          onChange = _a.onChange;
+      var dx = e.dx,
+          dy = e.dy;
+
+      var nextCoordinate = __assign(__assign({}, coordinate), {
+        x: x + dx,
+        y: y + dy
+      });
+
+      var nextCoordinates = (0, _ramda.update)(index, nextCoordinate)(coordinates);
+
+      if ((0, _ramda.is)(Function, onDrag)) {
+        onDrag(nextCoordinate, index, nextCoordinates);
+      }
+
+      if ((0, _ramda.is)(Function, onChange)) {
+        onChange(nextCoordinate, index, nextCoordinates);
+      }
+    };
+
+    _this.handleDelete = function () {
+      var _a = _this.props,
+          index = _a.index,
+          coordinate = _a.coordinate,
+          onDelete = _a.onDelete,
+          coordinates = _a.coordinates;
+      var nextCoordinates = (0, _ramda.remove)(index, 1)(coordinates);
+
+      if ((0, _ramda.is)(Function, onDelete)) {
+        onDelete(coordinate, index, nextCoordinates);
+      }
+    };
+
+    _this.state = {
+      inputVal: _this.props.coordinate && _this.props.coordinate.inputVal || ''
+    };
+
+    _this.handleSave = function () {
+      var _a = _this.props,
+          coordinate = _a.coordinate,
+          _b = _a.coordinate,
+          x = _b.x,
+          y = _b.y,
+          coordinates = _a.coordinates,
+          index = _a.index,
+          onSave = _a.onSave;
+
+      var nextCoordinate = __assign(__assign({}, coordinate), {
+        x: x,
+        y: y,
+        inputVal: _this.state.inputVal
+      });
+
+      var nextCoordinates = (0, _ramda.update)(index, nextCoordinate)(coordinates);
+      onSave && onSave(coordinate, index, nextCoordinates);
+      (0, _interactjs["default"])(_this.crop).unset();
+    };
+
+    return _this;
+  }
+
+  Crop.prototype.componentDidMount = function () {
+    (0, _interactjs["default"])(this.crop).draggable({
+      modifiers: [_interactjs["default"].modifiers.restrictRect({
+        restriction: 'parent'
+      })]
+    }).resizable({
+      edges: {
+        left: true,
+        right: true,
+        bottom: true,
+        top: true
+      }
+    }).on('dragmove', this.handleDragMove).on('resizemove', this.handleResizeMove);
+  };
+
+  Crop.prototype.componentWillUnmount = function () {
+    (0, _interactjs["default"])(this.crop).unset();
+  };
+
+  Crop.prototype.render = function () {
+    var _this = this;
+
+    var _a = this.props,
+        coordinate = _a.coordinate,
+        index = _a.index,
+        onSave = _a.onSave;
+    return /*#__PURE__*/_react["default"].createElement("div", {
+      ref: function ref(crop) {
+        return _this.crop = crop;
+      },
+      style: Crop.cropStyle(coordinate)
+    }, /*#__PURE__*/_react["default"].createElement(_Icons.NumberIcon, {
+      number: index + 1
+    }), /*#__PURE__*/_react["default"].createElement(_Icons.DeleteIcon, {
+      onClick: this.handleDelete
+    }));
+  };
+
+  Crop.cropStyle = function (coordinate) {
+    var x = coordinate.x,
+        y = coordinate.y,
+        width = coordinate.width,
+        height = coordinate.height;
+    return {
+      display: 'inline-block',
+      position: 'absolute',
+      width: width,
+      height: height,
+      top: y,
+      left: x,
+      border: '1px dashed #2F54EB',
+      background: 'rgba(47, 84, 235, 0.15)'
+    };
+  };
+
+  return Crop;
+}(_react.Component);
+
+var coordinateType = _propTypes["default"].shape({
+  x: _propTypes["default"].number.isRequired,
+  y: _propTypes["default"].number.isRequired,
+  width: _propTypes["default"].number.isRequired,
+  height: _propTypes["default"].number.isRequired
+});
+
+exports.coordinateType = coordinateType;
+Crop.propTypes = {
+  coordinate: coordinateType.isRequired,
+  index: _propTypes["default"].number.isRequired,
+  onResize: _propTypes["default"].func,
+  onDrag: _propTypes["default"].func,
+  onDelete: _propTypes["default"].func,
+  onChange: _propTypes["default"].func,
+  coordinates: _propTypes["default"].array,
+  onSave: _propTypes["default"].func
+};
+var _default = Crop;
+exports["default"] = _default;

package/es/common/ImgArea/components/Icons.js

@@ -0,0 +1,44 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.NumberIcon = exports.DeleteIcon = void 0;
+
+var _propTypes = _interopRequireDefault(require("prop-types"));
+
+var _react = _interopRequireDefault(require("react"));
+
+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 DeleteIcon = function DeleteIcon(props) {
+  return /*#__PURE__*/_react["default"].createElement("div", _extends({
+    className: "rmc-icon-container"
+  }, props), /*#__PURE__*/_react["default"].createElement("div", {
+    className: "rmc-remove"
+  }), /*#__PURE__*/_react["default"].createElement("style", {
+    jsx: "true"
+  }, "\n      .rmc-icon-container {\n        width: 15px;\n        height: 15px;\n        cursor: pointer;\n        float: right;\n        background:#2F54EB;\n        opacity: 0.8;\n      }\n      .rmc-remove {\n        color: white;\n        position: absolute;\n        margin-top: 6px;\n      }\n\n      .rmc-remove:hover {\n        cursor: pointer;\n      }\n\n      .rmc-remove:before {\n        content: '';\n        position: absolute;\n        width: 15px;\n        height: 1px;\n        background-color: currentColor;\n        -webkit-transform: rotate(45deg);\n                transform: rotate(45deg);\n      }\n\n      .rmc-remove:after {\n        content: '';\n        position: absolute;\n        width: 15px;\n        height: 1px;\n        background-color: currentColor;\n        -webkit-transform: rotate(-45deg);\n                transform: rotate(-45deg);\n      }\n    "));
+};
+
+exports.DeleteIcon = DeleteIcon;
+
+var NumberIcon = function NumberIcon(_a) {
+  var number = _a.number;
+  return /*#__PURE__*/_react["default"].createElement("div", {
+    className: "rmc-number"
+  }, number, /*#__PURE__*/_react["default"].createElement("style", {
+    jsx: "true"
+  }, "\n      .rmc-number {\n        height: 15px;\n        width: 15px;\n        float: left;\n        font-size: 12px;\n        background:#2F54EB;\n        text-align: center;\n        line-height: 15px;\n        color: white;\n        opacity: 0.8;\n      }\n    "));
+};
+
+exports.NumberIcon = NumberIcon;
+var number = _propTypes["default"].number;
+NumberIcon.propTypes = {
+  number: number
+};
+NumberIcon.defaultProps = {
+  number: ''
+};