@voplus/morpho-workspace 6.0.120 → 6.0.122

Sign up to get free protection for your applications and to get access to all the features.
Files changed (6) hide show
  1. package/es/data/notification/types.d.ts +2 -0
  2. package/es/modules/notification/components/NewNotificationForm/NotificationForm.js +14 -2
  3. package/es/modules/notification/components/NewNotificationForm/NotificationForm.js.map +1 -1
  4. package/es/modules/work/components/WorkCashReport/WorkCashReportTemplate.js +10 -1
  5. package/es/modules/work/components/WorkCashReport/WorkCashReportTemplate.js.map +1 -1
  6. package/package.json +2 -1
package/es/data/notification/types.d.ts CHANGED
@@ -2,6 +2,7 @@ import { INotification, INewNotification, NotificationStatus } from ".";
2
2
  import { LoadOptions, StoreActionOptions } from "@voplus/morpho-data";
3
3
  import { DeleteDocumentOptions } from "@voplus/morpho-document-core";
4
4
  import { FilterOption, PageParameters } from "@voplus/morpho-data/es/types";
5
+ import { PlaceholderValue } from "@voplus/morpho-document/es/data/message-template";
5
6
  import dayjs from "dayjs";
6
7
  /** Custom load notification list options type */
7
8
  export type LoadNotificationListOptions = {
@@ -41,6 +42,7 @@ export type CreateNotificationOptions = {
41
42
  Channels: number;
42
43
  Subject?: string;
43
44
  Body?: string;
45
+ Placeholders?: PlaceholderValue;
44
46
  };
45
47
  } & StoreActionOptions;
46
48
  /** Custom load notification list options type. */
package/es/modules/notification/components/NewNotificationForm/NotificationForm.js CHANGED
@@ -32,6 +32,7 @@ const NewNotificationFormContent = (props) => {
32
32
  emailTemplateStore.load(data.id, { includes: "placeholders" }).then((res) => {
33
33
  var _a;
34
34
  state.params.EmailTemplateId = res.id;
35
+ state.params.Subject = res.subject;
35
36
  (_a = res.placeholders) === null || _a === void 0 ? void 0 : _a.map((item) => state.placeholderList.push({ Placeholder: item }));
36
37
  });
37
38
  } }),
@@ -69,7 +70,7 @@ const NewNotificationFormContent = (props) => {
69
70
  } }))),
70
71
  React.createElement(Col, { span: context.host.isTest ? 12 : 24 },
71
72
  React.createElement(Form.Item, { label: "Subject" },
72
- React.createElement(Input, { onChange: (e) => (state.params.Subject = e.target.value) }))))),
73
+ React.createElement(Input, { value: state.params.Subject, onChange: (e) => (state.params.Subject = e.target.value) }))))),
73
74
  React.createElement(Tabs, { className: "new-notification-form-tabs", defaultActiveKey: "Email Content", onChange: (key) => {
74
75
  if (key !== "preview" || !state.params.EmailTemplateId)
75
76
  return;
@@ -113,7 +114,16 @@ const NewNotificationFormContent = (props) => {
113
114
  onPreview();
114
115
  state.loading = true;
115
116
  const res = await store.create({
116
- data: { TargetId: props.targetId, ...state.params },
117
+ data: state.chooseMessageTemplate
118
+ ? {
119
+ ...state.params,
120
+ TargetId: props.targetId,
121
+ Placeholders: state.placeholderList,
122
+ }
123
+ : {
124
+ ...state.params,
125
+ TargetId: props.targetId,
126
+ },
117
127
  error: "message",
118
128
  });
119
129
  state.loading = false;
@@ -122,6 +132,7 @@ const NewNotificationFormContent = (props) => {
122
132
  span: 12,
123
133
  });
124
134
  state.params = state.Params;
135
+ state.placeholderList = [];
125
136
  (_a = props.onSave) === null || _a === void 0 ? void 0 : _a.call(props);
126
137
  }
127
138
  // cancel add notifications
@@ -130,6 +141,7 @@ const NewNotificationFormContent = (props) => {
130
141
  if (props.showView)
131
142
  asideContext.closeAside();
132
143
  state.params = state.Params;
144
+ state.placeholderList = [];
133
145
  (_a = props.onCancel) === null || _a === void 0 ? void 0 : _a.call(props);
134
146
  }
135
147
  };
package/es/modules/notification/components/NewNotificationForm/NotificationForm.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"NotificationForm.js","sourceRoot":"","sources":["../../../../../src/modules/notification/components/NewNotificationForm/NotificationForm.tsx"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"NotificationForm.js","sourceRoot":"","sources":["../../../../../src/modules/notification/components/NewNotificationForm/NotificationForm.tsx"],"names":[],"mappings":"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"}
package/es/modules/work/components/WorkCashReport/WorkCashReportTemplate.js CHANGED
@@ -9,7 +9,16 @@ const WorkCashReportTemplate = (props) => {
9
9
  autoFit: true,
10
10
  height: 280,
11
11
  });
12
- chart.interval().data(props.data).encode("x", "date").encode("y", "total");
12
+ chart.data(props.data);
13
+ chart.scale("total", {
14
+ nice: true,
15
+ });
16
+ chart.axis("total", {
17
+ title: { text: "Monthly Works" },
18
+ });
19
+ chart.interval().position("date*total");
20
+ chart.interaction("active-region");
21
+ chart.interaction("element-active");
13
22
  chart.render();
14
23
  };
15
24
  return observe(() => React.createElement("div", { id: "work-report-container" }));
package/es/modules/work/components/WorkCashReport/WorkCashReportTemplate.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"WorkCashReportTemplate.js","sourceRoot":"","sources":["../../../../../src/modules/work/components/WorkCashReport/WorkCashReportTemplate.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAE,SAAS,EAAE,MAAM,OAAO,CAAC;AACzC,OAAO,EAAE,KAAK,EAAE,MAAM,UAAU,CAAC;AACjC,OAAO,EAAE,OAAO,EAAE,MAAM,mBAAmB,CAAC;AAE5C,MAAM,sBAAsB,GAAG,CAAC,KAAkD,EAAE,EAAE;IACrF,SAAS,CAAC,GAAG,EAAE,CAAC,IAAI,EAAE,EAAE,EAAE,CAAC,CAAC;IAE5B,MAAM,IAAI,GAAG,GAAG,EAAE;QACjB,MAAM,KAAK,GAAG,IAAI,KAAK,CAAC;YACvB,SAAS,EAAE,uBAAuB;YAClC,OAAO,EAAE,IAAI;YACb,MAAM,EAAE,GAAG;SACX,CAAC,CAAC;QACH,KAAK,CAAC,QAAQ,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,MAAM,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC,MAAM,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC;QAE3E,KAAK,CAAC,MAAM,EAAE,CAAC;IAChB,CAAC,CAAC;IAEF,OAAO,OAAO,CAAC,GAAG,EAAE,CAAC,6BAAK,EAAE,EAAC,uBAAuB,GAAG,CAAC,CAAC;AAC1D,CAAC,CAAC;AAEF,eAAe,sBAAsB,CAAC"}
1
+ {"version":3,"file":"WorkCashReportTemplate.js","sourceRoot":"","sources":["../../../../../src/modules/work/components/WorkCashReport/WorkCashReportTemplate.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAE,SAAS,EAAE,MAAM,OAAO,CAAC;AACzC,OAAO,EAAE,KAAK,EAAE,MAAM,UAAU,CAAC;AACjC,OAAO,EAAE,OAAO,EAAE,MAAM,mBAAmB,CAAC;AAE5C,MAAM,sBAAsB,GAAG,CAAC,KAAkD,EAAE,EAAE;IACrF,SAAS,CAAC,GAAG,EAAE,CAAC,IAAI,EAAE,EAAE,EAAE,CAAC,CAAC;IAE5B,MAAM,IAAI,GAAG,GAAG,EAAE;QACjB,MAAM,KAAK,GAAG,IAAI,KAAK,CAAC;YACvB,SAAS,EAAE,uBAAuB;YAClC,OAAO,EAAE,IAAI;YACb,MAAM,EAAE,GAAG;SACX,CAAC,CAAC;QAEH,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QACvB,KAAK,CAAC,KAAK,CAAC,OAAO,EAAE;YACpB,IAAI,EAAE,IAAI;SACV,CAAC,CAAC;QAEH,KAAK,CAAC,IAAI,CAAC,OAAO,EAAE;YACnB,KAAK,EAAE,EAAE,IAAI,EAAE,eAAe,EAAE;SAChC,CAAC,CAAC;QAEH,KAAK,CAAC,QAAQ,EAAE,CAAC,QAAQ,CAAC,YAAY,CAAC,CAAC;QAExC,KAAK,CAAC,WAAW,CAAC,eAAe,CAAC,CAAC;QACnC,KAAK,CAAC,WAAW,CAAC,gBAAgB,CAAC,CAAC;QAEpC,KAAK,CAAC,MAAM,EAAE,CAAC;IAChB,CAAC,CAAC;IAEF,OAAO,OAAO,CAAC,GAAG,EAAE,CAAC,6BAAK,EAAE,EAAC,uBAAuB,GAAG,CAAC,CAAC;AAC1D,CAAC,CAAC;AAEF,eAAe,sBAAsB,CAAC"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@voplus/morpho-workspace",
3
- "version": "6.0.120",
3
+ "version": "6.0.122",
4
4
  "description": "morpho workspace module",
5
5
  "repository": {
6
6
  "type": "git",
@@ -32,6 +32,7 @@
32
32
  }
33
33
  },
34
34
  "dependencies": {
35
+ "@antv/g2": "^4.2.11",
35
36
  "@fullcalendar/core": "6.x",
36
37
  "@fullcalendar/daygrid": "6.x",
37
38
  "@fullcalendar/interaction": "6.x",