wargerm 0.5.33 → 0.5.35

package/dist/components/Modal/index.d.ts

@@ -10,6 +10,7 @@ declare type Props = {
     okText?: string;
     cancelText?: string;
     visible?: boolean;
+    renderClose?: ReactNode;
     destroyOnClose?: boolean;
     hiddenMask?: boolean;
     isDrag?: boolean;

package/dist/components/ModalTips/index.d.ts

@@ -5,6 +5,7 @@ declare type Props = {
     onCancel?: (e: any) => void;
     closeCb?: () => void;
     footer?: ReactNode | boolean;
+    renderClose?: ReactNode | boolean;
     content?: ReactNode;
     onClose?: () => void;
     okText?: string;

package/dist/index.esm.js

@@ -9919,19 +9919,20 @@ var Modal = /*#__PURE__*/function (_React$PureComponent) {
           title = _this$props2.title,
           onClose = _this$props2.onClose,
           closeCb = _this$props2.closeCb,
+          renderClose = _this$props2.renderClose,
           isDrag = _this$props2.isDrag;
       return /*#__PURE__*/React.createElement("div", {
         className: "model-header"
       }, /*#__PURE__*/React.createElement("div", {
         ref: _this.titleRef,
         className: "model-title ".concat(isDrag ? 'move' : '')
-      }, title), /*#__PURE__*/React.createElement(CloseCircleOutlined, {
+      }, title), /*#__PURE__*/React.createElement("div", {
         className: "model-closeIcon",
         onClick: function onClick() {
           onClose && onClose();
           closeCb && closeCb();
         }
-      }));
+      }, renderClose ? renderClose : /*#__PURE__*/React.createElement(CloseCircleOutlined, null)));
     };
 
     _this.renderContent = function () {
@@ -10221,17 +10222,18 @@ var Modal$1 = /*#__PURE__*/function (_React$PureComponent) {
     _this.renderTop = function () {
       var _this$props2 = _this.props,
           title = _this$props2.title,
-          onClose = _this$props2.onClose;
+          onClose = _this$props2.onClose,
+          renderClose = _this$props2.renderClose;
       return /*#__PURE__*/React.createElement("div", {
         className: "model-header-tips"
       }, /*#__PURE__*/React.createElement("div", {
         className: "model-title-tips"
-      }, title), /*#__PURE__*/React.createElement(CloseCircleOutlined, {
+      }, title), /*#__PURE__*/React.createElement("div", {
         className: "model-closeIcon-tips",
         onClick: function onClick() {
           return onClose && onClose();
         }
-      }));
+      }, renderClose ? renderClose : /*#__PURE__*/React.createElement(CloseCircleOutlined, null)));
     };
 
     _this.renderContent = function () {
@@ -11459,6 +11461,7 @@ function Calendar(_ref, ref) {
       type = _ref.type,
       toolBarSolt = _ref.toolBarSolt,
       dateCellRender = _ref.dateCellRender,
+      onCell = _ref.onCell,
       calendarBodyClassName = _ref.calendarBodyClassName;
 
   var _useState = useState(initCalendar()),
@@ -11569,6 +11572,7 @@ function Calendar(_ref, ref) {
     type: "text",
     onClick: handleUp
   }), type == 'day' ? /*#__PURE__*/React.createElement(_DatePicker, {
+    allowClear: false,
     value: datevalue,
     onChange: function onChange(date) {
       setOneWeekDays(['时间'].concat(_toConsumableArray(getweekDay(date))));
@@ -11579,6 +11583,7 @@ function Calendar(_ref, ref) {
       width: '250px'
     }
   }) : type == 'week' ? /*#__PURE__*/React.createElement(_DatePicker, {
+    allowClear: false,
     value: datevalue,
     style: {
       width: '250px'
@@ -11591,6 +11596,7 @@ function Calendar(_ref, ref) {
       setDatevalue(date);
     }
   }) : /*#__PURE__*/React.createElement(_DatePicker, {
+    allowClear: false,
     value: datevalue,
     picker: "month",
     onChange: function onChange(date) {
@@ -11625,13 +11631,20 @@ function Calendar(_ref, ref) {
       gridTemplateColumns: type == 'week' ? 'repeat(8, 1fr)' : '1fr 7fr'
     }
   }, days === null || days === void 0 ? void 0 : days.map(function (day, index) {
-    return /*#__PURE__*/React.createElement("div", {
+    var _onCell;
+
+    var number = onCell && ((_onCell = onCell(days, day)) === null || _onCell === void 0 ? void 0 : _onCell.rowSpan) || 1;
+    return number ? /*#__PURE__*/React.createElement("div", {
       onClick: function onClick() {
         return cellClick(day);
       },
+      style: {
+        gridRowStart: "span ".concat(number),
+        height: number * 100
+      },
       className: "day_container ".concat(day.isCurrentDay ? 'isCurrentDay' : '', " ").concat(day.isCurrentMonth ? 'isCurrentMonth' : ''),
       key: index
-    }, dateCellRender ? dateCellRender(day) : day.text);
+    }, dateCellRender ? dateCellRender(day) : day.text) : null;
   }))) : /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("div", {
     className: "calendar_header_wrapper"
   }, weekLabelArray.map(function (weekLabel) {
@@ -11965,11 +11978,14 @@ function VideoPlayer(_ref, ref) {
       currentLayoutIndex = _useState2[0],
       setCurrentLayoutIndex = _useState2[1];
 
-  var _useState3 = useState(url),
+  var _useState3 = useState([]),
       _useState4 = _slicedToArray(_useState3, 2),
       urls = _useState4[0],
       setUrls = _useState4[1];
 
+  useEffect(function () {
+    setUrls(url);
+  }, [url]);
   var initPlayerIndex = allLayouts[layoutIndex || 0].span >= url.length ? url.length - 1 >= 0 ? url.length - 1 : 0 : allLayouts[layoutIndex || 0].span - 1;
 
   var _useState5 = useState(initPlayerIndex),

package/dist/index.js

@@ -9981,19 +9981,20 @@ var Modal = /*#__PURE__*/function (_React$PureComponent) {
           title = _this$props2.title,
           onClose = _this$props2.onClose,
           closeCb = _this$props2.closeCb,
+          renderClose = _this$props2.renderClose,
           isDrag = _this$props2.isDrag;
       return /*#__PURE__*/React__default['default'].createElement("div", {
         className: "model-header"
       }, /*#__PURE__*/React__default['default'].createElement("div", {
         ref: _this.titleRef,
         className: "model-title ".concat(isDrag ? 'move' : '')
-      }, title), /*#__PURE__*/React__default['default'].createElement(icons.CloseCircleOutlined, {
+      }, title), /*#__PURE__*/React__default['default'].createElement("div", {
         className: "model-closeIcon",
         onClick: function onClick() {
           onClose && onClose();
           closeCb && closeCb();
         }
-      }));
+      }, renderClose ? renderClose : /*#__PURE__*/React__default['default'].createElement(icons.CloseCircleOutlined, null)));
     };
 
     _this.renderContent = function () {
@@ -10283,17 +10284,18 @@ var Modal$1 = /*#__PURE__*/function (_React$PureComponent) {
     _this.renderTop = function () {
       var _this$props2 = _this.props,
           title = _this$props2.title,
-          onClose = _this$props2.onClose;
+          onClose = _this$props2.onClose,
+          renderClose = _this$props2.renderClose;
       return /*#__PURE__*/React__default['default'].createElement("div", {
         className: "model-header-tips"
       }, /*#__PURE__*/React__default['default'].createElement("div", {
         className: "model-title-tips"
-      }, title), /*#__PURE__*/React__default['default'].createElement(icons.CloseCircleOutlined, {
+      }, title), /*#__PURE__*/React__default['default'].createElement("div", {
         className: "model-closeIcon-tips",
         onClick: function onClick() {
           return onClose && onClose();
         }
-      }));
+      }, renderClose ? renderClose : /*#__PURE__*/React__default['default'].createElement(icons.CloseCircleOutlined, null)));
     };
 
     _this.renderContent = function () {
@@ -11521,6 +11523,7 @@ function Calendar(_ref, ref) {
       type = _ref.type,
       toolBarSolt = _ref.toolBarSolt,
       dateCellRender = _ref.dateCellRender,
+      onCell = _ref.onCell,
       calendarBodyClassName = _ref.calendarBodyClassName;
 
   var _useState = React.useState(initCalendar()),
@@ -11631,6 +11634,7 @@ function Calendar(_ref, ref) {
     type: "text",
     onClick: handleUp
   }), type == 'day' ? /*#__PURE__*/React__default['default'].createElement(_DatePicker__default['default'], {
+    allowClear: false,
     value: datevalue,
     onChange: function onChange(date) {
       setOneWeekDays(['时间'].concat(_toConsumableArray(getweekDay(date))));
@@ -11641,6 +11645,7 @@ function Calendar(_ref, ref) {
       width: '250px'
     }
   }) : type == 'week' ? /*#__PURE__*/React__default['default'].createElement(_DatePicker__default['default'], {
+    allowClear: false,
     value: datevalue,
     style: {
       width: '250px'
@@ -11653,6 +11658,7 @@ function Calendar(_ref, ref) {
       setDatevalue(date);
     }
   }) : /*#__PURE__*/React__default['default'].createElement(_DatePicker__default['default'], {
+    allowClear: false,
     value: datevalue,
     picker: "month",
     onChange: function onChange(date) {
@@ -11687,13 +11693,20 @@ function Calendar(_ref, ref) {
       gridTemplateColumns: type == 'week' ? 'repeat(8, 1fr)' : '1fr 7fr'
     }
   }, days === null || days === void 0 ? void 0 : days.map(function (day, index) {
-    return /*#__PURE__*/React__default['default'].createElement("div", {
+    var _onCell;
+
+    var number = onCell && ((_onCell = onCell(days, day)) === null || _onCell === void 0 ? void 0 : _onCell.rowSpan) || 1;
+    return number ? /*#__PURE__*/React__default['default'].createElement("div", {
       onClick: function onClick() {
         return cellClick(day);
       },
+      style: {
+        gridRowStart: "span ".concat(number),
+        height: number * 100
+      },
       className: "day_container ".concat(day.isCurrentDay ? 'isCurrentDay' : '', " ").concat(day.isCurrentMonth ? 'isCurrentMonth' : ''),
       key: index
-    }, dateCellRender ? dateCellRender(day) : day.text);
+    }, dateCellRender ? dateCellRender(day) : day.text) : null;
   }))) : /*#__PURE__*/React__default['default'].createElement(React__default['default'].Fragment, null, /*#__PURE__*/React__default['default'].createElement("div", {
     className: "calendar_header_wrapper"
   }, weekLabelArray.map(function (weekLabel) {
@@ -12027,11 +12040,14 @@ function VideoPlayer(_ref, ref) {
       currentLayoutIndex = _useState2[0],
       setCurrentLayoutIndex = _useState2[1];
 
-  var _useState3 = React.useState(url),
+  var _useState3 = React.useState([]),
       _useState4 = _slicedToArray(_useState3, 2),
       urls = _useState4[0],
       setUrls = _useState4[1];
 
+  React.useEffect(function () {
+    setUrls(url);
+  }, [url]);
   var initPlayerIndex = allLayouts[layoutIndex || 0].span >= url.length ? url.length - 1 >= 0 ? url.length - 1 : 0 : allLayouts[layoutIndex || 0].span - 1;
 
   var _useState5 = React.useState(initPlayerIndex),

package/package.json

@@ -1,88 +1,88 @@
-{
-  "private": false,
-  "name": "wargerm",
-  "version": "0.5.33",
-  "scripts": {
-    "dev": "dumi dev",
-    "docs:build": "dumi build",
-    "docs:deploy": "gh-pages -d docs-dist",
-    "build": "father-build",
-    "deploy": "npm run docs:build && npm run docs:deploy",
-    "release": "npm run build && npm publish",
-    "prettier": "prettier --write \"**/*.{js,jsx,tsx,ts,less,md,json}\"",
-    "test": "umi-test",
-    "test:coverage": "umi-test --coverage"
-  },
-  "main": "dist/index.js",
-  "module": "dist/index.esm.js",
-  "unpkg": "dist/index.umd.min.js",
-  "typings": "dist/index.d.ts",
-  "author": "jinly2",
-  "license": "MIT",
-  "keywords": [
-    "React",
-    "Component"
-  ],
-  "gitHooks": {
-    "pre-commit": "lint-staged"
-  },
-  "repository": {
-    "type": "git",
-    "url": "http://code.eblssmart.com/platform/web/wargerm-components.git",
-    "branch": "main"
-  },
-  "files": [
-    "dist",
-    "es",
-    "lib",
-    "index.css"
-  ],
-  "lint-staged": {
-    "*.{js,jsx,less,md,json}": [
-      "prettier --write"
-    ],
-    "*.ts?(x)": [
-      "prettier --parser=typescript --write"
-    ]
-  },
-  "dependencies": {
-    "@ant-design/pro-table": "^2.79.0",
-    "animate.css": "^4.1.1",
-    "echarts": "^5.2.2",
-    "echarts-for-react": "^3.0.2",
-    "react-countup": "^6.0.0",
-    "react-dom": "^17.0.2",
-    "react-file-viewer": "^1.2.1",
-    "swiper": "^6.7.0",
-    "xgplayer": "^2.31.6",
-    "xgplayer-flv": "^2.5.1",
-    "xgplayer-flv.js": "^2.3.0",
-    "xgplayer-hls": "^2.5.2",
-    "xgplayer-hls.js": "^2.6.1"
-  },
-  "peerDependencies": {
-    "@ant-design/icons": ">=4.2.0",
-    "antd": ">=4.7.0",
-    "classnames": ">=2.2.0",
-    "echarts": "^5.2.2",
-    "echarts-for-react": "^3.0.2",
-    "lodash": ">=4.0.0",
-    "react": ">=17.0.0"
-  },
-  "devDependencies": {
-    "@ant-design/icons": "^4.6.4",
-    "@types/lodash": "^4.14.173",
-    "@types/react-dom": "^17.0.11",
-    "@umijs/test": "^3.0.5",
-    "antd": "^4.16.13",
-    "babel-plugin-import": "^1.13.3",
-    "classnames": "^2.3.1",
-    "dumi": "^1.1.31",
-    "father-build": "^1.19.1",
-    "gh-pages": "^3.0.0",
-    "lint-staged": "^10.0.7",
-    "prettier": "^1.19.1",
-    "react": "^16.12.0",
-    "yorkie": "^2.0.0"
-  }
-}
+{
+  "private": false,
+  "name": "wargerm",
+  "version": "0.5.35",
+  "scripts": {
+    "dev": "dumi dev",
+    "docs:build": "dumi build",
+    "docs:deploy": "gh-pages -d docs-dist",
+    "build": "father-build",
+    "deploy": "npm run docs:build && npm run docs:deploy",
+    "release": "npm run build && npm publish",
+    "prettier": "prettier --write \"**/*.{js,jsx,tsx,ts,less,md,json}\"",
+    "test": "umi-test",
+    "test:coverage": "umi-test --coverage"
+  },
+  "main": "dist/index.js",
+  "module": "dist/index.esm.js",
+  "unpkg": "dist/index.umd.min.js",
+  "typings": "dist/index.d.ts",
+  "author": "jinly2",
+  "license": "MIT",
+  "keywords": [
+    "React",
+    "Component"
+  ],
+  "gitHooks": {
+    "pre-commit": "lint-staged"
+  },
+  "repository": {
+    "type": "git",
+    "url": "http://code.eblssmart.com/platform/web/wargerm-components.git",
+    "branch": "main"
+  },
+  "files": [
+    "dist",
+    "es",
+    "lib",
+    "index.css"
+  ],
+  "lint-staged": {
+    "*.{js,jsx,less,md,json}": [
+      "prettier --write"
+    ],
+    "*.ts?(x)": [
+      "prettier --parser=typescript --write"
+    ]
+  },
+  "dependencies": {
+    "@ant-design/pro-table": "^2.79.0",
+    "animate.css": "^4.1.1",
+    "echarts": "^5.2.2",
+    "echarts-for-react": "^3.0.2",
+    "react-countup": "^6.0.0",
+    "react-dom": "^17.0.2",
+    "react-file-viewer": "^1.2.1",
+    "swiper": "^6.7.0",
+    "xgplayer": "^2.31.6",
+    "xgplayer-flv": "^2.5.1",
+    "xgplayer-flv.js": "^2.3.0",
+    "xgplayer-hls": "^2.5.2",
+    "xgplayer-hls.js": "^2.6.1"
+  },
+  "peerDependencies": {
+    "@ant-design/icons": ">=4.2.0",
+    "antd": ">=4.7.0",
+    "classnames": ">=2.2.0",
+    "echarts": "^5.2.2",
+    "echarts-for-react": "^3.0.2",
+    "lodash": ">=4.0.0",
+    "react": ">=17.0.0"
+  },
+  "devDependencies": {
+    "@ant-design/icons": "^4.6.4",
+    "@types/lodash": "^4.14.173",
+    "@types/react-dom": "^17.0.11",
+    "@umijs/test": "^3.0.5",
+    "antd": "^4.16.13",
+    "babel-plugin-import": "^1.13.3",
+    "classnames": "^2.3.1",
+    "dumi": "^1.1.31",
+    "father-build": "^1.19.1",
+    "gh-pages": "^3.0.0",
+    "lint-staged": "^10.0.7",
+    "prettier": "^1.19.1",
+    "react": "^16.12.0",
+    "yorkie": "^2.0.0"
+  }
+}