ts-glitter 21.4.6 → 21.4.7

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.
Files changed (5) hide show
  1. package/lowcode/Entry.js +1 -1
  2. package/lowcode/Entry.ts +1 -1
  3. package/lowcode/public-components/blogs/blogs-01.js +139 -145
  4. package/lowcode/public-components/blogs/blogs-01.ts +9 -15
  5. package/package.json +1 -1
package/lowcode/Entry.js CHANGED
@@ -146,7 +146,7 @@ export class Entry {
146
146
  }
147
147
  window.renderClock = (_b = window.renderClock) !== null && _b !== void 0 ? _b : createClock();
148
148
  console.log(`Entry-time:`, window.renderClock.stop());
149
- glitter.share.editerVersion = 'V_21.4.6';
149
+ glitter.share.editerVersion = 'V_21.4.7';
150
150
  glitter.share.start = new Date();
151
151
  const vm = { appConfig: [] };
152
152
  window.saasConfig = {
package/lowcode/Entry.ts CHANGED
@@ -150,7 +150,7 @@ export class Entry {
150
150
  }
151
151
  (window as any).renderClock = (window as any).renderClock ?? createClock();
152
152
  console.log(`Entry-time:`, (window as any).renderClock.stop());
153
- glitter.share.editerVersion = 'V_21.4.6';
153
+ glitter.share.editerVersion = 'V_21.4.7';
154
154
  glitter.share.start = new Date();
155
155
  const vm = { appConfig: [] };
156
156
  (window as any).saasConfig = {
package/lowcode/public-components/blogs/blogs-01.js CHANGED
@@ -28,6 +28,7 @@ export class Blogs01 {
28
28
  class: `${bid}`,
29
29
  },
30
30
  onCreate: () => __awaiter(this, void 0, void 0, function* () {
31
+ var _a;
31
32
  if (!initial) {
32
33
  try {
33
34
  initial = true;
@@ -48,149 +49,150 @@ export class Blogs01 {
48
49
  onCreate: () => { },
49
50
  document: document,
50
51
  }, {});
51
- if (subData.content.generator !== 'page_editor') {
52
- const dd = subData.content;
53
- document.querySelector(`.${bid}`).outerHTML = [
54
- ogHeaderView,
55
- `<div class="container mx-auto fr-view mb-5" style="max-width: 1100px;font-family: 'Source Sans Pro', 'Open Sans', 'Helvetica Neue', Helvetica, Arial, 'Hiragino Sans GB', 'Microsoft YaHei', '微软雅黑', 'STHeiti', 'WenQuanYi Micro Hei', SimSun, sans-serif;">
56
- <h1 class="my-5 w-100 text-center p-0" style="color:${subData.content.title};font-size:${document.body.clientWidth > 800 ? `32px` : `24px`};font-weight: 600;">
57
- ${(dd.language_data && dd.language_data[Language.getLanguage()].title) || dd.title}
58
- </h1>
59
- ${(dd.language_data && dd.language_data[Language.getLanguage()].text) || dd.text}</div>`
60
- ].join('');
61
- return;
62
- }
63
52
  console.log(`o_header===>`, o_header);
64
53
  console.log(`subData===>`, subData);
65
- subData.content.config = subData.content.config.filter((dd) => dd.data.tag !== 'c_header');
66
- const view = (() => {
67
- if (subData.content.generator !== 'page_editor') {
68
- const dd = subData.content;
69
- return html ` <div
54
+ subData.content.config = (_a = subData.content.config) !== null && _a !== void 0 ? _a : [];
55
+ try {
56
+ subData.content.config = subData.content.config.filter((dd) => dd.data.tag !== 'c_header');
57
+ const view = (() => {
58
+ if (subData.content.generator !== 'page_editor') {
59
+ const dd = subData.content;
60
+ return html ` <div
70
61
  class="container mx-auto fr-view mb-5"
71
62
  style="max-width: 1100px;font-family: 'Source Sans Pro', 'Open Sans', 'Helvetica Neue', Helvetica, Arial, 'Hiragino Sans GB', 'Microsoft YaHei', '微软雅黑', 'STHeiti', 'WenQuanYi Micro Hei', SimSun, sans-serif;"
72
63
  >
73
64
  <h1
74
65
  class="my-5 w-100 text-center p-0"
75
66
  style="color:${subData.content.title};font-size:${document.body.clientWidth > 800
76
- ? `32px`
77
- : `24px`};font-weight: 600;"
67
+ ? `32px`
68
+ : `24px`};font-weight: 600;"
78
69
  >
79
70
  ${(dd.language_data && dd.language_data[Language.getLanguage()].title) || dd.title}
80
71
  </h1>
81
72
  ${(dd.language_data && dd.language_data[Language.getLanguage()].text) || dd.text}
82
73
  </div>`;
83
- }
84
- else {
85
- function startRender() {
86
- if (subData.content.relative_data &&
87
- ['shopping', 'hidden'].includes(subData.content.page_type) &&
88
- localStorage.getItem('block-refresh-cart') !== 'true') {
89
- const clock = gvc.glitter.ut.clock();
90
- const interVal = setInterval(() => {
91
- if (clock.stop() < 2000) {
92
- new ApiCart(ApiCart.globalCart).setCart(cart => {
93
- subData.content.relative_data.map((dd) => {
94
- const line_item = cart.line_items.find((d1) => {
95
- return (`${d1.id}-${d1.spec.join('-')}` === `${dd.product_id}-${dd.variant.spec.join('-')}`);
96
- });
97
- if (!line_item) {
98
- cart.line_items.push({
99
- id: dd.product_id,
100
- spec: dd.variant.spec,
101
- count: 1,
74
+ }
75
+ else {
76
+ function startRender() {
77
+ if (subData.content.relative_data &&
78
+ ['shopping', 'hidden'].includes(subData.content.page_type) &&
79
+ localStorage.getItem('block-refresh-cart') !== 'true') {
80
+ const clock = gvc.glitter.ut.clock();
81
+ const interVal = setInterval(() => {
82
+ if (clock.stop() < 2000) {
83
+ new ApiCart(ApiCart.globalCart).setCart(cart => {
84
+ subData.content.relative_data.map((dd) => {
85
+ const line_item = cart.line_items.find((d1) => {
86
+ return (`${d1.id}-${d1.spec.join('-')}` === `${dd.product_id}-${dd.variant.spec.join('-')}`);
102
87
  });
103
- }
88
+ if (!line_item) {
89
+ cart.line_items.push({
90
+ id: dd.product_id,
91
+ spec: dd.variant.spec,
92
+ count: 1,
93
+ });
94
+ }
95
+ });
104
96
  });
105
- });
106
- }
107
- else {
108
- gvc.notifyDataChange(['js-cart-count']);
109
- gvc.glitter.share.reloadCartData && gvc.glitter.share.reloadCartData();
110
- if (document.querySelector('.customer-message')) {
111
- document.querySelector('.customer-message').remove();
112
97
  }
113
- clearInterval(interVal);
114
- }
115
- }, 300);
116
- }
117
- else {
118
- localStorage.setItem('block-refresh-cart', 'false');
119
- }
120
- return new gvc.glitter.htmlGenerate(subData.content.config, [], subData.content).render(gvc, {
121
- class: `w-100`,
122
- style: `position:relative;`,
123
- containerID: gvc.glitter.getUUID(),
124
- tag: gvc.glitter.getUUID(),
125
- jsFinish: () => { },
126
- onCreate: () => { },
127
- document: document,
128
- }, {});
129
- }
130
- if (subData.content.page_type === 'hidden') {
131
- if (subData.content.show_auth.auth === 'all') {
132
- return startRender();
98
+ else {
99
+ gvc.notifyDataChange(['js-cart-count']);
100
+ gvc.glitter.share.reloadCartData && gvc.glitter.share.reloadCartData();
101
+ if (document.querySelector('.customer-message')) {
102
+ document.querySelector('.customer-message').remove();
103
+ }
104
+ clearInterval(interVal);
105
+ }
106
+ }, 300);
107
+ }
108
+ else {
109
+ localStorage.setItem('block-refresh-cart', 'false');
110
+ }
111
+ return new gvc.glitter.htmlGenerate(subData.content.config, [], subData.content).render(gvc, {
112
+ class: `w-100`,
113
+ style: `position:relative;`,
114
+ containerID: gvc.glitter.getUUID(),
115
+ tag: gvc.glitter.getUUID(),
116
+ jsFinish: () => { },
117
+ onCreate: () => { },
118
+ document: document,
119
+ }, {});
133
120
  }
134
- else if (subData.content.show_auth.auth === 'password') {
135
- if (localStorage.getItem('password_to_see_' + subData.content.tag) ===
136
- subData.content.show_auth.value) {
121
+ if (subData.content.page_type === 'hidden') {
122
+ if (subData.content.show_auth.auth === 'all') {
137
123
  return startRender();
138
124
  }
139
- return gvc.bindView(() => {
140
- const rid = gvc.glitter.getUUID();
141
- return {
142
- bind: rid,
143
- view: () => {
144
- return ``;
145
- },
146
- divCreate: {
147
- option: [{ key: 'id', value: rid }],
148
- },
149
- onCreate: () => {
150
- function checkPwd() {
151
- const pwd = window.prompt(Language.text('enter_website_password'), '');
152
- localStorage.setItem('password_to_see_' + subData.content.tag, pwd !== null && pwd !== void 0 ? pwd : '');
153
- if (subData.content.show_auth.value === pwd) {
154
- document.querySelector(`#${rid}`).outerHTML = startRender();
155
- }
156
- else {
157
- const dialog = new ShareDialog(gvc.glitter);
158
- dialog.checkYesOrNot({
159
- text: Language.text('incorrect_website_password'),
160
- callback: () => {
161
- gvc.glitter.closeDiaLog();
162
- checkPwd();
163
- },
164
- });
165
- }
166
- }
167
- checkPwd();
168
- },
169
- };
170
- });
171
- }
172
- else if (subData.content.show_auth.auth === 'member_type') {
173
- return gvc.bindView(() => {
174
- const rid = gvc.glitter.getUUID();
175
- return {
176
- bind: rid,
177
- view: () => {
178
- return ``;
179
- },
180
- divCreate: {
181
- option: [{ key: 'id', value: rid }],
182
- },
183
- onCreate: () => {
184
- const dialog = new ShareDialog(gvc.glitter);
185
- UmClass.getUserData(gvc).then((resp) => {
186
- try {
187
- const mem = resp.member.find((d) => {
188
- return d.trigger;
189
- });
190
- if (subData.content.show_auth.value.includes(mem.id)) {
125
+ else if (subData.content.show_auth.auth === 'password') {
126
+ if (localStorage.getItem('password_to_see_' + subData.content.tag) ===
127
+ subData.content.show_auth.value) {
128
+ return startRender();
129
+ }
130
+ return gvc.bindView(() => {
131
+ const rid = gvc.glitter.getUUID();
132
+ return {
133
+ bind: rid,
134
+ view: () => {
135
+ return ``;
136
+ },
137
+ divCreate: {
138
+ option: [{ key: 'id', value: rid }],
139
+ },
140
+ onCreate: () => {
141
+ function checkPwd() {
142
+ const pwd = window.prompt(Language.text('enter_website_password'), '');
143
+ localStorage.setItem('password_to_see_' + subData.content.tag, pwd !== null && pwd !== void 0 ? pwd : '');
144
+ if (subData.content.show_auth.value === pwd) {
191
145
  document.querySelector(`#${rid}`).outerHTML = startRender();
192
146
  }
193
147
  else {
148
+ const dialog = new ShareDialog(gvc.glitter);
149
+ dialog.checkYesOrNot({
150
+ text: Language.text('incorrect_website_password'),
151
+ callback: () => {
152
+ gvc.glitter.closeDiaLog();
153
+ checkPwd();
154
+ },
155
+ });
156
+ }
157
+ }
158
+ checkPwd();
159
+ },
160
+ };
161
+ });
162
+ }
163
+ else if (subData.content.show_auth.auth === 'member_type') {
164
+ return gvc.bindView(() => {
165
+ const rid = gvc.glitter.getUUID();
166
+ return {
167
+ bind: rid,
168
+ view: () => {
169
+ return ``;
170
+ },
171
+ divCreate: {
172
+ option: [{ key: 'id', value: rid }],
173
+ },
174
+ onCreate: () => {
175
+ const dialog = new ShareDialog(gvc.glitter);
176
+ UmClass.getUserData(gvc).then((resp) => {
177
+ try {
178
+ const mem = resp.member.find((d) => {
179
+ return d.trigger;
180
+ });
181
+ if (subData.content.show_auth.value.includes(mem.id)) {
182
+ document.querySelector(`#${rid}`).outerHTML = startRender();
183
+ }
184
+ else {
185
+ if (GlobalUser.token) {
186
+ dialog.errorMessage({ text: Language.text('no_access_permission') });
187
+ gvc.glitter.href = '/index';
188
+ }
189
+ else {
190
+ GlobalUser.loginRedirect = location.href;
191
+ gvc.glitter.href = '/login';
192
+ }
193
+ }
194
+ }
195
+ catch (e) {
194
196
  if (GlobalUser.token) {
195
197
  dialog.errorMessage({ text: Language.text('no_access_permission') });
196
198
  gvc.glitter.href = '/index';
@@ -200,35 +202,27 @@ ${(dd.language_data && dd.language_data[Language.getLanguage()].text) || dd.text
200
202
  gvc.glitter.href = '/login';
201
203
  }
202
204
  }
203
- }
204
- catch (e) {
205
- if (GlobalUser.token) {
206
- dialog.errorMessage({ text: Language.text('no_access_permission') });
207
- gvc.glitter.href = '/index';
208
- }
209
- else {
210
- GlobalUser.loginRedirect = location.href;
211
- gvc.glitter.href = '/login';
212
- }
213
- }
214
- });
215
- },
216
- };
217
- });
205
+ });
206
+ },
207
+ };
208
+ });
209
+ }
210
+ else {
211
+ return startRender();
212
+ }
218
213
  }
219
214
  else {
220
215
  return startRender();
221
216
  }
222
217
  }
223
- else {
224
- return startRender();
225
- }
226
- }
227
- })();
228
- document.querySelector(`.${bid}`).outerHTML = [
229
- ogHeaderView,
230
- view
231
- ].join('');
218
+ })();
219
+ document.querySelector(`.${bid}`).outerHTML = [
220
+ ogHeaderView,
221
+ view
222
+ ].join('');
223
+ }
224
+ catch (e) {
225
+ }
232
226
  initial = true;
233
227
  }
234
228
  catch (e) {
package/lowcode/public-components/blogs/blogs-01.ts CHANGED
@@ -51,21 +51,12 @@ export class Blogs01 {
51
51
  },
52
52
  {}
53
53
  );
54
- if (subData.content.generator !== 'page_editor') {
55
- const dd = subData.content;
56
- document.querySelector(`.${bid}`)!.outerHTML = [
57
- ogHeaderView,
58
- `<div class="container mx-auto fr-view mb-5" style="max-width: 1100px;font-family: 'Source Sans Pro', 'Open Sans', 'Helvetica Neue', Helvetica, Arial, 'Hiragino Sans GB', 'Microsoft YaHei', '微软雅黑', 'STHeiti', 'WenQuanYi Micro Hei', SimSun, sans-serif;">
59
- <h1 class="my-5 w-100 text-center p-0" style="color:${subData.content.title};font-size:${document.body.clientWidth > 800 ? `32px` : `24px`};font-weight: 600;">
60
- ${(dd.language_data && dd.language_data[Language.getLanguage()].title) || dd.title}
61
- </h1>
62
- ${(dd.language_data && dd.language_data[Language.getLanguage()].text) || dd.text}</div>`
63
- ].join('');
64
- return
65
- }
54
+
66
55
  console.log(`o_header===>`,o_header)
67
56
  console.log(`subData===>`,subData)
68
- subData.content.config=subData.content.config.filter((dd:any)=> dd.data.tag!=='c_header')
57
+ subData.content.config=subData.content.config??[]
58
+ try {
59
+ subData.content.config=subData.content.config.filter((dd:any)=> dd.data.tag!=='c_header')
69
60
  //pages的自訂View
70
61
  const view = (() => {
71
62
  if (subData.content.generator !== 'page_editor') {
@@ -77,8 +68,8 @@ ${(dd.language_data && dd.language_data[Language.getLanguage()].text) || dd.text
77
68
  <h1
78
69
  class="my-5 w-100 text-center p-0"
79
70
  style="color:${subData.content.title};font-size:${document.body.clientWidth > 800
80
- ? `32px`
81
- : `24px`};font-weight: 600;"
71
+ ? `32px`
72
+ : `24px`};font-weight: 600;"
82
73
  >
83
74
  ${(dd.language_data && dd.language_data[Language.getLanguage()].title) || dd.title}
84
75
  </h1>
@@ -251,6 +242,9 @@ ${(dd.language_data && dd.language_data[Language.getLanguage()].text) || dd.text
251
242
  ogHeaderView,
252
243
  view
253
244
  ].join('');
245
+ }catch (e) {
246
+
247
+ }
254
248
  initial = true;
255
249
  } catch (e) {
256
250
  console.log(e)
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "ts-glitter",
3
- "version": "21.4.6",
3
+ "version": "21.4.7",
4
4
  "description": "",
5
5
  "main": "index.js",
6
6
  "scripts": {