@voplus/morpho-document 6.0.17 → 6.0.19
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.
- package/es/components/NewDocumentForm/state.js +3 -0
- package/es/components/NewDocumentForm/state.js.map +1 -1
- package/es/pages/Signature/Envelope/controls/EnvelopeFootbar/index.js +1 -1
- package/es/pages/Signature/Envelope/controls/EnvelopeFootbar/index.js.map +1 -1
- package/es/pages/Signature/Envelope/controls/EnvelopeFootbar/state.js +5 -3
- package/es/pages/Signature/Envelope/controls/EnvelopeFootbar/state.js.map +1 -1
- package/es/pages/Signature/Letter/LetterRecipientItem/state.js +13 -2
- package/es/pages/Signature/Letter/LetterRecipientItem/state.js.map +1 -1
- package/package.json +1 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"state.js","sourceRoot":"","sources":["../../../src/components/NewDocumentForm/state.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,MAAM,EAAE,cAAc,EAAE,UAAU,EAAE,WAAW,EAAE,MAAM,MAAM,CAAC;AAIvE,MAAM,OAAO,KAAK;IACjB,YAA2B,MAAqB,EAAU,KAAkB;QAAzD;;;;mBAAQ,MAAM;WAAe;QAAE;;;;mBAAQ,KAAK;WAAa;QAI5E,cAAc;QACK;;;;mBAAU,KAAK;WAAC;QAChB;;;;mBAAW,EAAE;WAAC;QACd;;;;mBAAO,UAAU;WAAC;QAClB;;;;;WAAsB;QAEzC,mCAAmC;QAE5B;;;;mBAAW,KAAK,EAAE,KAAW,EAAE,EAAE;;gBACvC,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC;gBAEpB,QAAQ,IAAI,CAAC,IAAI,EAAE,CAAC;oBACnB,KAAK,gBAAgB;wBACpB,IAAI,CAAC,IAAI,GAAG,gBAAgB,CAAC;wBAC7B,MAAM;oBACP,KAAK,eAAe;wBACnB,IAAI,CAAC,IAAI,GAAG,cAAc,CAAC;wBAC3B,MAAM;oBACP,KAAK,wBAAwB;wBAC5B,IAAI,CAAC,IAAI,GAAG,iBAAiB,CAAC;wBAC9B,MAAM;oBACP,KAAK,yBAAyB;wBAC7B,IAAI,CAAC,IAAI,GAAG,kBAAkB,CAAC;wBAC/B,MAAM;oBACP,KAAK,kBAAkB;wBACtB,IAAI,CAAC,IAAI,GAAG,WAAW,CAAC;wBACxB,MAAM;oBACP;wBACC,MAAM;gBACR,CAAC;gBAED,MAAM,IAAI,GACT,IAAI,CAAC,IAAI,KAAK,iBAAiB;oBAC9B,CAAC,CAAC,EAAE,SAAS,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,GAAG,KAAK,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,IAAI,CAAC,QAAQ,EAAE;oBACtF,CAAC,CAAC;wBACA,GAAG,KAAK;wBACR,IAAI,EAAE,IAAI,CAAC,IAAI;wBACf,QAAQ,EAAE,IAAI,CAAC,QAAQ;qBACtB,CAAC;gBACN,MAAM,IAAI,CAAC,MAAM,CAAC,cAAc,CAAC;oBAChC,IAAI,EAAE,IAAI;oBACV,KAAK,EAAE,SAAS;iBAChB,CAAC,CAAC;gBACH,MAAA,IAAI,CAAC,QAAQ,oDAAI,CAAC;gBAClB,WAAW,CAAC,GAAG,EAAE,CAAC,CAAC,IAAI,CAAC,OAAO,GAAG,KAAK,CAAC,CAAC,CAAC;YAC3C,CAAC;WAAC;
|
|
1
|
+
{"version":3,"file":"state.js","sourceRoot":"","sources":["../../../src/components/NewDocumentForm/state.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,MAAM,EAAE,cAAc,EAAE,UAAU,EAAE,WAAW,EAAE,MAAM,MAAM,CAAC;AAIvE,MAAM,OAAO,KAAK;IACjB,YAA2B,MAAqB,EAAU,KAAkB;QAAzD;;;;mBAAQ,MAAM;WAAe;QAAE;;;;mBAAQ,KAAK;WAAa;QAI5E,cAAc;QACK;;;;mBAAU,KAAK;WAAC;QAChB;;;;mBAAW,EAAE;WAAC;QACd;;;;mBAAO,UAAU;WAAC;QAClB;;;;;WAAsB;QAEzC,mCAAmC;QAE5B;;;;mBAAW,KAAK,EAAE,KAAW,EAAE,EAAE;;gBACvC,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC;gBAEpB,QAAQ,IAAI,CAAC,IAAI,EAAE,CAAC;oBACnB,KAAK,gBAAgB;wBACpB,IAAI,CAAC,IAAI,GAAG,gBAAgB,CAAC;wBAC7B,MAAM;oBACP,KAAK,eAAe;wBACnB,IAAI,CAAC,IAAI,GAAG,cAAc,CAAC;wBAC3B,MAAM;oBACP,KAAK,aAAa;wBACjB,IAAI,CAAC,IAAI,GAAG,YAAY,CAAC;wBACzB,MAAM;oBACP,KAAK,wBAAwB;wBAC5B,IAAI,CAAC,IAAI,GAAG,iBAAiB,CAAC;wBAC9B,MAAM;oBACP,KAAK,yBAAyB;wBAC7B,IAAI,CAAC,IAAI,GAAG,kBAAkB,CAAC;wBAC/B,MAAM;oBACP,KAAK,kBAAkB;wBACtB,IAAI,CAAC,IAAI,GAAG,WAAW,CAAC;wBACxB,MAAM;oBACP;wBACC,MAAM;gBACR,CAAC;gBAED,MAAM,IAAI,GACT,IAAI,CAAC,IAAI,KAAK,iBAAiB;oBAC9B,CAAC,CAAC,EAAE,SAAS,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,GAAG,KAAK,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,IAAI,CAAC,QAAQ,EAAE;oBACtF,CAAC,CAAC;wBACA,GAAG,KAAK;wBACR,IAAI,EAAE,IAAI,CAAC,IAAI;wBACf,QAAQ,EAAE,IAAI,CAAC,QAAQ;qBACtB,CAAC;gBACN,MAAM,IAAI,CAAC,MAAM,CAAC,cAAc,CAAC;oBAChC,IAAI,EAAE,IAAI;oBACV,KAAK,EAAE,SAAS;iBAChB,CAAC,CAAC;gBACH,MAAA,IAAI,CAAC,QAAQ,oDAAI,CAAC;gBAClB,WAAW,CAAC,GAAG,EAAE,CAAC,CAAC,IAAI,CAAC,OAAO,GAAG,KAAK,CAAC,CAAC,CAAC;YAC3C,CAAC;WAAC;QAnDD,cAAc,CAAC,IAAI,CAAC,CAAC;IACtB,CAAC;CAmDD;AAhDmB;IAAlB,UAAU;sCAAwB;AAChB;IAAlB,UAAU;uCAAsB;AACd;IAAlB,UAAU;mCAA0B;AAClB;IAAlB,UAAU;uCAA8B;AAIlC;IADN,MAAM;uCAyCL"}
|
|
@@ -15,7 +15,7 @@ const EnvelopeFootbar = (props) => {
|
|
|
15
15
|
const { user } = useApplicationContext();
|
|
16
16
|
const context = useEnvelopContext();
|
|
17
17
|
const doc = useFile(letter === null || letter === void 0 ? void 0 : letter.document.id);
|
|
18
|
-
const [state] = useState(new State(user.info.id, context));
|
|
18
|
+
const [state] = useState(new State(user.info.unit.id, context));
|
|
19
19
|
state.props = props;
|
|
20
20
|
return observe(() => (React.createElement(React.Fragment, null,
|
|
21
21
|
doc.loading ? (React.createElement(Skeleton, { loading: doc.loading })) : (React.createElement("div", { className: "envelope-footer", "data-tut": "sign" }, letter && (state.canSign || state.canDelete) ? (React.createElement("div", { className: "digi-sign" },
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../src/pages/Signature/Envelope/controls/EnvelopeFootbar/index.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC;AACxC,OAAO,EAAE,OAAO,EAAE,MAAM,mBAAmB,CAAC;AAC5C,OAAO,EAAE,KAAK,EAAE,QAAQ,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,MAAM,CAAC;AAEtD,OAAO,EAAE,iBAAiB,EAAE,MAAM,+BAA+B,CAAC;AAClE,OAAO,EAAE,eAAe,EAAE,UAAU,EAAE,MAAM,kCAAkC,CAAC;AAC/E,OAAO,EAAE,eAAe,IAAI,MAAM,EAAE,MAAM,gCAAgC,CAAC;AAC3E,OAAO,kBAAkB,MAAM,6BAA6B,CAAC;AAC7D,OAAO,UAAU,MAAM,YAAY,CAAC;AACpC,OAAO,EAAE,OAAO,EAAE,MAAM,8BAA8B,CAAC;AACvD,OAAO,qBAAqB,MAAM,wCAAwC,CAAC;AAC3E,OAAO,EAAE,qBAAqB,EAAE,MAAM,qBAAqB,CAAC;AAC5D,OAAO,EAAE,KAAK,EAAE,MAAM,SAAS,CAAC;AAEhC,MAAM,eAAe,GAAG,CAAC,KAA8C,EAAE,EAAE;IAC1E,MAAM,EAAE,UAAU,EAAE,MAAM,EAAE,GAAG,KAAK,CAAC;IACrC,MAAM,EAAE,IAAI,EAAE,GAAG,qBAAqB,EAAE,CAAC;IACzC,MAAM,OAAO,GAAG,iBAAiB,EAAE,CAAC;IACpC,MAAM,GAAG,GAAG,OAAO,CAAC,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,QAAQ,CAAC,EAAE,CAAC,CAAC;IACzC,MAAM,CAAC,KAAK,CAAC,GAAG,QAAQ,CAAC,IAAI,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,EAAE,OAAO,CAAC,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../src/pages/Signature/Envelope/controls/EnvelopeFootbar/index.tsx"],"names":[],"mappings":"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"}
|
|
@@ -57,18 +57,20 @@ export class State {
|
|
|
57
57
|
let isSigned = false;
|
|
58
58
|
if ((_a = this.lines) === null || _a === void 0 ? void 0 : _a.length) {
|
|
59
59
|
if ((_b = this.context.envelope.lastOtherSignature) === null || _b === void 0 ? void 0 : _b.signatureDate) {
|
|
60
|
-
const otherSignatureDate = dayjs(this.context.envelope.lastOtherSignature.signatureDate);
|
|
60
|
+
const otherSignatureDate = dayjs(this.context.envelope.lastOtherSignature.signatureDate).utc();
|
|
61
61
|
/** 全部文件沒有其他用戶的新簽名, 检查其他用户的签名时间比自己的签名时间小 */
|
|
62
62
|
const data = this.lines.filter((i) => {
|
|
63
63
|
/** 把signatureDate转为utc */
|
|
64
|
-
const signatureDate = dayjs(i.signatureDate);
|
|
64
|
+
const signatureDate = dayjs(i.signatureDate).utc();
|
|
65
65
|
return signatureDate < otherSignatureDate;
|
|
66
66
|
});
|
|
67
67
|
isDelete = data.length > 0 ? false : true;
|
|
68
68
|
}
|
|
69
69
|
const list = this.lines.filter((i) => {
|
|
70
|
+
if (!i.signatureDate)
|
|
71
|
+
return false;
|
|
70
72
|
/** 把signatureDate转为utc */
|
|
71
|
-
const signatureDate = dayjs(i.signatureDate);
|
|
73
|
+
const signatureDate = dayjs(i.signatureDate).utc();
|
|
72
74
|
/** 5分钟后的时间 */
|
|
73
75
|
const minuteTime = signatureDate.add(5, "minute");
|
|
74
76
|
return minuteTime > nowTime;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"state.js","sourceRoot":"","sources":["../../../../../../src/pages/Signature/Envelope/controls/EnvelopeFootbar/state.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,QAAQ,EAAE,cAAc,EAAE,UAAU,EAAE,MAAM,MAAM,CAAC;AAC5D,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,GAAG,MAAM,kBAAkB,CAAC;AAInC,KAAK,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;AAQlB,MAAM,OAAO,KAAK;IAOjB,YAA2B,KAAa,EAAU,OAA6B;QAA5D;;;;mBAAQ,KAAK;WAAQ;QAAE;;;;mBAAQ,OAAO;WAAsB;QANxE;;;;;WAA8B;QACrC,4CAA4C;QACzB;;;;mBAAU,KAAK;WAAC;QACnC,+CAA+C;QAC5B;;;;mBAAgB,KAAK;WAAC;QAGxC,cAAc,CAAC,IAAI,CAAC,CAAC;IACtB,CAAC;IAED,+CAA+C;IACrC,IAAW,MAAM;QAC1B,OAAO,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,IAAI,CAC/B,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,EAAE,KAAK,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,QAAQ,CAAC,EAAE,CAC3C,CAAC;IACd,CAAC;IACD,iBAAiB;IACP,IAAW,KAAK;;QACzB,MAAM,cAAc,GAAG,CAAC,IAAI,CAAC,MAAM,KAAI,MAAA,IAAI,CAAC,MAAM,0CAAE,cAAc,CAAA,CAAC,IAAI,EAAE,CAAC;QAC1E,OAAO,cAAc,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,WAAC,OAAA,CAAA,MAAA,CAAC,CAAC,MAAM,0CAAE,EAAE,MAAK,IAAI,CAAC,KAAK,CAAA,EAAA,CAAC,CAAC;IAClE,CAAC;IAES,IAAW,SAAS;;QAC7B,4BAA4B;QAC5B,MAAM,OAAO,GAAG,KAAK,CAAC,IAAI,IAAI,EAAE,CAAC,CAAC,GAAG,EAAE,CAAC;QACxC,IAAI,QAAQ,GAAG,IAAI,CAAC;QACpB,IAAI,QAAQ,GAAG,KAAK,CAAC;QAErB,IAAI,MAAA,IAAI,CAAC,KAAK,0CAAE,MAAM,EAAE,CAAC;YACxB,IAAI,MAAA,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,kBAAkB,0CAAE,aAAa,EAAE,CAAC;gBAC7D,MAAM,kBAAkB,GAAG,KAAK,
|
|
1
|
+
{"version":3,"file":"state.js","sourceRoot":"","sources":["../../../../../../src/pages/Signature/Envelope/controls/EnvelopeFootbar/state.ts"],"names":[],"mappings":"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"}
|
|
@@ -48,9 +48,20 @@ export class State {
|
|
|
48
48
|
this.removeDuplicatesList = cloneDeep(this.lines);
|
|
49
49
|
this.removeDuplicatesList.map((letter) => {
|
|
50
50
|
/** 如果同一个文件中有多个签名人为同一个时,只保留一个 */
|
|
51
|
+
const signatures = [];
|
|
52
|
+
const lastSignatures = [];
|
|
51
53
|
letter.signatureLines = letter.signatureLines.reduce((acc, cur) => {
|
|
52
|
-
if (
|
|
53
|
-
|
|
54
|
+
if (cur.signatureDate) {
|
|
55
|
+
if (!signatures.find((item) => { var _a, _b; return ((_a = item.signer) === null || _a === void 0 ? void 0 : _a.id) === ((_b = cur.signer) === null || _b === void 0 ? void 0 : _b.id); })) {
|
|
56
|
+
acc.push(cur);
|
|
57
|
+
signatures.push(cur);
|
|
58
|
+
}
|
|
59
|
+
}
|
|
60
|
+
else {
|
|
61
|
+
if (!lastSignatures.find((item) => { var _a, _b; return ((_a = item.signer) === null || _a === void 0 ? void 0 : _a.id) === ((_b = cur.signer) === null || _b === void 0 ? void 0 : _b.id); })) {
|
|
62
|
+
acc.push(cur);
|
|
63
|
+
lastSignatures.push(cur);
|
|
64
|
+
}
|
|
54
65
|
}
|
|
55
66
|
return acc;
|
|
56
67
|
}, []);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"state.js","sourceRoot":"","sources":["../../../../../src/pages/Signature/Letter/LetterRecipientItem/state.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,cAAc,EAAE,UAAU,EAAE,MAAM,EAAE,MAAM,MAAM,CAAC;AAE1D,OAAO,EAAE,SAAS,EAAE,MAAM,WAAW,CAAC;AAEtC,MAAM,OAAO,KAAK;IAQjB,YAA0B,KAAyB,EAAS,MAAc;QAAvD;;;;mBAAO,KAAK;WAAoB;QAAE;;;;mBAAO,MAAM;WAAQ;QAP1E,+BAA+B;QACnB;;;;mBAAkC,EAAE;WAAC;QAErC;;;;mBAA2B,EAAE;WAAC;QAC9B;;;;mBAAwB,EAAE;WAAC;QAC3B;;;;mBAAyB,EAAE;WAAC;QAGvC,cAAc,CAAC,IAAI,CAAC,CAAC;QAErB,IAAI,CAAC,gBAAgB,EAAE,CAAC;IACzB,CAAC;IAGO,gBAAgB;QACvB,sDAAsD;QACtD,IAAI,CAAC,oBAAoB,GAAG,SAAS,CAAC,IAAI,CAAC,KAAY,CAAC,CAAC;QAEzD,IAAI,CAAC,oBAAoB,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE;YACxC,gCAAgC;YAChC,MAAM,CAAC,cAAc,GAAG,MAAM,CAAC,cAAc,CAAC,MAAM,CAAC,CAAC,GAAqB,EAAE,GAAG,EAAE,EAAE;gBACnF,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,eAAC,OAAA,CAAA,MAAA,IAAI,CAAC,MAAM,0CAAE,EAAE,OAAK,MAAA,GAAG,CAAC,MAAM,0CAAE,EAAE,CAAA,CAAA,EAAA,CAAC,EAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"state.js","sourceRoot":"","sources":["../../../../../src/pages/Signature/Letter/LetterRecipientItem/state.ts"],"names":[],"mappings":"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"}
|