ts-glitter 21.1.3 → 21.1.5

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 (11) hide show
  1. package/lowcode/Entry.js +1 -1
  2. package/lowcode/Entry.ts +1 -1
  3. package/lowcode/cms-plugin/customer-message-user.js +27 -2
  4. package/lowcode/cms-plugin/customer-message-user.ts +27 -1
  5. package/lowcode/glitterBundle/html-component/widget.js +3 -16
  6. package/lowcode/glitterBundle/html-component/widget.ts +18 -15
  7. package/lowcode/jspage/editor.js +2 -2
  8. package/lowcode/jspage/editor.ts +2 -2
  9. package/lowcode/official_view_component/official/component.js +4 -17
  10. package/lowcode/official_view_component/official/component.ts +21 -17
  11. 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.1.3';
149
+ glitter.share.editerVersion = 'V_21.1.5';
150
150
  glitter.share.start = new Date();
151
151
  const vm = { appConfig: [] };
152
152
  window.saasConfig = {
package/lowcode/Entry.ts CHANGED
@@ -149,7 +149,7 @@ export class Entry {
149
149
  }
150
150
  (window as any).renderClock = (window as any).renderClock ?? createClock();
151
151
  console.log(`Entry-time:`, (window as any).renderClock.stop());
152
- glitter.share.editerVersion = 'V_21.1.3';
152
+ glitter.share.editerVersion = 'V_21.1.5';
153
153
  glitter.share.start = new Date();
154
154
  const vm = { appConfig: [] };
155
155
  (window as any).saasConfig = {
package/lowcode/cms-plugin/customer-message-user.js CHANGED
@@ -176,8 +176,33 @@ export class CustomerMessageUser {
176
176
  style="background-color: ${config
177
177
  .color};width: 58px;height: 58px ;cursor: pointer;display: flex;align-items: center;justify-content: center;position: fixed;left: 20px;bottom:20px;z-index: 100;"
178
178
  onclick="${gvc.event(() => {
179
- open = !open;
180
- gvc.notifyDataChange(viewId);
179
+ if (document.body.clientWidth < 800) {
180
+ if (!GlobalUser.token) {
181
+ gvc.glitter.href = '/login';
182
+ }
183
+ const userID = (() => {
184
+ if (GlobalUser.token) {
185
+ return GlobalUser.parseJWT(GlobalUser.token).payload.userID;
186
+ }
187
+ else {
188
+ return gvc.glitter.macAddress;
189
+ }
190
+ })();
191
+ gvc.glitter.getModule(new URL('./cms-plugin/customer-message-user.js', gvc.glitter.root_path).href, cl => {
192
+ cl.mobileChat({
193
+ gvc: gvc,
194
+ chat: {
195
+ chat_id: [`${userID}`, 'manager'].sort().join('-'),
196
+ type: 'user',
197
+ },
198
+ user_id: `${userID}`,
199
+ });
200
+ });
201
+ }
202
+ else {
203
+ open = !open;
204
+ gvc.notifyDataChange(viewId);
205
+ }
181
206
  })}"
182
207
  >
183
208
  <i class="${open ? `fa-sharp fa-regular fa-xmark` : `fa-solid fa-message-dots `}"
package/lowcode/cms-plugin/customer-message-user.ts CHANGED
@@ -206,8 +206,34 @@ export class CustomerMessageUser {
206
206
  style="background-color: ${config
207
207
  .color};width: 58px;height: 58px ;cursor: pointer;display: flex;align-items: center;justify-content: center;position: fixed;left: 20px;bottom:20px;z-index: 100;"
208
208
  onclick="${gvc.event(() => {
209
+ if(document.body.clientWidth<800){
210
+ if (!GlobalUser.token) {
211
+ gvc.glitter.href = '/login';
212
+ }
213
+ const userID = (() => {
214
+ if (GlobalUser.token) {
215
+ return GlobalUser.parseJWT(GlobalUser.token).payload.userID;
216
+ } else {
217
+ return gvc.glitter.macAddress;
218
+ }
219
+ })();
220
+ gvc.glitter.getModule(
221
+ new URL('./cms-plugin/customer-message-user.js', gvc.glitter.root_path).href,
222
+ cl => {
223
+ cl.mobileChat({
224
+ gvc: gvc,
225
+ chat: {
226
+ chat_id: [`${userID}`, 'manager'].sort().join('-'),
227
+ type: 'user',
228
+ },
229
+ user_id: `${userID}`,
230
+ });
231
+ }
232
+ );
233
+ }else{
209
234
  open = !open;
210
- gvc.notifyDataChange(viewId);
235
+ gvc.notifyDataChange(viewId);
236
+ }
211
237
  })}"
212
238
  >
213
239
  <i class="${open ? `fa-sharp fa-regular fa-xmark` : `fa-solid fa-message-dots `}"
package/lowcode/glitterBundle/html-component/widget.js CHANGED
@@ -749,22 +749,9 @@ export const widgetComponent = {
749
749
  if (vm.type === 'editor') {
750
750
  return;
751
751
  }
752
- const select_ = glitter.share.findWidgetIndex(glitter.share.editorViewModel.selectItem.id);
753
- if (select_.container_cf) {
754
- const gvc_ = gvc.glitter.document.querySelector('.iframe_view').contentWindow.glitter.pageConfig[0].gvc;
755
- gvc_.glitter.htmlGenerate.selectWidget({
756
- widget: select_.container_cf,
757
- widgetComponentID: select_.container_cf.id,
758
- gvc: gvc_,
759
- scroll_to_hover: true,
760
- glitter: glitter,
761
- });
762
- }
763
- else {
764
- Storage.lastSelect = '';
765
- gvc.glitter.share.editorViewModel.selectItem = undefined;
766
- gvc.glitter.share.selectEditorItem();
767
- }
752
+ Storage.lastSelect = '';
753
+ gvc.glitter.share.editorViewModel.selectItem = undefined;
754
+ gvc.glitter.share.selectEditorItem();
768
755
  })
769
756
  }]
770
757
  }
package/lowcode/glitterBundle/html-component/widget.ts CHANGED
@@ -787,21 +787,24 @@ export const widgetComponent = {
787
787
  if (vm.type === 'editor') {
788
788
  return
789
789
  }
790
- const select_ = glitter.share.findWidgetIndex(glitter.share.editorViewModel.selectItem.id)
791
- if (select_.container_cf) {
792
- const gvc_ = gvc.glitter.document.querySelector('.iframe_view').contentWindow.glitter.pageConfig[0].gvc
793
- gvc_.glitter.htmlGenerate.selectWidget({
794
- widget: select_.container_cf,
795
- widgetComponentID: select_.container_cf.id,
796
- gvc: gvc_,
797
- scroll_to_hover: true,
798
- glitter: glitter,
799
- });
800
- } else {
801
- Storage.lastSelect = '';
802
- gvc.glitter.share.editorViewModel.selectItem = undefined;
803
- gvc.glitter.share.selectEditorItem();
804
- }
790
+ Storage.lastSelect = '';
791
+ gvc.glitter.share.editorViewModel.selectItem = undefined;
792
+ gvc.glitter.share.selectEditorItem();
793
+ // const select_ = glitter.share.findWidgetIndex(glitter.share.editorViewModel.selectItem.id)
794
+ // if (select_.container_cf) {
795
+ // const gvc_ = gvc.glitter.document.querySelector('.iframe_view').contentWindow.glitter.pageConfig[0].gvc
796
+ // gvc_.glitter.htmlGenerate.selectWidget({
797
+ // widget: select_.container_cf,
798
+ // widgetComponentID: select_.container_cf.id,
799
+ // gvc: gvc_,
800
+ // scroll_to_hover: true,
801
+ // glitter: glitter,
802
+ // });
803
+ // } else {
804
+ // Storage.lastSelect = '';
805
+ // gvc.glitter.share.editorViewModel.selectItem = undefined;
806
+ // gvc.glitter.share.selectEditorItem();
807
+ // }
805
808
  })
806
809
  }]
807
810
  }
package/lowcode/jspage/editor.js CHANGED
@@ -247,10 +247,10 @@ export class Editor {
247
247
  style="word-break: break-word;white-space: nowrap;background:whitesmoke;height:${window.innerHeight}px;"
248
248
  >
249
249
  <header
250
- class="header navbar navbar-expand navbar-light bg-light border-bottom fixed-top "
250
+ class="header navbar navbar-expand navbar-light bg-light border-bottom fixed-top "
251
251
  data-scroll-header
252
252
  style="${parseInt(glitter.share.top_inset, 10)
253
- ? `padding-top:${glitter.share.top_inset || 0}px;min-height: 56px;`
253
+ ? `padding-top:${glitter.share.top_inset || 0}px;min-height: 56px;padding-bottom: 0px !important;`
254
254
  : `height:56px;`}"
255
255
  >
256
256
  <div
package/lowcode/jspage/editor.ts CHANGED
@@ -249,10 +249,10 @@ export class Editor {
249
249
  style="word-break: break-word;white-space: nowrap;background:whitesmoke;height:${window.innerHeight}px;"
250
250
  >
251
251
  <header
252
- class="header navbar navbar-expand navbar-light bg-light border-bottom fixed-top "
252
+ class="header navbar navbar-expand navbar-light bg-light border-bottom fixed-top "
253
253
  data-scroll-header
254
254
  style="${parseInt(glitter.share.top_inset, 10)
255
- ? `padding-top:${glitter.share.top_inset || 0}px;min-height: 56px;`
255
+ ? `padding-top:${glitter.share.top_inset || 0}px;min-height: 56px;padding-bottom: 0px !important;`
256
256
  : `height:56px;`}"
257
257
  >
258
258
  <div
package/lowcode/official_view_component/official/component.js CHANGED
@@ -811,23 +811,10 @@ export const component = Plugin.createComponent(import.meta.url, (glitter, editM
811
811
  return;
812
812
  }
813
813
  const select_ = glitter.share.findWidgetIndex(glitter.share.editorViewModel.selectItem.id);
814
- if (select_.container_cf) {
815
- const gvc_ = gvc.glitter.document.querySelector('.iframe_view')
816
- .contentWindow.glitter.pageConfig[0].gvc;
817
- gvc_.glitter.htmlGenerate.selectWidget({
818
- widget: select_.container_cf,
819
- widgetComponentID: select_.container_cf.id,
820
- gvc: gvc_,
821
- scroll_to_hover: true,
822
- glitter: glitter,
823
- });
824
- }
825
- else {
826
- Storage.lastSelect = '';
827
- gvc.glitter.share.editorViewModel.selectItem =
828
- undefined;
829
- gvc.glitter.share.selectEditorItem();
830
- }
814
+ Storage.lastSelect = '';
815
+ gvc.glitter.share.editorViewModel.selectItem =
816
+ undefined;
817
+ gvc.glitter.share.selectEditorItem();
831
818
  }),
832
819
  },
833
820
  ],
package/lowcode/official_view_component/official/component.ts CHANGED
@@ -873,23 +873,27 @@ export const component = Plugin.createComponent(import.meta.url, (glitter: Glitt
873
873
  const select_ = glitter.share.findWidgetIndex(
874
874
  glitter.share.editorViewModel.selectItem.id
875
875
  );
876
- if (select_.container_cf) {
877
- const gvc_ =
878
- gvc.glitter.document.querySelector('.iframe_view')
879
- .contentWindow.glitter.pageConfig[0].gvc;
880
- gvc_.glitter.htmlGenerate.selectWidget({
881
- widget: select_.container_cf,
882
- widgetComponentID: select_.container_cf.id,
883
- gvc: gvc_,
884
- scroll_to_hover: true,
885
- glitter: glitter,
886
- });
887
- } else {
888
- Storage.lastSelect = '';
889
- gvc.glitter.share.editorViewModel.selectItem =
890
- undefined;
891
- gvc.glitter.share.selectEditorItem();
892
- }
876
+ Storage.lastSelect = '';
877
+ gvc.glitter.share.editorViewModel.selectItem =
878
+ undefined;
879
+ gvc.glitter.share.selectEditorItem();
880
+ // if (select_.container_cf) {
881
+ // const gvc_ =
882
+ // gvc.glitter.document.querySelector('.iframe_view')
883
+ // .contentWindow.glitter.pageConfig[0].gvc;
884
+ // gvc_.glitter.htmlGenerate.selectWidget({
885
+ // widget: select_.container_cf,
886
+ // widgetComponentID: select_.container_cf.id,
887
+ // gvc: gvc_,
888
+ // scroll_to_hover: true,
889
+ // glitter: glitter,
890
+ // });
891
+ // } else {
892
+ // Storage.lastSelect = '';
893
+ // gvc.glitter.share.editorViewModel.selectItem =
894
+ // undefined;
895
+ // gvc.glitter.share.selectEditorItem();
896
+ // }
893
897
  }),
894
898
  },
895
899
  ],
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "ts-glitter",
3
- "version": "21.1.3",
3
+ "version": "21.1.5",
4
4
  "description": "",
5
5
  "main": "index.js",
6
6
  "scripts": {