@faasjs/ant-design 0.0.2-beta.371 → 0.0.2-beta.372

package/dist/index.d.ts

@@ -1,4 +1,4 @@
-import * as antd_es_calendar_generateCalendar from 'antd/es/calendar/generateCalendar';
+import * as antd_es_calendar_generateCalendar_js from 'antd/es/calendar/generateCalendar.js';
 import { Dayjs } from 'dayjs';
 import { CalendarProps as CalendarProps$1, DescriptionsProps, DrawerProps as DrawerProps$1, FormItemProps as FormItemProps$1, InputProps, InputNumberProps, SwitchProps, DatePickerProps as DatePickerProps$1, TimePickerProps as TimePickerProps$1, SelectProps, FormProps as FormProps$1, ModalProps as ModalProps$1, TableColumnProps, TablePaginationConfig, TableProps as TableProps$1 } from 'antd';
 export { Drawer, Modal } from 'antd';
@@ -33,7 +33,7 @@ declare type BlankProps = {
 declare function Blank(options?: BlankProps): any;
 
 declare type CalendarProps = CalendarProps$1<Dayjs>;
-declare const Calendar: (props: antd_es_calendar_generateCalendar.CalendarProps<Dayjs>) => JSX.Element;
+declare const Calendar: (props: antd_es_calendar_generateCalendar_js.CalendarProps<Dayjs>) => JSX.Element;
 
 declare type FaasState = {
     common: {

package/dist/index.js

@@ -112,180 +112,11 @@ function Blank(options) {
   }, (options == null ? void 0 : options.text) || config.Blank.text) : options.value;
 }
 
-// ../../node_modules/rc-picker/es/generate/dayjs.js
-var import_dayjs = __toESM(require("dayjs"));
-
-// ../../node_modules/rc-util/es/warning.js
-var warned = {};
-function note(valid, message) {
-  if (process.env.NODE_ENV !== "production" && !valid && console !== void 0) {
-    console.warn("Note: ".concat(message));
-  }
-}
-function call(method, valid, message) {
-  if (!valid && !warned[message]) {
-    method(false, message);
-    warned[message] = true;
-  }
-}
-function noteOnce(valid, message) {
-  call(note, valid, message);
-}
-
-// ../../node_modules/rc-picker/es/generate/dayjs.js
-var import_weekday = __toESM(require("dayjs/plugin/weekday"));
-var import_localeData = __toESM(require("dayjs/plugin/localeData"));
-var import_weekOfYear = __toESM(require("dayjs/plugin/weekOfYear"));
-var import_weekYear = __toESM(require("dayjs/plugin/weekYear"));
-var import_advancedFormat = __toESM(require("dayjs/plugin/advancedFormat"));
-var import_customParseFormat = __toESM(require("dayjs/plugin/customParseFormat"));
-import_dayjs.default.extend(import_customParseFormat.default);
-import_dayjs.default.extend(import_advancedFormat.default);
-import_dayjs.default.extend(import_weekday.default);
-import_dayjs.default.extend(import_localeData.default);
-import_dayjs.default.extend(import_weekOfYear.default);
-import_dayjs.default.extend(import_weekYear.default);
-import_dayjs.default.extend(function(o, c) {
-  var proto = c.prototype;
-  var oldFormat = proto.format;
-  proto.format = function f(formatStr) {
-    var str = (formatStr || "").replace("Wo", "wo");
-    return oldFormat.bind(this)(str);
-  };
-});
-var localeMap = {
-  en_GB: "en-gb",
-  en_US: "en",
-  zh_CN: "zh-cn",
-  zh_TW: "zh-tw"
-};
-var parseLocale = function parseLocale2(locale) {
-  var mapLocale = localeMap[locale];
-  return mapLocale || locale.split("_")[0];
-};
-var parseNoMatchNotice = function parseNoMatchNotice2() {
-  noteOnce(false, "Not match any format. Please help to fire a issue about this.");
-};
-var generateConfig = {
-  getNow: function getNow() {
-    return (0, import_dayjs.default)();
-  },
-  getFixedDate: function getFixedDate(string) {
-    return (0, import_dayjs.default)(string, "YYYY-MM-DD");
-  },
-  getEndDate: function getEndDate(date) {
-    return date.endOf("month");
-  },
-  getWeekDay: function getWeekDay(date) {
-    var clone = date.locale("en");
-    return clone.weekday() + clone.localeData().firstDayOfWeek();
-  },
-  getYear: function getYear(date) {
-    return date.year();
-  },
-  getMonth: function getMonth(date) {
-    return date.month();
-  },
-  getDate: function getDate(date) {
-    return date.date();
-  },
-  getHour: function getHour(date) {
-    return date.hour();
-  },
-  getMinute: function getMinute(date) {
-    return date.minute();
-  },
-  getSecond: function getSecond(date) {
-    return date.second();
-  },
-  addYear: function addYear(date, diff) {
-    return date.add(diff, "year");
-  },
-  addMonth: function addMonth(date, diff) {
-    return date.add(diff, "month");
-  },
-  addDate: function addDate(date, diff) {
-    return date.add(diff, "day");
-  },
-  setYear: function setYear(date, year) {
-    return date.year(year);
-  },
-  setMonth: function setMonth(date, month) {
-    return date.month(month);
-  },
-  setDate: function setDate(date, num) {
-    return date.date(num);
-  },
-  setHour: function setHour(date, hour) {
-    return date.hour(hour);
-  },
-  setMinute: function setMinute(date, minute) {
-    return date.minute(minute);
-  },
-  setSecond: function setSecond(date, second) {
-    return date.second(second);
-  },
-  isAfter: function isAfter(date1, date2) {
-    return date1.isAfter(date2);
-  },
-  isValidate: function isValidate(date) {
-    return date.isValid();
-  },
-  locale: {
-    getWeekFirstDay: function getWeekFirstDay(locale) {
-      return (0, import_dayjs.default)().locale(parseLocale(locale)).localeData().firstDayOfWeek();
-    },
-    getWeekFirstDate: function getWeekFirstDate(locale, date) {
-      return date.locale(parseLocale(locale)).weekday(0);
-    },
-    getWeek: function getWeek(locale, date) {
-      return date.locale(parseLocale(locale)).week();
-    },
-    getShortWeekDays: function getShortWeekDays(locale) {
-      return (0, import_dayjs.default)().locale(parseLocale(locale)).localeData().weekdaysMin();
-    },
-    getShortMonths: function getShortMonths(locale) {
-      return (0, import_dayjs.default)().locale(parseLocale(locale)).localeData().monthsShort();
-    },
-    format: function format(locale, date, _format) {
-      return date.locale(parseLocale(locale)).format(_format);
-    },
-    parse: function parse(locale, text, formats) {
-      var localeStr = parseLocale(locale);
-      for (var i = 0; i < formats.length; i += 1) {
-        var format2 = formats[i];
-        var formatText = text;
-        if (format2.includes("wo") || format2.includes("Wo")) {
-          var year = formatText.split("-")[0];
-          var weekStr = formatText.split("-")[1];
-          var firstWeek = (0, import_dayjs.default)(year, "YYYY").startOf("year").locale(localeStr);
-          for (var j = 0; j <= 52; j += 1) {
-            var nextWeek = firstWeek.add(j, "week");
-            if (nextWeek.format("Wo") === weekStr) {
-              return nextWeek;
-            }
-          }
-          parseNoMatchNotice();
-          return null;
-        }
-        var date = (0, import_dayjs.default)(formatText, format2).locale(localeStr);
-        if (date.isValid()) {
-          return date;
-        }
-      }
-      if (text) {
-        parseNoMatchNotice();
-      }
-      return null;
-    }
-  }
-};
-var dayjs_default = generateConfig;
-
 // src/Calendar.tsx
-var import_generateCalendar = __toESM(require("antd/es/calendar/generateCalendar"));
+var import_dayjs = __toESM(require("rc-picker/es/generate/dayjs.js"));
+var import_generateCalendar = __toESM(require("antd/es/calendar/generateCalendar.js"));
 var import_style = require("antd/es/calendar/style");
-var Calendar = (0, import_generateCalendar.default)(dayjs_default);
+var Calendar = (0, import_generateCalendar.default)(import_dayjs.default);
 
 // src/data.ts
 var import_lodash2 = require("lodash");
@@ -299,16 +130,17 @@ function transferOptions(options) {
 }
 
 // src/DatePicker.tsx
-var import_generatePicker = __toESM(require("antd/es/date-picker/generatePicker"));
-var import_style2 = require("antd/es/date-picker/style");
-var DatePicker = (0, import_generatePicker.default)(dayjs_default);
+var import_dayjs2 = __toESM(require("rc-picker/es/generate/dayjs.js"));
+var import_generatePicker = __toESM(require("antd/es/date-picker/generatePicker/index.js"));
+var import_style2 = require("antd/es/date-picker/style/index.js");
+var DatePicker = (0, import_generatePicker.default)(import_dayjs2.default);
 
 // src/Description.tsx
 var import_icons = require("@ant-design/icons");
 var import_antd2 = require("antd");
 var import_lodash3 = require("lodash");
 var import_react3 = require("react");
-var import_dayjs4 = __toESM(require("dayjs"));
+var import_dayjs3 = __toESM(require("dayjs"));
 var import_react4 = require("@faasjs/react");
 function DescriptionItemContent(props) {
   const [computedProps, setComputedProps] = (0, import_react3.useState)();
@@ -375,9 +207,9 @@ function DescriptionItemContent(props) {
         }
       });
     case "time":
-      return typeof computedProps.value === "number" && computedProps.value.toString().length === 10 ? import_dayjs4.default.unix(computedProps.value).format("YYYY-MM-DD HH:mm:ss") : (0, import_dayjs4.default)(computedProps.value).format("YYYY-MM-DD HH:mm:ss");
+      return typeof computedProps.value === "number" && computedProps.value.toString().length === 10 ? import_dayjs3.default.unix(computedProps.value).format("YYYY-MM-DD HH:mm:ss") : (0, import_dayjs3.default)(computedProps.value).format("YYYY-MM-DD HH:mm:ss");
     case "date":
-      return typeof computedProps.value === "number" && computedProps.value.toString().length === 10 ? import_dayjs4.default.unix(computedProps.value).format("YYYY-MM-DD") : (0, import_dayjs4.default)(computedProps.value).format("YYYY-MM-DD");
+      return typeof computedProps.value === "number" && computedProps.value.toString().length === 10 ? import_dayjs3.default.unix(computedProps.value).format("YYYY-MM-DD") : (0, import_dayjs3.default)(computedProps.value).format("YYYY-MM-DD");
     default:
       return computedProps.value;
   }
@@ -691,7 +523,7 @@ function Routes(props) {
 // src/Table.tsx
 var import_react11 = require("react");
 var import_antd8 = require("antd");
-var import_dayjs5 = __toESM(require("dayjs"));
+var import_dayjs4 = __toESM(require("dayjs"));
 var import_icons3 = require("@ant-design/icons");
 var import_lodash5 = require("lodash");
 var import_react12 = require("@faasjs/react");
@@ -719,7 +551,7 @@ function processValue(item, value) {
     if (["date", "time"].includes(item.type)) {
       if (typeof value === "number" && value.toString().length === 10)
         value = value * 1e3;
-      value = (0, import_dayjs5.default)(value).format(dayjsFormat);
+      value = (0, import_dayjs4.default)(value).format(dayjsFormat);
     }
   }
   return value;
@@ -838,12 +670,12 @@ function Table(props) {
         case "date":
           item.render = (value) => processValue(item, value);
           if (!item.onFilter)
-            item.onFilter = (value, row) => (0, import_dayjs5.default)(row[item.id]).isSame((0, import_dayjs5.default)(value));
+            item.onFilter = (value, row) => (0, import_dayjs4.default)(row[item.id]).isSame((0, import_dayjs4.default)(value));
           break;
         case "time":
           item.render = (value) => processValue(item, value);
           if (!item.onFilter)
-            item.onFilter = (value, row) => (0, import_dayjs5.default)(row[item.id]).isSame((0, import_dayjs5.default)(value));
+            item.onFilter = (value, row) => (0, import_dayjs4.default)(row[item.id]).isSame((0, import_dayjs4.default)(value));
           break;
         default:
           item.render = (value) => processValue(item, value);

package/dist/index.mjs

@@ -65,180 +65,11 @@ function Blank(options) {
   }, (options == null ? void 0 : options.text) || config.Blank.text) : options.value;
 }
 
-// ../../node_modules/rc-picker/es/generate/dayjs.js
-import dayjs from "dayjs";
-
-// ../../node_modules/rc-util/es/warning.js
-var warned = {};
-function note(valid, message) {
-  if (process.env.NODE_ENV !== "production" && !valid && console !== void 0) {
-    console.warn("Note: ".concat(message));
-  }
-}
-function call(method, valid, message) {
-  if (!valid && !warned[message]) {
-    method(false, message);
-    warned[message] = true;
-  }
-}
-function noteOnce(valid, message) {
-  call(note, valid, message);
-}
-
-// ../../node_modules/rc-picker/es/generate/dayjs.js
-import weekday from "dayjs/plugin/weekday";
-import localeData from "dayjs/plugin/localeData";
-import weekOfYear from "dayjs/plugin/weekOfYear";
-import weekYear from "dayjs/plugin/weekYear";
-import advancedFormat from "dayjs/plugin/advancedFormat";
-import customParseFormat from "dayjs/plugin/customParseFormat";
-dayjs.extend(customParseFormat);
-dayjs.extend(advancedFormat);
-dayjs.extend(weekday);
-dayjs.extend(localeData);
-dayjs.extend(weekOfYear);
-dayjs.extend(weekYear);
-dayjs.extend(function(o, c) {
-  var proto = c.prototype;
-  var oldFormat = proto.format;
-  proto.format = function f(formatStr) {
-    var str = (formatStr || "").replace("Wo", "wo");
-    return oldFormat.bind(this)(str);
-  };
-});
-var localeMap = {
-  en_GB: "en-gb",
-  en_US: "en",
-  zh_CN: "zh-cn",
-  zh_TW: "zh-tw"
-};
-var parseLocale = function parseLocale2(locale) {
-  var mapLocale = localeMap[locale];
-  return mapLocale || locale.split("_")[0];
-};
-var parseNoMatchNotice = function parseNoMatchNotice2() {
-  noteOnce(false, "Not match any format. Please help to fire a issue about this.");
-};
-var generateConfig = {
-  getNow: function getNow() {
-    return dayjs();
-  },
-  getFixedDate: function getFixedDate(string) {
-    return dayjs(string, "YYYY-MM-DD");
-  },
-  getEndDate: function getEndDate(date) {
-    return date.endOf("month");
-  },
-  getWeekDay: function getWeekDay(date) {
-    var clone = date.locale("en");
-    return clone.weekday() + clone.localeData().firstDayOfWeek();
-  },
-  getYear: function getYear(date) {
-    return date.year();
-  },
-  getMonth: function getMonth(date) {
-    return date.month();
-  },
-  getDate: function getDate(date) {
-    return date.date();
-  },
-  getHour: function getHour(date) {
-    return date.hour();
-  },
-  getMinute: function getMinute(date) {
-    return date.minute();
-  },
-  getSecond: function getSecond(date) {
-    return date.second();
-  },
-  addYear: function addYear(date, diff) {
-    return date.add(diff, "year");
-  },
-  addMonth: function addMonth(date, diff) {
-    return date.add(diff, "month");
-  },
-  addDate: function addDate(date, diff) {
-    return date.add(diff, "day");
-  },
-  setYear: function setYear(date, year) {
-    return date.year(year);
-  },
-  setMonth: function setMonth(date, month) {
-    return date.month(month);
-  },
-  setDate: function setDate(date, num) {
-    return date.date(num);
-  },
-  setHour: function setHour(date, hour) {
-    return date.hour(hour);
-  },
-  setMinute: function setMinute(date, minute) {
-    return date.minute(minute);
-  },
-  setSecond: function setSecond(date, second) {
-    return date.second(second);
-  },
-  isAfter: function isAfter(date1, date2) {
-    return date1.isAfter(date2);
-  },
-  isValidate: function isValidate(date) {
-    return date.isValid();
-  },
-  locale: {
-    getWeekFirstDay: function getWeekFirstDay(locale) {
-      return dayjs().locale(parseLocale(locale)).localeData().firstDayOfWeek();
-    },
-    getWeekFirstDate: function getWeekFirstDate(locale, date) {
-      return date.locale(parseLocale(locale)).weekday(0);
-    },
-    getWeek: function getWeek(locale, date) {
-      return date.locale(parseLocale(locale)).week();
-    },
-    getShortWeekDays: function getShortWeekDays(locale) {
-      return dayjs().locale(parseLocale(locale)).localeData().weekdaysMin();
-    },
-    getShortMonths: function getShortMonths(locale) {
-      return dayjs().locale(parseLocale(locale)).localeData().monthsShort();
-    },
-    format: function format(locale, date, _format) {
-      return date.locale(parseLocale(locale)).format(_format);
-    },
-    parse: function parse(locale, text, formats) {
-      var localeStr = parseLocale(locale);
-      for (var i = 0; i < formats.length; i += 1) {
-        var format2 = formats[i];
-        var formatText = text;
-        if (format2.includes("wo") || format2.includes("Wo")) {
-          var year = formatText.split("-")[0];
-          var weekStr = formatText.split("-")[1];
-          var firstWeek = dayjs(year, "YYYY").startOf("year").locale(localeStr);
-          for (var j = 0; j <= 52; j += 1) {
-            var nextWeek = firstWeek.add(j, "week");
-            if (nextWeek.format("Wo") === weekStr) {
-              return nextWeek;
-            }
-          }
-          parseNoMatchNotice();
-          return null;
-        }
-        var date = dayjs(formatText, format2).locale(localeStr);
-        if (date.isValid()) {
-          return date;
-        }
-      }
-      if (text) {
-        parseNoMatchNotice();
-      }
-      return null;
-    }
-  }
-};
-var dayjs_default = generateConfig;
-
 // src/Calendar.tsx
-import generateCalendar from "antd/es/calendar/generateCalendar";
+import dayjsGenerateConfig from "rc-picker/es/generate/dayjs.js";
+import generateCalendar from "antd/es/calendar/generateCalendar.js";
 import "antd/es/calendar/style";
-var Calendar = generateCalendar(dayjs_default);
+var Calendar = generateCalendar(dayjsGenerateConfig);
 
 // src/data.ts
 import { upperFirst } from "lodash";
@@ -252,9 +83,10 @@ function transferOptions(options) {
 }
 
 // src/DatePicker.tsx
-import generatePicker from "antd/es/date-picker/generatePicker";
-import "antd/es/date-picker/style";
-var DatePicker = generatePicker(dayjs_default);
+import dayjsGenerateConfig2 from "rc-picker/es/generate/dayjs.js";
+import generatePicker from "antd/es/date-picker/generatePicker/index.js";
+import "antd/es/date-picker/style/index.js";
+var DatePicker = generatePicker(dayjsGenerateConfig2);
 
 // src/Description.tsx
 import { CheckOutlined, CloseOutlined } from "@ant-design/icons";
@@ -268,7 +100,7 @@ import {
   useEffect as useEffect2,
   useState
 } from "react";
-import dayjs2 from "dayjs";
+import dayjs from "dayjs";
 import { FaasDataWrapper } from "@faasjs/react";
 function DescriptionItemContent(props) {
   const [computedProps, setComputedProps] = useState();
@@ -335,9 +167,9 @@ function DescriptionItemContent(props) {
         }
       });
     case "time":
-      return typeof computedProps.value === "number" && computedProps.value.toString().length === 10 ? dayjs2.unix(computedProps.value).format("YYYY-MM-DD HH:mm:ss") : dayjs2(computedProps.value).format("YYYY-MM-DD HH:mm:ss");
+      return typeof computedProps.value === "number" && computedProps.value.toString().length === 10 ? dayjs.unix(computedProps.value).format("YYYY-MM-DD HH:mm:ss") : dayjs(computedProps.value).format("YYYY-MM-DD HH:mm:ss");
     case "date":
-      return typeof computedProps.value === "number" && computedProps.value.toString().length === 10 ? dayjs2.unix(computedProps.value).format("YYYY-MM-DD") : dayjs2(computedProps.value).format("YYYY-MM-DD");
+      return typeof computedProps.value === "number" && computedProps.value.toString().length === 10 ? dayjs.unix(computedProps.value).format("YYYY-MM-DD") : dayjs(computedProps.value).format("YYYY-MM-DD");
     default:
       return computedProps.value;
   }
@@ -676,7 +508,7 @@ import {
   Radio,
   Skeleton as Skeleton3
 } from "antd";
-import dayjs3 from "dayjs";
+import dayjs2 from "dayjs";
 import { CheckOutlined as CheckOutlined2, CloseOutlined as CloseOutlined2 } from "@ant-design/icons";
 import { isNil as isNil2, upperFirst as upperFirst4 } from "lodash";
 import { FaasDataWrapper as FaasDataWrapper2 } from "@faasjs/react";
@@ -704,7 +536,7 @@ function processValue(item, value) {
     if (["date", "time"].includes(item.type)) {
       if (typeof value === "number" && value.toString().length === 10)
         value = value * 1e3;
-      value = dayjs3(value).format(dayjsFormat);
+      value = dayjs2(value).format(dayjsFormat);
     }
   }
   return value;
@@ -823,12 +655,12 @@ function Table(props) {
         case "date":
           item.render = (value) => processValue(item, value);
           if (!item.onFilter)
-            item.onFilter = (value, row) => dayjs3(row[item.id]).isSame(dayjs3(value));
+            item.onFilter = (value, row) => dayjs2(row[item.id]).isSame(dayjs2(value));
           break;
         case "time":
           item.render = (value) => processValue(item, value);
           if (!item.onFilter)
-            item.onFilter = (value, row) => dayjs3(row[item.id]).isSame(dayjs3(value));
+            item.onFilter = (value, row) => dayjs2(row[item.id]).isSame(dayjs2(value));
           break;
         default:
           item.render = (value) => processValue(item, value);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@faasjs/ant-design",
-  "version": "0.0.2-beta.371",
+  "version": "0.0.2-beta.372",
   "license": "MIT",
   "main": "dist/index.js",
   "module": "dist/index.mjs",
@@ -16,7 +16,7 @@
   },
   "funding": "https://github.com/sponsors/faasjs",
   "scripts": {
-    "build": "tsup src/index.ts --format esm,cjs --inject react-shim.js",
+    "build": "tsup-node src/index.ts --format esm,cjs --inject react-shim.js",
     "build:types": "tsup-node src/index.ts --dts-only"
   },
   "files": [
@@ -28,7 +28,7 @@
     "lodash": "*",
     "react": "*",
     "react-dom": "*",
-    "@faasjs/react": "^0.0.2-beta.371",
+    "@faasjs/react": "^0.0.2-beta.372",
     "react-use": "*",
     "react-router-dom": "*",
     "dayjs": "*"