@voplus/morpho-document 6.0.133 → 6.0.134

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -1,3 +1,10 @@
1
1
  import React from "react";
2
- declare const CreateDateFilter: () => React.JSX.Element;
2
+ declare const CreateDateFilter: {
3
+ (props: {
4
+ filterBy: string;
5
+ }): React.JSX.Element;
6
+ defaultProps: {
7
+ filterBy: string;
8
+ };
9
+ };
3
10
  export default CreateDateFilter;
@@ -7,20 +7,20 @@ import { FontAwesomeIcon as FAIcon } from "@fortawesome/react-fontawesome";
7
7
  import { faCircle, faCircleDot } from "@fortawesome/pro-regular-svg-icons";
8
8
  import { toJS } from "mobx";
9
9
  import { Form } from "antd";
10
- import { utcdayjs } from "@voplus/morpho-ui/es/controls/UTCDatePicker/state";
11
10
  import { useFilterOptionsContext } from "@voplus/morpho-ui/es/data";
12
- const CreateDateFilter = () => {
11
+ const CreateDateFilter = (props) => {
12
+ const { filterBy } = props;
13
13
  /** 引入父組件的 FilterOptionsContextState */
14
14
  const context = useFilterOptionsContext();
15
15
  /** 尝试从 context 取得 State, 如果没有的话context会使用第二个factory参数创建一个State. */
16
- const state = context.getFilterState("CreateDate", () => new State());
16
+ const state = context.getFilterState(filterBy, () => new State(filterBy));
17
17
  return observe(() => (React.createElement("div", null,
18
- React.createElement("div", { className: "menu-item-title" }, "CreateDate"),
18
+ React.createElement("div", { className: "menu-item-title" }, filterBy.replace(/([A-Z])/g, " $1")),
19
19
  React.createElement(Form, { layout: "vertical", className: "filter-form" },
20
20
  React.createElement(Form.Item, { label: "From Date" },
21
- React.createElement(DatePicker, { value: state.createDate[0] ? utcdayjs(state.createDate[0]) : undefined, onChange: (date, dateString) => (state.createDate[0] = date) })),
21
+ React.createElement(DatePicker, { value: state.createDate[0] ? state.createDate[0] : undefined, onChange: (date) => (state.createDate[0] = date) })),
22
22
  React.createElement(Form.Item, { label: "To Date" },
23
- React.createElement(DatePicker, { value: state.createDate[1] ? utcdayjs(state.createDate[1]) : undefined, onChange: (date, dateString) => (state.createDate[1] = date) }))),
23
+ React.createElement(DatePicker, { value: state.createDate[1] ? state.createDate[1] : undefined, onChange: (date) => (state.createDate[1] = date) }))),
24
24
  dateMenus.map((item, index) => (React.createElement("div", { key: index, className: classnames("filter-menu-item", {
25
25
  bold: JSON.stringify(toJS(state.createDate)) === JSON.stringify(item.value),
26
26
  }), onClick: () => (state.createDate = item.value) },
@@ -32,5 +32,8 @@ const CreateDateFilter = () => {
32
32
  item.name,
33
33
  item.counts && ` (${item.counts})`))))))));
34
34
  };
35
+ CreateDateFilter.defaultProps = {
36
+ filterBy: "CreateDate",
37
+ };
35
38
  export default CreateDateFilter;
36
39
  //# sourceMappingURL=index.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/controls/filters/CreateDateFilter/index.tsx"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/controls/filters/CreateDateFilter/index.tsx"],"names":[],"mappings":"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"}
@@ -1,8 +1,11 @@
1
1
  import { FilterOption } from "@voplus/morpho-data";
2
2
  import { DefaultFilterState } from "@voplus/morpho-ui/es/data";
3
+ import { RangeValueType } from "rc-picker/lib/PickerInput/RangePicker";
4
+ import dayjs from "dayjs";
3
5
  export declare class State extends DefaultFilterState {
4
- createDate: any;
5
- constructor();
6
+ private filterBy;
7
+ createDate: RangeValueType<dayjs.Dayjs>;
8
+ constructor(filterBy: string);
6
9
  /** 视乎State内容,返回正确的FilterOption[]. 在Filter时,Context 会使用此属性replace Context内FilterOption的资料。 */
7
10
  get filters(): FilterOption[];
8
11
  reset(): void;
@@ -3,9 +3,14 @@ import { makeObservable, observable } from "mobx";
3
3
  import { DefaultFilterState } from "@voplus/morpho-ui/es/data";
4
4
  import dayjs from "dayjs";
5
5
  export class State extends DefaultFilterState {
6
- // RangeValue<Moment>;
7
- constructor() {
6
+ constructor(filterBy) {
8
7
  super();
8
+ Object.defineProperty(this, "filterBy", {
9
+ enumerable: true,
10
+ configurable: true,
11
+ writable: true,
12
+ value: filterBy
13
+ });
9
14
  Object.defineProperty(this, "createDate", {
10
15
  enumerable: true,
11
16
  configurable: true,
@@ -21,10 +26,10 @@ export class State extends DefaultFilterState {
21
26
  if (((_a = this.createDate) === null || _a === void 0 ? void 0 : _a[0]) === null && ((_b = this.createDate) === null || _b === void 0 ? void 0 : _b[1]) === null)
22
27
  return [];
23
28
  const start = (_d = (_c = this.createDate) === null || _c === void 0 ? void 0 : _c[0]) !== null && _d !== void 0 ? _d : dayjs("1753-01-01");
24
- const end = (_f = (_e = this.createDate) === null || _e === void 0 ? void 0 : _e[1]) !== null && _f !== void 0 ? _f : dayjs("9999-12-31");
29
+ const end = (_f = (_e = this.createDate) === null || _e === void 0 ? void 0 : _e[1]) !== null && _f !== void 0 ? _f : dayjs().endOf("year");
25
30
  return [
26
31
  {
27
- c: "CreateDate",
32
+ c: this.filterBy,
28
33
  o: "between",
29
34
  l: "And",
30
35
  v1: start.startOf("days").format("YYYY-MM-DD HH:mm:ss"),
@@ -1 +1 @@
1
- {"version":3,"file":"state.js","sourceRoot":"","sources":["../../../../src/controls/filters/CreateDateFilter/state.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,cAAc,EAAE,UAAU,EAAE,MAAM,MAAM,CAAC;AAElD,OAAO,EAAE,kBAAkB,EAAE,MAAM,2BAA2B,CAAC;AAC/D,OAAO,KAAK,MAAM,OAAO,CAAC;AAE1B,MAAM,OAAO,KAAM,SAAQ,kBAAkB;IAE5C,uBAAuB;IAEvB;QACC,KAAK,EAAE,CAAC;QAJU;;;;;WAAgB;QAKlC,cAAc,CAAC,IAAI,CAAC,CAAC;QACrB,IAAI,CAAC,KAAK,EAAE,CAAC;IACd,CAAC;IAED,6FAA6F;IAC7F,IAAW,OAAO;;QACjB,IAAI,CAAA,MAAA,IAAI,CAAC,UAAU,0CAAG,CAAC,CAAC,MAAK,IAAI,IAAI,CAAA,MAAA,IAAI,CAAC,UAAU,0CAAG,CAAC,CAAC,MAAK,IAAI;YAAE,OAAO,EAAE,CAAC;QAC9E,MAAM,KAAK,GAAG,MAAA,MAAA,IAAI,CAAC,UAAU,0CAAG,CAAC,CAAC,mCAAI,KAAK,CAAC,YAAY,CAAC,CAAC;QAC1D,MAAM,GAAG,GAAG,MAAA,MAAA,IAAI,CAAC,UAAU,0CAAG,CAAC,CAAC,mCAAI,KAAK,CAAC,YAAY,CAAC,CAAC;QACxD,OAAO;YACN;gBACC,CAAC,EAAE,YAAY;gBACf,CAAC,EAAE,SAAS;gBACZ,CAAC,EAAE,KAAK;gBACR,EAAE,EAAE,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,MAAM,CAAC,qBAAqB,CAAC;gBACvD,EAAE,EAAE,GAAG,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,MAAM,CAAC,qBAAqB,CAAC;aACrC;SACjB,CAAC;IACH,CAAC;IAEM,KAAK;QACX,IAAI,CAAC,UAAU,GAAG,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;IAChC,CAAC;CACD;AA5BmB;IAAlB,UAAU;yCAAwB"}
1
+ {"version":3,"file":"state.js","sourceRoot":"","sources":["../../../../src/controls/filters/CreateDateFilter/state.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,cAAc,EAAE,UAAU,EAAE,MAAM,MAAM,CAAC;AAElD,OAAO,EAAE,kBAAkB,EAAE,MAAM,2BAA2B,CAAC;AAE/D,OAAO,KAAK,MAAM,OAAO,CAAC;AAE1B,MAAM,OAAO,KAAM,SAAQ,kBAAkB;IAG5C,YAAoB,QAAgB;QACnC,KAAK,EAAE,CAAC;QADG;;;;mBAAQ,QAAQ;WAAQ;QAFjB;;;;;WAAwC;QAI1D,cAAc,CAAC,IAAI,CAAC,CAAC;QACrB,IAAI,CAAC,KAAK,EAAE,CAAC;IACd,CAAC;IAED,6FAA6F;IAC7F,IAAW,OAAO;;QACjB,IAAI,CAAA,MAAA,IAAI,CAAC,UAAU,0CAAG,CAAC,CAAC,MAAK,IAAI,IAAI,CAAA,MAAA,IAAI,CAAC,UAAU,0CAAG,CAAC,CAAC,MAAK,IAAI;YAAE,OAAO,EAAE,CAAC;QAC9E,MAAM,KAAK,GAAG,MAAA,MAAA,IAAI,CAAC,UAAU,0CAAG,CAAC,CAAC,mCAAI,KAAK,CAAC,YAAY,CAAC,CAAC;QAC1D,MAAM,GAAG,GAAG,MAAA,MAAA,IAAI,CAAC,UAAU,0CAAG,CAAC,CAAC,mCAAI,KAAK,EAAE,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;QAC1D,OAAO;YACN;gBACC,CAAC,EAAE,IAAI,CAAC,QAAQ;gBAChB,CAAC,EAAE,SAAS;gBACZ,CAAC,EAAE,KAAK;gBACR,EAAE,EAAE,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,MAAM,CAAC,qBAAqB,CAAC;gBACvD,EAAE,EAAE,GAAG,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,MAAM,CAAC,qBAAqB,CAAC;aACrC;SACjB,CAAC;IACH,CAAC;IAEM,KAAK;QACX,IAAI,CAAC,UAAU,GAAG,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;IAChC,CAAC;CACD;AA3BmB;IAAlB,UAAU;yCAAgD"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@voplus/morpho-document",
3
- "version": "6.0.133",
3
+ "version": "6.0.134",
4
4
  "repository": {
5
5
  "type": "git",
6
6
  "url": "https://voplus.visualstudio.com/morpho-document/_git/morpho-document"