ts-glitter 21.2.1 → 21.2.3
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/lowcode/Entry.js +1 -1
- package/lowcode/Entry.ts +1 -1
- package/lowcode/jspage/main.js +343 -301
- package/lowcode/jspage/main.ts +1448 -1379
- package/lowcode/official_view_component/official/component.js +13 -3
- package/lowcode/official_view_component/official/component.ts +26 -11
- package/lowcode/public-components/checkout/index.js +5 -1
- package/lowcode/public-components/checkout/index.ts +5 -1
- package/package.json +1 -1
- package/src/modules/firebase.js +1 -0
- package/src/modules/firebase.js.map +1 -1
- package/src/modules/firebase.ts +2 -0
|
@@ -132,7 +132,7 @@ export const component = Plugin.createComponent(import.meta.url, (glitter, editM
|
|
|
132
132
|
return ref;
|
|
133
133
|
}
|
|
134
134
|
else {
|
|
135
|
-
return window.parent.glitter.share.updated_form_data[`${page_request_config.appName}_${tag}`] || ref;
|
|
135
|
+
return (window.parent.glitter.share.updated_form_data[`${page_request_config.appName}_${tag}`] || ref);
|
|
136
136
|
}
|
|
137
137
|
})();
|
|
138
138
|
let formData = JSON.parse(JSON.stringify(ref || {}));
|
|
@@ -179,8 +179,18 @@ export const component = Plugin.createComponent(import.meta.url, (glitter, editM
|
|
|
179
179
|
const ref = widget.data.refer_app
|
|
180
180
|
? widget.data.refer_form_data || data.page_config.formData
|
|
181
181
|
: data.page_config.formData;
|
|
182
|
-
|
|
183
|
-
|
|
182
|
+
try {
|
|
183
|
+
if (window.parent.glitter.share._global_component
|
|
184
|
+
.map((dd) => {
|
|
185
|
+
return `${dd.appName}_${dd.tag}`;
|
|
186
|
+
})
|
|
187
|
+
.includes(`${page_request_config.appName}_${tag}`)) {
|
|
188
|
+
window.parent.glitter.share.updated_form_data[`${page_request_config.appName}_${tag}`] =
|
|
189
|
+
ref;
|
|
190
|
+
}
|
|
191
|
+
}
|
|
192
|
+
catch (e) {
|
|
193
|
+
}
|
|
184
194
|
viewConfig.formData = getFormData(ref);
|
|
185
195
|
const view = getView();
|
|
186
196
|
window.parent.glitter.share.loading_dialog.dataLoading({ visible: true });
|
|
@@ -8,6 +8,7 @@ import { GlobalWidget } from '../../glitterBundle/html-component/global-widget.j
|
|
|
8
8
|
import { NormalPageEditor } from '../../editor/normal-page-editor.js';
|
|
9
9
|
import { RenderValue } from '../../glitterBundle/html-component/render-value.js';
|
|
10
10
|
import { ApplicationConfig } from '../../application-config.js';
|
|
11
|
+
import { ApiPageConfig } from '../../api/pageConfig.js';
|
|
11
12
|
|
|
12
13
|
export const component = Plugin.createComponent(import.meta.url, (glitter: Glitter, editMode: boolean) => {
|
|
13
14
|
return {
|
|
@@ -40,6 +41,7 @@ export const component = Plugin.createComponent(import.meta.url, (glitter: Glitt
|
|
|
40
41
|
let data: any = undefined;
|
|
41
42
|
let tag = widget.data.tag;
|
|
42
43
|
let carryData = widget.data.carryData;
|
|
44
|
+
|
|
43
45
|
async function getData(document: any) {
|
|
44
46
|
return new Promise(async (resolve, reject) => {
|
|
45
47
|
try {
|
|
@@ -116,16 +118,16 @@ export const component = Plugin.createComponent(import.meta.url, (glitter: Glitt
|
|
|
116
118
|
});
|
|
117
119
|
|
|
118
120
|
function getFormData(ref: any) {
|
|
119
|
-
|
|
120
|
-
|
|
121
|
-
|
|
122
|
-
ref = (()=>{
|
|
123
|
-
if((window as any).glitter.getUrlParameter('select_widget') === 'true'){
|
|
121
|
+
//判斷是否有上次的更新資料，並且為單例元素
|
|
122
|
+
ref = (() => {
|
|
123
|
+
if ((window as any).glitter.getUrlParameter('select_widget') === 'true') {
|
|
124
124
|
return ref;
|
|
125
|
-
}else{
|
|
126
|
-
|
|
127
|
-
|
|
125
|
+
} else {
|
|
126
|
+
return (
|
|
127
|
+
(window.parent as any).glitter.share.updated_form_data[
|
|
128
|
+
`${page_request_config.appName}_${tag}`
|
|
128
129
|
] || ref
|
|
130
|
+
);
|
|
129
131
|
}
|
|
130
132
|
})();
|
|
131
133
|
let formData = JSON.parse(JSON.stringify(ref || {}));
|
|
@@ -190,8 +192,21 @@ export const component = Plugin.createComponent(import.meta.url, (glitter: Glitt
|
|
|
190
192
|
const ref = widget.data.refer_app
|
|
191
193
|
? widget.data.refer_form_data || data.page_config.formData
|
|
192
194
|
: data.page_config.formData;
|
|
193
|
-
|
|
194
|
-
|
|
195
|
+
try {
|
|
196
|
+
if (
|
|
197
|
+
(window.parent as any).glitter.share._global_component
|
|
198
|
+
.map((dd: any) => {
|
|
199
|
+
return `${dd.appName}_${dd.tag}`;
|
|
200
|
+
})
|
|
201
|
+
.includes(`${page_request_config.appName}_${tag}`)
|
|
202
|
+
) {
|
|
203
|
+
(window.parent as any).glitter.share.updated_form_data[`${page_request_config.appName}_${tag}`] =
|
|
204
|
+
ref;
|
|
205
|
+
}
|
|
206
|
+
}catch (e) {
|
|
207
|
+
|
|
208
|
+
}
|
|
209
|
+
|
|
195
210
|
viewConfig.formData = getFormData(ref);
|
|
196
211
|
const view = getView();
|
|
197
212
|
(window.parent as any).glitter.share.loading_dialog.dataLoading({ visible: true });
|
|
@@ -877,7 +892,7 @@ export const component = Plugin.createComponent(import.meta.url, (glitter: Glitt
|
|
|
877
892
|
gvc.glitter.share.editorViewModel.selectItem =
|
|
878
893
|
undefined;
|
|
879
894
|
gvc.glitter.share.selectEditorItem();
|
|
880
|
-
|
|
895
|
+
|
|
881
896
|
// if (select_.container_cf) {
|
|
882
897
|
// const gvc_ =
|
|
883
898
|
// gvc.glitter.document.querySelector('.iframe_view')
|
|
@@ -546,19 +546,23 @@ export class CheckoutIndex {
|
|
|
546
546
|
</div>`}
|
|
547
547
|
`;
|
|
548
548
|
}
|
|
549
|
+
let voucher = '';
|
|
549
550
|
return html `<div class="d-flex flex-column flex-sm-row align-items-center">
|
|
550
551
|
<div class="d-flex align-items-center w-100">
|
|
551
552
|
<input
|
|
552
553
|
class="${gClass('input')}"
|
|
553
554
|
type="text"
|
|
554
555
|
style="border-top-right-radius: 0;border-bottom-right-radius: 0px;"
|
|
556
|
+
onchange="${gvc.event(e => {
|
|
557
|
+
voucher = e.value;
|
|
558
|
+
})}"
|
|
555
559
|
placeholder="${Language.text('enter_promo_code')}"
|
|
556
560
|
/>
|
|
557
561
|
<button
|
|
558
562
|
class="${gClass('button-bgr')}"
|
|
559
563
|
style="width:100px;border-top-left-radius: 0;border-bottom-left-radius: 0px;"
|
|
560
564
|
onclick="${gvc.event(e => {
|
|
561
|
-
checkCodeValue(
|
|
565
|
+
checkCodeValue(voucher);
|
|
562
566
|
})}"
|
|
563
567
|
>
|
|
564
568
|
<span class="${gClass('button-text')}"
|
|
@@ -617,19 +617,23 @@ export class CheckoutIndex {
|
|
|
617
617
|
`;
|
|
618
618
|
}
|
|
619
619
|
|
|
620
|
+
let voucher=''
|
|
620
621
|
return html`<div class="d-flex flex-column flex-sm-row align-items-center">
|
|
621
622
|
<div class="d-flex align-items-center w-100">
|
|
622
623
|
<input
|
|
623
624
|
class="${gClass('input')}"
|
|
624
625
|
type="text"
|
|
625
626
|
style="border-top-right-radius: 0;border-bottom-right-radius: 0px;"
|
|
627
|
+
onchange="${gvc.event(e => {
|
|
628
|
+
voucher = e.value;
|
|
629
|
+
})}"
|
|
626
630
|
placeholder="${Language.text('enter_promo_code')}"
|
|
627
631
|
/>
|
|
628
632
|
<button
|
|
629
633
|
class="${gClass('button-bgr')}"
|
|
630
634
|
style="width:100px;border-top-left-radius: 0;border-bottom-left-radius: 0px;"
|
|
631
635
|
onclick="${gvc.event(e => {
|
|
632
|
-
checkCodeValue(
|
|
636
|
+
checkCodeValue(voucher);
|
|
633
637
|
})}"
|
|
634
638
|
>
|
|
635
639
|
<span class="${gClass('button-text')}"
|
package/package.json
CHANGED
package/src/modules/firebase.js
CHANGED
|
@@ -66,6 +66,7 @@ class Firebase {
|
|
|
66
66
|
}
|
|
67
67
|
}
|
|
68
68
|
async sendMessage(cf) {
|
|
69
|
+
console.log('sendMessage', cf);
|
|
69
70
|
cf.body = cf.body.replace(/<br\s*\/?>/gi, '\n');
|
|
70
71
|
if (cf.userID) {
|
|
71
72
|
web_socket_js_1.WebSocket.noticeChangeMem[cf.userID] && web_socket_js_1.WebSocket.noticeChangeMem[cf.userID].map((d2) => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"firebase.js","sourceRoot":"","sources":["firebase.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"firebase.js","sourceRoot":"","sources":["firebase.ts"],"names":[],"mappings":";;;;;;AAAA,gDAAwB;AACxB,oEAAmC;AACnC,sCAAwC;AACxC,mEAAqC;AACrC,6DAAoD;AACpD,uDAAgD;AAChD,kEAAuC;AAGvC,MAAa,QAAQ;IAGjB,YAAY,GAAW;QAFhB,QAAG,GAAW,EAAE,CAAA;QAGnB,IAAI,CAAC,GAAG,GAAG,GAAG,CAAC;IACnB,CAAC;IAEM,MAAM,CAAC,KAAK,CAAC,OAAO;QACvB,OAAO,CAAC,GAAG,CAAC,mBAAmB,wBAAK,CAAC,UAAU,CAAC,IAAI,CAAC,cAAI,CAAC,OAAO,CAAC,sBAAa,CAAC,WAAW,EAAE,MAAM,OAAO,CAAC,GAAG,CAAC,QAAQ,EAAE,CAAC,CAAC,EAAE,CAAC,CAAA;QAC9H,wBAAK,CAAC,aAAa,CAAC;YAChB,UAAU,EAAE,wBAAK,CAAC,UAAU,CAAC,IAAI,CAAC,cAAI,CAAC,OAAO,CAAC,sBAAa,CAAC,WAAW,EAAE,MAAM,OAAO,CAAC,GAAG,CAAC,QAAQ,EAAE,CAAC,CAAC;SAC3G,EAAE,SAAS,CAAC,CAAC;QACd,wBAAK,CAAC,aAAa,CAAC;YAChB,UAAU,EAAE,wBAAK,CAAC,UAAU,CAAC,IAAI,CAAC,cAAI,CAAC,OAAO,CAAC,sBAAa,CAAC,WAAW,EAAE,MAAM,OAAO,CAAC,GAAG,CAAC,QAAQ,EAAE,CAAC,CAAC;SAC3G,CAAC,CAAC;IACP,CAAC;IAEM,MAAM,CAAC,KAAK,CAAC,WAAW,CAAC,EAI/B;QACG,IAAI,CAAC;YACD,IAAI,EAAE,CAAC,IAAI,KAAK,KAAK,EAAE,CAAC;gBAEpB,MAAM,wBAAK;qBACN,iBAAiB,EAAE,CAAC,YAAY,CAAC,EAAE,CAAC,KAAK,EAAE,EAAE,CAAC,OAAO,CAAC,CAAA;YAC/D,CAAC;iBAAM,CAAC;gBAEJ,MAAM,wBAAK;qBACN,iBAAiB,EAAE,CAAC,gBAAgB,CAAC,EAAE,CAAC,KAAK,EAAE,EAAE,CAAC,OAAO,CAAC,CAAA;YACnE,CAAC;QACL,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;QAEb,CAAC;IACL,CAAC;IAEM,MAAM,CAAC,KAAK,CAAC,SAAS,CAAC,EAI7B;QACG,IAAI,CAAC;YACD,IAAI,EAAE,CAAC,IAAI,KAAK,KAAK,EAAE,CAAC;gBACpB,KAAK,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,wBAAK;qBACxB,iBAAiB,EAAE,CAAC,WAAW,EAAE,CAAC,CAAC,EAAE,CAAC;oBACvC,IAAI,CAAC,MAAM,CAAC,CAAC,WAAW,EAAE,CAAC,CAAC,QAAQ,KAAK,EAAE,CAAC,KAAK,EAAE,CAAC;wBAChD,MAAM,CAAC,CAAC,cAAc,CAAC,EAAE,CAAC,SAAS,CAAC,CAAA;wBACpC,OAAO,CAAC,MAAM,CAAC,CAAC,SAAS,EAAE,CAAC,CAAA;oBAChC,CAAC;gBACL,CAAC;YACL,CAAC;iBAAM,CAAC;gBACJ,KAAK,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,wBAAK;qBACxB,iBAAiB,EAAE,CAAC,eAAe,EAAE,CAAC,CAAC,EAAE,CAAC;oBAC3C,IAAI,CAAC,MAAM,CAAC,CAAC,WAAW,EAAE,CAAC,CAAC,WAAW,KAAK,EAAE,CAAC,KAAK,EAAE,CAAC;wBACnD,MAAM,CAAC,CAAC,cAAc,CAAC,EAAE,CAAC,SAAS,CAAC,CAAA;wBACpC,OAAO,CAAC,MAAM,CAAC,CAAC,SAAS,EAAE,CAAC,CAAA;oBAChC,CAAC;gBACL,CAAC;YACL,CAAC;QACL,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACT,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,CAAA;YACd,OAAO,EAAE,CAAA;QACb,CAAC;IACL,CAAC;IAEM,KAAK,CAAC,WAAW,CAAC,EASxB;QACG,OAAO,CAAC,GAAG,CAAC,aAAa,EAAC,EAAE,CAAC,CAAA;QAC7B,EAAE,CAAC,IAAI,GAAC,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,cAAc,EAAE,IAAI,CAAC,CAAC;QAC9C,IAAG,EAAE,CAAC,MAAM,EAAC,CAAC;YACV,yBAAS,CAAC,eAAe,CAAC,EAAE,CAAC,MAAM,CAAC,IAAI,yBAAS,CAAC,eAAe,CAAC,EAAE,CAAC,MAAM,CAAC,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE;gBACpF,EAAE,CAAC,QAAQ,CAAC;oBACR,IAAI,EAAE,qBAAqB;iBAC9B,CAAC,CAAC;YACP,CAAC,CAAC,CAAA;QACN,CAAC;QACD,OAAO,IAAI,OAAO,CAAC,KAAK,EAAE,OAAO,EAAE,MAAM,EAAE,EAAE;;YACzC,IAAI,EAAE,CAAC,MAAM,EAAE,CAAC;gBACZ,EAAE,CAAC,KAAK,GAAG,CAAC,MAAM,kBAAE,CAAC,KAAK,CAAC;qDACU,EAAE,CAAC,GAAG,IAAI,IAAI,CAAC,GAAG;8DACT,EAAE,CAAC,EAAE,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,EAAO,EAAE,EAAE;oBAC1E,OAAO,EAAE,CAAC,WAAW,CAAA;gBACzB,CAAC,CAAC,CAAC;gBACH,MAAM,OAAO,GAAG,CAAC,MAAA,CAAC,CAAC,MAAM,kBAAE,CAAC,KAAK,CAAC;4DACU,EAAE,CAAC,GAAG,IAAI,IAAI,CAAC,GAAG;iGACmB,EAAE,CAAC,EAAE,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,mCAAI,EAAC,KAAK,EAAE,EAAE,EAAC,CAAC,CAAC,KAAK,CAAC;gBAC3H,IAAI,GAAG,OAAO,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,KAAK,OAAO,EAAE,CAAC;oBACnC,IAAI,EAAE,CAAC,MAAM,IAAI,EAAE,CAAC,GAAG,IAAI,EAAE,CAAC,KAAK,IAAI,EAAE,CAAC,IAAI,IAAI,EAAE,CAAC,IAAI,IAAI,CAAC,EAAE,CAAC,UAAU,EAAE,CAAC;wBAC1E,MAAM,kBAAE,CAAC,KAAK,CAAC,iBAAiB,EAAE,CAAC,GAAG,IAAI,IAAI,CAAC,GAAG;+DACX,EAAE;4BACrC,EAAE,CAAC,MAAM;4BACT,EAAE,CAAC,GAAG;4BACN,EAAE,CAAC,KAAK;4BACR,EAAE,CAAC,IAAI;4BACP,EAAE,CAAC,IAAI;yBACV,CAAC,CAAA;oBACN,CAAC;gBACL,CAAC;qBAAM,CAAC;oBACJ,OAAO,CAAC,IAAI,CAAC,CAAA;oBACb,OAAM;gBACV,CAAC;YAEL,CAAC;YACD,IAAI,OAAO,EAAE,CAAC,KAAK,KAAK,QAAQ,EAAE,CAAC;gBAC/B,EAAE,CAAC,KAAK,GAAG,CAAC,EAAE,CAAC,KAAK,CAAC,CAAA;YACzB,CAAC;YACD,IAAI,KAAK,CAAC,OAAO,CAAC,EAAE,CAAC,KAAK,CAAC,EAAE,CAAC;gBAC1B,KAAK,MAAM,KAAK,IAAI,EAAE,CAAC,KAAK,EAAE,CAAC;oBAC3B,IAAI,CAAC;wBACD,wBAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,EAAE,EAAE,EAAE;4BACnB,OAAO,CAAA,EAAE,aAAF,EAAE,uBAAF,EAAE,CAAE,IAAI,MAAK,SAAS,CAAA;wBACjC,CAAC,CAAE,CAAC,SAAS,EAAE,CAAC,IAAI,CAAC;4BACjB,YAAY,EAAE;gCACV,KAAK,EAAE,EAAE,CAAC,KAAK;gCACf,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,EAAC,EAAE,CAAC;6BACpC;4BACD,OAAO,EAAE;gCACL,YAAY,EAAE;oCACV,KAAK,EAAE,SAAS;iCACnB;6BACJ;4BACD,IAAI,EAAE;gCACF,OAAO,EAAE;oCACL,GAAG,EAAE;wCACD,KAAK,EAAE,SAAS;qCACnB;iCACJ;6BACJ;4BACD,IAAI,EAAE;gCACF,IAAI,EAAE,GAAG,EAAE,CAAC,IAAI,IAAI,EAAE,EAAE;6BAC3B;4BACD,OAAO,EAAE,KAAM;yBAClB,CAAC,CAAC,IAAI,CAAC,CAAC,QAAa,EAAE,EAAE;4BAEtB,OAAO,CAAC,GAAG,CAAC,SAAS,EAAE,QAAQ,CAAC,CAAC;wBACrC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,KAAU,EAAE,EAAE;4BACpB,OAAO,CAAC,KAAK,CAAC,YAAY,EAAE,KAAK,CAAC,CAAC;wBACvC,CAAC,CAAC,CAAA;oBACN,CAAC;oBAAA,OAAO,CAAK,EAAE,CAAC;wBACZ,6BAAW,CAAC,OAAO,CAAC,KAAK,EAAC,cAAc,EAAC,GAAG,CAAC,EAAE,CAAC,CAAA;oBACpD,CAAC;gBAEL,CAAC;YACL,CAAC;YACD,OAAO,CAAC,IAAI,CAAC,CAAA;QACjB,CAAC,CAAC,CAAA;IAEN,CAAC;IAGD,KAAK,CAAC,OAAO,CAAC,IAAS;QACnB,IAAI,CAAC,KAAK,GAAG,EAAE,CAAC;QAChB,IAAI,CAAC;YACD,IAAI,OAAO,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAE,CAAC;gBACzB,IAAI,OAAO,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAE,CAAC;oBACzB,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO,EAAE,gBAAgB,EAAE,CAAC;gBACxD,CAAC;gBACD,MAAM,UAAU,GAAG,MAAM,kBAAE,CAAC,KAAK,CAC/B,iBAAiB,IAAI,CAAC,GAAG;kDACO,EAChC;oBACI;wBACI,GAAG,EAAE,SAAS;wBACd,OAAO,EAAE,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC;wBAC7B,YAAY,EAAE,cAAc,CAAC,IAAI,CAAC,QAAQ,CAAC;wBAC3C,MAAM,EAAE,CAAC;qBACZ;iBACJ,CACF,CAAC;gBAEF,IAAI,CAAC,YAAY,CAAC,IAAI,EAAE,UAAU,CAAC,QAAQ,EAAE,cAAc,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC;YAChF,CAAC;iBAAM,CAAC;gBACJ,MAAM,UAAU,GAAG,MAAM,kBAAE,CAAC,KAAK,CAC/B,iBAAiB,IAAI,CAAC,GAAG;kDACO,EAChC;oBACI;wBACI,GAAG,EAAE,SAAS;wBACd,OAAO,EAAE,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC;wBAC7B,YAAY,EAAE,cAAc,EAAE;wBAC9B,MAAM,EAAE,CAAC;qBACZ;iBACJ,CACF,CAAC;gBACF,IAAI,CAAC,YAAY,CAAC,IAAI,EAAE,UAAU,CAAC,QAAQ,CAAC,CAAC;YACjD,CAAC;YACD,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,EAAE,CAAC;QAC7C,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACT,MAAM,sBAAS,CAAC,eAAe,CAAC,aAAa,EAAE,iBAAiB,GAAG,CAAC,EAAE,IAAI,CAAC,CAAC;QAChF,CAAC;IACL,CAAC;IAED,KAAK,CAAC,YAAY,CAAC,IAAS,EAAE,EAAU,EAAE,IAAa;QACnD,IAAI,CAAC;YACD,IAAI,KAAK,GAAG,EAAE,CAAC;YACf,KAAK,MAAM,CAAC,IAAI,UAAU,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,GAAG,CAAC,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,EAAM,EAAC,EAAE;gBACtE,OAAO,EAAE,CAAC,EAAE,CAAA;YAChB,CAAC,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,EAAE,CAAC;gBACR,IAAI,KAAK,GAAG,CAAC,CAAC,MAAM,CAAC;gBAErB,MAAM,IAAI,OAAO,CAAC,OAAO,CAAC,EAAE;oBACxB,KAAK,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC;wBAChB,IAAI,CAAC,WAAW,CAAC;4BACb,MAAM,EAAE,CAAW;4BACnB,KAAK,EAAE,IAAI,CAAC,KAAK;4BACjB,IAAI,EAAE,IAAI,CAAC,OAAO;4BAClB,GAAG,EAAC,SAAS;4BACb,IAAI,EAAC,IAAI,CAAC,IAAI;yBACjB,CAAC,CAAA;oBAeN,CAAC;gBACL,CAAC,CAAC,CAAC;YACP,CAAC;QAGL,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACT,MAAM,sBAAS,CAAC,eAAe,CAAC,aAAa,EAAE,qBAAqB,GAAG,CAAC,EAAE,IAAI,CAAC,CAAC;QACpF,CAAC;IACL,CAAC;IAGD,KAAK,CAAC,MAAM,CAAC,KAA8H;;QACvI,IAAI,CAAC;YACD,MAAM,SAAS,GAAa,CAAC,OAAO,CAAC,CAAC;YACtC,QAAQ,KAAK,CAAC,UAAU,EAAE,CAAC;gBACvB,KAAK,OAAO;oBAER,MAAM;gBACV,KAAK,MAAM;oBACP,SAAS,CAAC,IAAI,CAAC,wDAAwD,MAAA,KAAK,CAAC,MAAM,mCAAI,EAAE,MAAM,CAAC,CAAC;oBACjG,MAAM;gBACV,KAAK,OAAO;oBACR,SAAS,CAAC,IAAI,CAAC,yDAAyD,MAAA,KAAK,CAAC,MAAM,mCAAI,EAAE,MAAM,CAAC,CAAC;oBAClG,MAAM;YACd,CAAC;YAED,IAAI,KAAK,CAAC,MAAM,EAAE,CAAC;gBACf,SAAS,CAAC,IAAI,CAAC,eAAe,KAAK,CAAC,MAAM,IAAI,CAAC,CAAC;YACpD,CAAC;YAED,IAAI,KAAK,CAAC,QAAQ,EAAE,CAAC;gBACjB,MAAM,aAAa,GAAG,KAAK,CAAC,QAAQ,CAAC,OAAO,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;gBAC/D,SAAS,CAAC,IAAI,CAAC,wCAAwC,aAAa,IAAI,CAAC,CAAC;YAC9E,CAAC;YAED,MAAM,QAAQ,GAAG,yBAAyB,SAAS,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC;YAGpE,MAAM,MAAM,GAAG,MAAM,kBAAE,CAAC,KAAK,CAC3B,mBAAmB,IAAI,CAAC,GAAG;yBAChB,QAAQ;;mBAEd,KAAK,CAAC,IAAI,KAAK,UAAU,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,SAAS,KAAK,CAAC,IAAI,GAAG,KAAK,CAAC,KAAK,KAAK,KAAK,CAAC,KAAK,EAAE,GAAG,EAC5F,EAAE,CACH,CAAC;YAEF,MAAM,KAAK,GAAG,MAAM,kBAAE,CAAC,KAAK,CAC1B,gCAAgC,IAAI,CAAC,GAAG;yBAC7B,QAAQ,GAAG,EACtB,EAAE,CACH,CAAC;YAEF,KAAK,MAAM,KAAK,IAAI,MAAM,EAAE,CAAC;gBACzB,KAAK,CAAC,OAAO,CAAC,QAAQ,GAAC,MAAM,CAAA;YACjC,CAAC;YACD,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;QAC/C,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACT,MAAM,sBAAS,CAAC,eAAe,CAAC,aAAa,EAAE,gBAAgB,GAAG,CAAC,EAAE,IAAI,CAAC,CAAC;QAC/E,CAAC;IACL,CAAC;CACJ;AApSD,4BAoSC;AAED,SAAS,OAAO,CAAC,WAA2C;IACxD,MAAM,eAAe,GAAG,IAAI,IAAI,EAAE,CAAC;IACnC,MAAM,EAAE,IAAI,EAAE,IAAI,EAAE,GAAG,WAAW,CAAC;IACnC,MAAM,cAAc,GAAG,GAAG,IAAI,IAAI,IAAI,KAAK,CAAC;IAC5C,MAAM,gBAAgB,GAAG,IAAI,IAAI,CAAC,cAAc,CAAC,CAAC;IAClD,OAAO,eAAe,GAAG,gBAAgB,CAAC;AAC9C,CAAC;AAED,SAAS,UAAU,CAAC,KAAU,EAAE,SAAiB;IAC7C,MAAM,MAAM,GAAG,EAAE,CAAC;IAClB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,KAAK,CAAC,MAAM,EAAE,CAAC,IAAI,SAAS,EAAE,CAAC;QAC/C,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,GAAG,SAAS,CAAC,CAAC,CAAC;IAC/C,CAAC;IACD,OAAO,MAAM,CAAC;AAClB,CAAC;AACD,SAAS,UAAU,CAAC,IAAS;IACzB,MAAM,IAAI,GAAG,IAAI,CAAC,WAAW,EAAE,CAAC;IAChC,MAAM,KAAK,GAAG,MAAM,CAAC,IAAI,CAAC,QAAQ,EAAE,GAAG,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC;IAC3D,MAAM,GAAG,GAAG,MAAM,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC,CAAC,QAAQ,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC;IACpD,MAAM,KAAK,GAAG,MAAM,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC,CAAC,QAAQ,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC;IACvD,MAAM,OAAO,GAAG,MAAM,CAAC,IAAI,CAAC,UAAU,EAAE,CAAC,CAAC,QAAQ,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC;IAC3D,MAAM,OAAO,GAAG,MAAM,CAAC,IAAI,CAAC,UAAU,EAAE,CAAC,CAAC,QAAQ,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC;IAE3D,OAAO,GAAG,IAAI,GAAG,KAAK,GAAG,GAAG,GAAG,KAAK,GAAG,OAAO,GAAG,OAAO,EAAE,CAAC;AAC/D,CAAC;AAED,SAAS,cAAc,CAAC,QAAyC;IAC7D,MAAM,cAAc,GAAG,QAAQ,CAAC,CAAC,CAAC,QAAQ,CAAC,IAAI,GAAG,GAAG,GAAG,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,SAAS,CAAC;IAClF,MAAM,UAAU,GAAG,cAAc,CAAC,CAAC,CAAC,IAAI,IAAI,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC,IAAI,IAAI,EAAE,CAAC;IAC1E,OAAO,UAAU,CAAC,UAAU,CAAC,CAAC;AAClC,CAAC"}
|
package/src/modules/firebase.ts
CHANGED
|
@@ -83,6 +83,7 @@ export class Firebase {
|
|
|
83
83
|
app?: string,
|
|
84
84
|
pass_store?:boolean
|
|
85
85
|
}) {
|
|
86
|
+
console.log('sendMessage',cf)
|
|
86
87
|
cf.body=cf.body.replace(/<br\s*\/?>/gi, '\n');
|
|
87
88
|
if(cf.userID){
|
|
88
89
|
WebSocket.noticeChangeMem[cf.userID] && WebSocket.noticeChangeMem[cf.userID].map((d2) => {
|
|
@@ -148,6 +149,7 @@ export class Firebase {
|
|
|
148
149
|
},
|
|
149
150
|
"token": token!
|
|
150
151
|
}).then((response: any) => {
|
|
152
|
+
|
|
151
153
|
console.log('成功發送推播：', response);
|
|
152
154
|
}).catch((error: any) => {
|
|
153
155
|
console.error('發送推播時發生錯誤：', error);
|