wargerm 0.7.30 → 0.7.31

package/dist/components/Calendar/example/demo3.d.ts

@@ -0,0 +1,2 @@
+/// <reference types="react" />
+export default function Tab4(): JSX.Element;

package/dist/components/Calendar/utils.d.ts

@@ -30,6 +30,10 @@ export declare function initCalendar(date?: Dayjs): {
     isCurrentMonth: boolean;
     isCurrentDay: boolean;
 }[];
+/**
+ * 初始化日历 自定义前缀
+ */
+export declare function initCustomPrefixCalendar(date?: Dayjs, content?: any): any[];
 /**
  * 初始化日历
  */

package/dist/components/TableEdit/example/demo3.d.ts

@@ -0,0 +1,5 @@
+/// <reference types="react" />
+declare function TableEdit({ autoMerge, }: {
+    autoMerge?: boolean | undefined;
+}): JSX.Element;
+export default TableEdit;

package/dist/index.esm.js

@@ -1,6 +1,6 @@
 import 'antd/dist/reset.css';
 import React, { useRef, useEffect, useMemo, useState, useCallback, useImperativeHandle, memo, forwardRef, createRef } from 'react';
-import { cloneDeep, uniqBy, isEmpty } from 'lodash-es';
+import { cloneDeep, uniqBy, chunk, isEmpty } from 'lodash-es';
 import { useSyncExternalStore } from 'use-sync-external-store/shim';
 import { Menu, Dropdown, Button, Input, Upload as Upload$1, Modal as Modal$2, message, InputNumber, DatePicker, Radio, Space, Checkbox, Select, Switch, Tooltip, TreeSelect as TreeSelect$1, Cascader, Form, Row, Col, Spin, Pagination, Breadcrumb, ConfigProvider, notification } from 'antd';
 import { createFromIconfontCN, PlusOutlined, CloseCircleOutlined, SearchOutlined, ReloadOutlined, EllipsisOutlined, ExclamationCircleOutlined, EyeOutlined, EditOutlined, DeleteOutlined, LeftOutlined, RightOutlined, CloseOutlined } from '@ant-design/icons';
@@ -7945,6 +7945,73 @@ function initCalendar(date) {
 
   return [].concat(_toConsumableArray(lastDays.reverse()), currentDays, nextDays);
 }
+/**
+ * 初始化日历 自定义前缀
+ */
+
+function initCustomPrefixCalendar(date, content) {
+  // 当前月天数
+  var totalDaysInMonth = getMonthDays(date); // 上个月天数
+
+  var totalDaysInLastMonth = getMonthDays(getLastMonth(date)); // 下个月开始日期
+
+  var nextFirstDate = 1;
+  var lastDays = [],
+      currentDays = [],
+      nextDays = []; // 当前月第一天是星期几(索引值)
+
+  /**
+   * 这里的索引值刚刚好是需要填充的上月的天数
+   */
+
+  var currentWeekDay = getWeekDays(date);
+
+  for (var i = 0, len = 42; i < len; i++) {
+    // 填充上个月的天数
+    if (i < currentWeekDay) {
+      // lastDays.push(totalDaysInLastMonth);
+      var daySting = dayjs(dayjs(date).subtract(1, 'month').format(YEAER_MONTH_FORMAT_EN) + '-' + totalDaysInLastMonth).format('YYYY-MM-DD');
+      lastDays.push({
+        date: daySting,
+        text: formatDayWithTwoWords(totalDaysInLastMonth),
+        isCurrentMonth: false,
+        isCurrentDay: dayjs().format('YYYY-MM-DD') == daySting
+      });
+      totalDaysInLastMonth--;
+    } // 填充下个月的天数
+    else if (i >= totalDaysInMonth + currentWeekDay) {
+      // nextDays.push(nextFirstDate);
+      var _daySting3 = dayjs(dayjs(date).add(1, 'month').format(YEAER_MONTH_FORMAT_EN) + '-' + nextFirstDate).format('YYYY-MM-DD');
+
+      nextDays.push({
+        date: _daySting3,
+        text: formatDayWithTwoWords(nextFirstDate),
+        isCurrentMonth: false,
+        isCurrentDay: dayjs().format('YYYY-MM-DD') == _daySting3
+      });
+      nextFirstDate++;
+    } // 填充当前月天数
+    else {
+      // currentDays.push(i - currentWeekDay + 1);
+      var _daySting4 = dayjs(dayjs(date).format(YEAER_MONTH_FORMAT_EN) + '-' + (i - currentWeekDay + 1)).format('YYYY-MM-DD');
+
+      currentDays.push({
+        date: _daySting4,
+        text: formatDayWithTwoWords(i - currentWeekDay + 1),
+        isCurrentMonth: true,
+        isCurrentDay: dayjs().format('YYYY-MM-DD') == _daySting4
+      });
+    }
+  } // 上个月需要倒序显示
+
+
+  var dayArr = [].concat(_toConsumableArray(lastDays.reverse()), currentDays, nextDays);
+  return chunk(dayArr, 7).map(function (day) {
+    return [{
+      content: content
+    }].concat(_toConsumableArray(day));
+  }).flat();
+}
 /**
  * 初始化日历
  */
@@ -7986,7 +8053,8 @@ function Calendar(_ref, ref) {
       onCell = _ref.onCell,
       calendarBodyClassName = _ref.calendarBodyClassName,
       hiddenWeekLabel = _ref.hiddenWeekLabel,
-      dateString = _ref.dateString;
+      dateString = _ref.dateString,
+      customPrefix = _ref.customPrefix;
 
   var _useState = useState(initCalendar()),
       _useState2 = _slicedToArray(_useState, 2),
@@ -8003,7 +8071,8 @@ function Calendar(_ref, ref) {
       oneWeekDays = _useState6[0],
       setOneWeekDays = _useState6[1];
 
-  var weekLabelArray = ['周一', '周二', '周三', '周四', '周五', '周六', '周日'];
+  var customHeader = customPrefix ? [customPrefix.header] : [];
+  var weekLabelArray = [].concat(customHeader, ['周一', '周二', '周三', '周四', '周五', '周六', '周日']);
 
   var getweekDay = function getweekDay(date) {
     var index = dayjs(date).day();
@@ -8020,14 +8089,14 @@ function Calendar(_ref, ref) {
       if (type == 'day') {
         setOneWeekDays(['时间'].concat(_toConsumableArray(getweekDay(datevalue))));
       } else {
-        setOneWeekDays(getWeekList(datevalue));
+        setOneWeekDays(_toConsumableArray(getWeekList(datevalue)));
       }
 
       setDays(initWeekCalendar(type, datevalue));
     } else {
-      setDays(initCalendar(dateString || datevalue));
+      setDays((customPrefix === null || customPrefix === void 0 ? void 0 : customPrefix.content) ? initCustomPrefixCalendar(dateString || datevalue, customPrefix === null || customPrefix === void 0 ? void 0 : customPrefix.content) : initCalendar(dateString || datevalue));
     }
-  }, [type, datevalue, dateString]);
+  }, [type, datevalue, dateString, customPrefix]);
   useEffect(function () {
     setDatevalue(value || dayjs());
   }, [value]);
@@ -8172,14 +8241,20 @@ function Calendar(_ref, ref) {
       key: index
     }, dateCellRender ? dateCellRender(day) : day.text) : null;
   }))) : /*#__PURE__*/React.createElement(React.Fragment, null, !hiddenWeekLabel && /*#__PURE__*/React.createElement("div", {
-    className: "calendar_header_wrapper"
+    className: "calendar_header_wrapper",
+    style: {
+      gridTemplateColumns: "repeat(".concat(weekLabelArray.length, ", 1fr)")
+    }
   }, weekLabelArray.map(function (weekLabel) {
     return /*#__PURE__*/React.createElement("div", {
       key: weekLabel,
       className: "flex ai-c jc-c"
     }, weekLabel);
   })), /*#__PURE__*/React.createElement("div", {
-    className: "content_wrapper ".concat(calendarBodyClassName)
+    className: "content_wrapper ".concat(calendarBodyClassName),
+    style: {
+      gridTemplateColumns: "repeat(".concat(weekLabelArray.length, ", 1fr)")
+    }
   }, days === null || days === void 0 ? void 0 : days.map(function (day, index) {
     return /*#__PURE__*/React.createElement("div", {
       onClick: function onClick() {
@@ -8187,7 +8262,7 @@ function Calendar(_ref, ref) {
       },
       className: "day_container ".concat(day.isCurrentDay ? 'isCurrentDay' : '', " ").concat(day.isCurrentMonth ? 'isCurrentMonth' : ''),
       key: index
-    }, dateCellRender ? dateCellRender(day) : day.text);
+    }, (day === null || day === void 0 ? void 0 : day.content) ? day.content : dateCellRender ? dateCellRender(day) : day.text);
   })))));
 }
 

package/dist/index.js

@@ -7989,6 +7989,73 @@ function initCalendar(date) {
 
   return [].concat(_toConsumableArray(lastDays.reverse()), currentDays, nextDays);
 }
+/**
+ * 初始化日历 自定义前缀
+ */
+
+function initCustomPrefixCalendar(date, content) {
+  // 当前月天数
+  var totalDaysInMonth = getMonthDays(date); // 上个月天数
+
+  var totalDaysInLastMonth = getMonthDays(getLastMonth(date)); // 下个月开始日期
+
+  var nextFirstDate = 1;
+  var lastDays = [],
+      currentDays = [],
+      nextDays = []; // 当前月第一天是星期几(索引值)
+
+  /**
+   * 这里的索引值刚刚好是需要填充的上月的天数
+   */
+
+  var currentWeekDay = getWeekDays(date);
+
+  for (var i = 0, len = 42; i < len; i++) {
+    // 填充上个月的天数
+    if (i < currentWeekDay) {
+      // lastDays.push(totalDaysInLastMonth);
+      var daySting = dayjs__default['default'](dayjs__default['default'](date).subtract(1, 'month').format(YEAER_MONTH_FORMAT_EN) + '-' + totalDaysInLastMonth).format('YYYY-MM-DD');
+      lastDays.push({
+        date: daySting,
+        text: formatDayWithTwoWords(totalDaysInLastMonth),
+        isCurrentMonth: false,
+        isCurrentDay: dayjs__default['default']().format('YYYY-MM-DD') == daySting
+      });
+      totalDaysInLastMonth--;
+    } // 填充下个月的天数
+    else if (i >= totalDaysInMonth + currentWeekDay) {
+      // nextDays.push(nextFirstDate);
+      var _daySting3 = dayjs__default['default'](dayjs__default['default'](date).add(1, 'month').format(YEAER_MONTH_FORMAT_EN) + '-' + nextFirstDate).format('YYYY-MM-DD');
+
+      nextDays.push({
+        date: _daySting3,
+        text: formatDayWithTwoWords(nextFirstDate),
+        isCurrentMonth: false,
+        isCurrentDay: dayjs__default['default']().format('YYYY-MM-DD') == _daySting3
+      });
+      nextFirstDate++;
+    } // 填充当前月天数
+    else {
+      // currentDays.push(i - currentWeekDay + 1);
+      var _daySting4 = dayjs__default['default'](dayjs__default['default'](date).format(YEAER_MONTH_FORMAT_EN) + '-' + (i - currentWeekDay + 1)).format('YYYY-MM-DD');
+
+      currentDays.push({
+        date: _daySting4,
+        text: formatDayWithTwoWords(i - currentWeekDay + 1),
+        isCurrentMonth: true,
+        isCurrentDay: dayjs__default['default']().format('YYYY-MM-DD') == _daySting4
+      });
+    }
+  } // 上个月需要倒序显示
+
+
+  var dayArr = [].concat(_toConsumableArray(lastDays.reverse()), currentDays, nextDays);
+  return lodashEs.chunk(dayArr, 7).map(function (day) {
+    return [{
+      content: content
+    }].concat(_toConsumableArray(day));
+  }).flat();
+}
 /**
  * 初始化日历
  */
@@ -8030,7 +8097,8 @@ function Calendar(_ref, ref) {
       onCell = _ref.onCell,
       calendarBodyClassName = _ref.calendarBodyClassName,
       hiddenWeekLabel = _ref.hiddenWeekLabel,
-      dateString = _ref.dateString;
+      dateString = _ref.dateString,
+      customPrefix = _ref.customPrefix;
 
   var _useState = React.useState(initCalendar()),
       _useState2 = _slicedToArray(_useState, 2),
@@ -8047,7 +8115,8 @@ function Calendar(_ref, ref) {
       oneWeekDays = _useState6[0],
       setOneWeekDays = _useState6[1];
 
-  var weekLabelArray = ['周一', '周二', '周三', '周四', '周五', '周六', '周日'];
+  var customHeader = customPrefix ? [customPrefix.header] : [];
+  var weekLabelArray = [].concat(customHeader, ['周一', '周二', '周三', '周四', '周五', '周六', '周日']);
 
   var getweekDay = function getweekDay(date) {
     var index = dayjs__default['default'](date).day();
@@ -8064,14 +8133,14 @@ function Calendar(_ref, ref) {
       if (type == 'day') {
         setOneWeekDays(['时间'].concat(_toConsumableArray(getweekDay(datevalue))));
       } else {
-        setOneWeekDays(getWeekList(datevalue));
+        setOneWeekDays(_toConsumableArray(getWeekList(datevalue)));
       }
 
       setDays(initWeekCalendar(type, datevalue));
     } else {
-      setDays(initCalendar(dateString || datevalue));
+      setDays((customPrefix === null || customPrefix === void 0 ? void 0 : customPrefix.content) ? initCustomPrefixCalendar(dateString || datevalue, customPrefix === null || customPrefix === void 0 ? void 0 : customPrefix.content) : initCalendar(dateString || datevalue));
     }
-  }, [type, datevalue, dateString]);
+  }, [type, datevalue, dateString, customPrefix]);
   React.useEffect(function () {
     setDatevalue(value || dayjs__default['default']());
   }, [value]);
@@ -8216,14 +8285,20 @@ function Calendar(_ref, ref) {
       key: index
     }, dateCellRender ? dateCellRender(day) : day.text) : null;
   }))) : /*#__PURE__*/React__default['default'].createElement(React__default['default'].Fragment, null, !hiddenWeekLabel && /*#__PURE__*/React__default['default'].createElement("div", {
-    className: "calendar_header_wrapper"
+    className: "calendar_header_wrapper",
+    style: {
+      gridTemplateColumns: "repeat(".concat(weekLabelArray.length, ", 1fr)")
+    }
   }, weekLabelArray.map(function (weekLabel) {
     return /*#__PURE__*/React__default['default'].createElement("div", {
       key: weekLabel,
       className: "flex ai-c jc-c"
     }, weekLabel);
   })), /*#__PURE__*/React__default['default'].createElement("div", {
-    className: "content_wrapper ".concat(calendarBodyClassName)
+    className: "content_wrapper ".concat(calendarBodyClassName),
+    style: {
+      gridTemplateColumns: "repeat(".concat(weekLabelArray.length, ", 1fr)")
+    }
   }, days === null || days === void 0 ? void 0 : days.map(function (day, index) {
     return /*#__PURE__*/React__default['default'].createElement("div", {
       onClick: function onClick() {
@@ -8231,7 +8306,7 @@ function Calendar(_ref, ref) {
       },
       className: "day_container ".concat(day.isCurrentDay ? 'isCurrentDay' : '', " ").concat(day.isCurrentMonth ? 'isCurrentMonth' : ''),
       key: index
-    }, dateCellRender ? dateCellRender(day) : day.text);
+    }, (day === null || day === void 0 ? void 0 : day.content) ? day.content : dateCellRender ? dateCellRender(day) : day.text);
   })))));
 }
 

package/package.json

@@ -1,93 +1,93 @@
-{
-  "private": false,
-  "name": "wargerm",
-  "version": "0.7.30",
-  "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": "^3.3.1",
-    "animate.css": "^4.1.1",
-    "dayjs": "^1.11.7",
-    "echarts": "^5.2.2",
-    "echarts-for-react": "^3.0.2",
-    "lodash-es": "^4.17.21",
-    "react-countup": "^6.0.0",
-    "react-dom": "^17.0.2",
-    "react-file-viewer": "^1.2.1",
-    "swiper": "^6.7.0",
-    "use-sync-external-store": "^1.2.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-es": ">=4.17.21",
-    "react": ">=17.0.0"
-  },
-  "devDependencies": {
-    "@ant-design/icons": "^4.6.4",
-    "@types/lodash-es": "^4.17.6",
-    "@types/react-dom": "^17.0.11",
-    "@types/use-sync-external-store": "^0.0.3",
-    "@umijs/test": "^3.0.5",
-    "antd": "^5.2.2",
-    "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",
-    "react-dnd": "^16.0.1",
-    "react-dnd-html5-backend": "^16.0.1",
-    "yorkie": "^2.0.0"
-  }
+{
+  "private": false,
+  "name": "wargerm",
+  "version": "0.7.31",
+  "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": "^3.3.1",
+    "animate.css": "^4.1.1",
+    "dayjs": "^1.11.7",
+    "echarts": "^5.2.2",
+    "echarts-for-react": "^3.0.2",
+    "lodash-es": "^4.17.21",
+    "react-countup": "^6.0.0",
+    "react-dom": "^17.0.2",
+    "react-file-viewer": "^1.2.1",
+    "swiper": "^6.7.0",
+    "use-sync-external-store": "^1.2.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-es": ">=4.17.21",
+    "react": ">=17.0.0"
+  },
+  "devDependencies": {
+    "@ant-design/icons": "^4.6.4",
+    "@types/lodash-es": "^4.17.6",
+    "@types/react-dom": "^17.0.11",
+    "@types/use-sync-external-store": "^0.0.3",
+    "@umijs/test": "^3.0.5",
+    "antd": "^5.2.2",
+    "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",
+    "react-dnd": "^16.0.1",
+    "react-dnd-html5-backend": "^16.0.1",
+    "yorkie": "^2.0.0"
+  }
 }