clickgo 3.1.1-dev10 → 3.1.2-dev11

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 (33) hide show
  1. package/dist/app/demo/app.js +2 -1
  2. package/dist/app/demo/form/main.js +5 -0
  3. package/dist/app/demo/form/main.xml +1 -0
  4. package/dist/app/demo/form/method/aform/aform.js +57 -0
  5. package/dist/app/demo/form/method/aform/aform.xml +34 -0
  6. package/dist/app/demo/form/method/aform/test.xml +6 -0
  7. package/dist/app/demo/form/method/form/form.js +2 -20
  8. package/dist/app/demo/form/method/form/form.xml +5 -12
  9. package/dist/app/task/form/bar/bar.js +1 -1
  10. package/dist/clickgo.js +16 -4
  11. package/dist/clickgo.ts +21 -2
  12. package/dist/control/common.cgc +0 -0
  13. package/dist/control/form.cgc +0 -0
  14. package/dist/control/monaco.cgc +0 -0
  15. package/dist/control/property.cgc +0 -0
  16. package/dist/control/task.cgc +0 -0
  17. package/dist/global.css +1 -1
  18. package/dist/index.js +25 -5
  19. package/dist/index.ts +30 -4
  20. package/dist/lib/control.js +5 -1
  21. package/dist/lib/control.ts +5 -1
  22. package/dist/lib/form.js +27 -18
  23. package/dist/lib/form.ts +29 -18
  24. package/dist/lib/fs.js +1 -1
  25. package/dist/lib/fs.ts +1 -1
  26. package/dist/lib/native.js +1 -1
  27. package/dist/lib/native.ts +1 -1
  28. package/dist/lib/task.js +16 -26
  29. package/dist/lib/task.ts +17 -48
  30. package/dist/theme/familiar.cgt +0 -0
  31. package/package.json +1 -1
  32. package/types/index.d.ts +3 -5
  33. package/dist/app/demo/form/method/form/test.xml +0 -5
package/dist/lib/form.js CHANGED
@@ -232,7 +232,7 @@ class AbstractForm {
232
232
  }
233
233
  show() {
234
234
  const v = this;
235
- v.$refs.form.$data.showData = true;
235
+ v.$refs.form.$data.isShow = true;
236
236
  if (this._firstShow) {
237
237
  this._firstShow = false;
238
238
  const area = core.getAvailArea();
@@ -244,12 +244,13 @@ class AbstractForm {
244
244
  v.$refs.form.setPropData('top', (area.height - v.$el.offsetHeight) / 2);
245
245
  }
246
246
  }
247
- v.$refs.form.$data.showData = true;
247
+ v.$refs.form.$data.isShow = true;
248
248
  changeFocus(this.formId);
249
249
  }
250
250
  }
251
251
  showDialog() {
252
252
  return __awaiter(this, void 0, void 0, function* () {
253
+ this.topMost = true;
253
254
  this.show();
254
255
  task.list[this.taskId].runtime.dialogFormIds.push(this.formId);
255
256
  return new Promise((resolve) => {
@@ -261,7 +262,7 @@ class AbstractForm {
261
262
  }
262
263
  hide() {
263
264
  const v = this;
264
- v.$refs.form.$data.showData = false;
265
+ v.$refs.form.$data.isShow = false;
265
266
  }
266
267
  onBeforeCreate() {
267
268
  return;
@@ -357,7 +358,7 @@ const elements = {
357
358
  'init': function () {
358
359
  this.wrap.id = 'cg-wrap';
359
360
  document.getElementsByTagName('body')[0].appendChild(this.wrap);
360
- if (clickgo.getNative() && (clickgo.getPlatform() === 'win32')) {
361
+ if (clickgo.isImmersion()) {
361
362
  this.wrap.addEventListener('mouseenter', function () {
362
363
  native.invoke('cg-mouse-ignore', native.getToken(), false);
363
364
  });
@@ -751,10 +752,10 @@ function get(formId) {
751
752
  return {
752
753
  'taskId': taskId,
753
754
  'title': item.vroot.$refs.form.title,
754
- 'icon': item.vroot.$refs.form.iconData,
755
+ 'icon': item.vroot.$refs.form.iconDataUrl,
755
756
  'stateMax': item.vroot.$refs.form.stateMaxData,
756
757
  'stateMin': item.vroot.$refs.form.stateMinData,
757
- 'show': item.vroot.$refs.form.showData,
758
+ 'show': item.vroot.$refs.form.isShow,
758
759
  'focus': item.vroot.formFocus
759
760
  };
760
761
  }
@@ -778,10 +779,10 @@ function getList(taskId) {
778
779
  list[fid] = {
779
780
  'taskId': taskId,
780
781
  'title': item.vroot.$refs.form.title,
781
- 'icon': item.vroot.$refs.form.iconData,
782
+ 'icon': item.vroot.$refs.form.iconDataUrl,
782
783
  'stateMax': item.vroot.$refs.form.stateMaxData,
783
784
  'stateMin': item.vroot.$refs.form.stateMinData,
784
- 'show': item.vroot.$refs.form.showData,
785
+ 'show': item.vroot.$refs.form.isShow,
785
786
  'focus': item.vroot.formFocus
786
787
  };
787
788
  }
@@ -836,10 +837,10 @@ function changeFocus(formId = 0) {
836
837
  min(dialogFormId);
837
838
  }
838
839
  if (t.forms[dialogFormId].vroot._topMost) {
839
- t.forms[dialogFormId].vroot.$refs.form.$data.zIndexData = ++info.topLastZIndex;
840
+ t.forms[dialogFormId].vroot.$refs.form.$data.zIndex = ++info.topLastZIndex;
840
841
  }
841
842
  else {
842
- t.forms[dialogFormId].vroot.$refs.form.$data.zIndexData = ++info.lastZIndex;
843
+ t.forms[dialogFormId].vroot.$refs.form.$data.zIndex = ++info.lastZIndex;
843
844
  }
844
845
  t.forms[dialogFormId].vapp._container.dataset.formFocus = '';
845
846
  t.forms[dialogFormId].vroot._formFocus = true;
@@ -850,10 +851,10 @@ function changeFocus(formId = 0) {
850
851
  }
851
852
  else {
852
853
  if (t.forms[formId].vroot._topMost) {
853
- t.forms[formId].vroot.$refs.form.$data.zIndexData = ++info.topLastZIndex;
854
+ t.forms[formId].vroot.$refs.form.$data.zIndex = ++info.topLastZIndex;
854
855
  }
855
856
  else {
856
- t.forms[formId].vroot.$refs.form.$data.zIndexData = ++info.lastZIndex;
857
+ t.forms[formId].vroot.$refs.form.$data.zIndex = ++info.lastZIndex;
857
858
  }
858
859
  t.forms[formId].vapp._container.dataset.formFocus = '';
859
860
  t.forms[formId].vroot._formFocus = true;
@@ -1399,12 +1400,12 @@ function remove(formId) {
1399
1400
  let icon = '';
1400
1401
  if (task.list[taskId].forms[formId]) {
1401
1402
  title = task.list[taskId].forms[formId].vroot.$refs.form.title;
1402
- icon = task.list[taskId].forms[formId].vroot.$refs.form.iconData;
1403
+ icon = task.list[taskId].forms[formId].vroot.$refs.form.iconDataUrl;
1403
1404
  const io = task.list[taskId].runtime.dialogFormIds.indexOf(formId);
1404
1405
  if (io > -1) {
1405
1406
  task.list[taskId].runtime.dialogFormIds.splice(io, 1);
1406
1407
  }
1407
- task.list[taskId].forms[formId].vroot.$refs.form.$data.showData = false;
1408
+ task.list[taskId].forms[formId].vroot.$refs.form.$data.isShow = false;
1408
1409
  setTimeout(function () {
1409
1410
  const fid = getMaxZIndexID({
1410
1411
  'formIds': [formId]
@@ -1564,12 +1565,12 @@ function create(opt) {
1564
1565
  changeFocus(form.id);
1565
1566
  }
1566
1567
  else {
1567
- form.vroot.$refs.form.$data.zIndexData = ++info.topLastZIndex;
1568
+ form.vroot.$refs.form.$data.zIndex = ++info.topLastZIndex;
1568
1569
  }
1569
1570
  }
1570
1571
  else {
1571
1572
  form.vroot.$data._topMost = false;
1572
- form.vroot.$refs.form.$data.zIndexData = ++info.lastZIndex;
1573
+ form.vroot.$refs.form.$data.zIndex = ++info.lastZIndex;
1573
1574
  }
1574
1575
  return;
1575
1576
  }
@@ -1596,7 +1597,7 @@ function create(opt) {
1596
1597
  'current': t.current,
1597
1598
  'files': t.app.files
1598
1599
  });
1599
- this.$refs.form.iconData = (icon instanceof Blob) ? yield tool.blob2DataUrl(icon) : '';
1600
+ this.$refs.form.iconDataUrl = (icon instanceof Blob) ? yield tool.blob2DataUrl(icon) : '';
1600
1601
  }
1601
1602
  resolve({
1602
1603
  'vapp': vapp,
@@ -1653,7 +1654,15 @@ function create(opt) {
1653
1654
  return -8;
1654
1655
  }
1655
1656
  }
1656
- core.trigger('formCreated', opt.taskId, formId, rtn.vroot.$refs.form.title, rtn.vroot.$refs.form.iconData);
1657
+ core.trigger('formCreated', opt.taskId, formId, rtn.vroot.$refs.form.title, rtn.vroot.$refs.form.iconDataUrl);
1658
+ if (clickgo.isNative() && (formId === 1) && !clickgo.isImmersion() && !clickgo.hasFrame()) {
1659
+ rtn.vroot.$refs.form.isNativeSync = true;
1660
+ native.invoke('cg-set-size', native.getToken(), rtn.vroot.$refs.form.$el.offsetWidth, rtn.vroot.$refs.form.$el.offsetHeight);
1661
+ window.addEventListener('resize', function () {
1662
+ rtn.vroot.$refs.form.setPropData('width', window.innerWidth);
1663
+ rtn.vroot.$refs.form.setPropData('height', window.innerHeight);
1664
+ });
1665
+ }
1657
1666
  return formId;
1658
1667
  });
1659
1668
  }
package/dist/lib/form.ts CHANGED
@@ -352,7 +352,7 @@ export class AbstractForm {
352
352
  public show(): void {
353
353
  // --- 创建成功的窗体，可以直接显示 ---
354
354
  const v = this as any;
355
- v.$refs.form.$data.showData = true;
355
+ v.$refs.form.$data.isShow = true;
356
356
  if (this._firstShow) {
357
357
  this._firstShow = false;
358
358
  // --- 将窗体居中 ---
@@ -365,7 +365,7 @@ export class AbstractForm {
365
365
  v.$refs.form.setPropData('top', (area.height - v.$el.offsetHeight) / 2);
366
366
  }
367
367
  }
368
- v.$refs.form.$data.showData = true;
368
+ v.$refs.form.$data.isShow = true;
369
369
  changeFocus(this.formId);
370
370
  }
371
371
  }
@@ -374,6 +374,7 @@ export class AbstractForm {
374
374
  * --- 显示独占的窗体 ---
375
375
  */
376
376
  public async showDialog(): Promise<string> {
377
+ this.topMost = true;
377
378
  this.show();
378
379
  task.list[this.taskId].runtime.dialogFormIds.push(this.formId);
379
380
  return new Promise((resolve) => {
@@ -388,7 +389,7 @@ export class AbstractForm {
388
389
  */
389
390
  public hide(): void {
390
391
  const v = this as any;
391
- v.$refs.form.$data.showData = false;
392
+ v.$refs.form.$data.isShow = false;
392
393
  }
393
394
 
394
395
  /**
@@ -575,7 +576,8 @@ const elements: {
575
576
  /** --- clickgo 所有的 div wrap --- */
576
577
  this.wrap.id = 'cg-wrap';
577
578
  document.getElementsByTagName('body')[0].appendChild(this.wrap);
578
- if (clickgo.getNative() && (clickgo.getPlatform() === 'win32')) {
579
+ if (clickgo.isImmersion()) {
580
+ // --- 只有沉浸式模式（Windows 下非 frame 的 native）才会绑定这个事件 ---
579
581
  this.wrap.addEventListener('mouseenter', function() {
580
582
  native.invoke('cg-mouse-ignore', native.getToken(), false);
581
583
  });
@@ -1040,10 +1042,10 @@ export function get(formId: number): types.IFormInfo | null {
1040
1042
  return {
1041
1043
  'taskId': taskId,
1042
1044
  'title': item.vroot.$refs.form.title,
1043
- 'icon': item.vroot.$refs.form.iconData,
1045
+ 'icon': item.vroot.$refs.form.iconDataUrl,
1044
1046
  'stateMax': item.vroot.$refs.form.stateMaxData,
1045
1047
  'stateMin': item.vroot.$refs.form.stateMinData,
1046
- 'show': item.vroot.$refs.form.showData,
1048
+ 'show': item.vroot.$refs.form.isShow,
1047
1049
  'focus': item.vroot.formFocus
1048
1050
  };
1049
1051
  }
@@ -1076,10 +1078,10 @@ export function getList(taskId: number): Record<string, types.IFormInfo> {
1076
1078
  list[fid] = {
1077
1079
  'taskId': taskId,
1078
1080
  'title': item.vroot.$refs.form.title,
1079
- 'icon': item.vroot.$refs.form.iconData,
1081
+ 'icon': item.vroot.$refs.form.iconDataUrl,
1080
1082
  'stateMax': item.vroot.$refs.form.stateMaxData,
1081
1083
  'stateMin': item.vroot.$refs.form.stateMinData,
1082
- 'show': item.vroot.$refs.form.showData,
1084
+ 'show': item.vroot.$refs.form.isShow,
1083
1085
  'focus': item.vroot.formFocus
1084
1086
  };
1085
1087
  }
@@ -1143,10 +1145,10 @@ export function changeFocus(formId: number = 0): void {
1143
1145
  min(dialogFormId);
1144
1146
  }
1145
1147
  if (t.forms[dialogFormId].vroot._topMost) {
1146
- t.forms[dialogFormId].vroot.$refs.form.$data.zIndexData = ++info.topLastZIndex;
1148
+ t.forms[dialogFormId].vroot.$refs.form.$data.zIndex = ++info.topLastZIndex;
1147
1149
  }
1148
1150
  else {
1149
- t.forms[dialogFormId].vroot.$refs.form.$data.zIndexData = ++info.lastZIndex;
1151
+ t.forms[dialogFormId].vroot.$refs.form.$data.zIndex = ++info.lastZIndex;
1150
1152
  }
1151
1153
  // --- 开启 focus ---
1152
1154
  t.forms[dialogFormId].vapp._container.dataset.formFocus = '';
@@ -1162,10 +1164,10 @@ export function changeFocus(formId: number = 0): void {
1162
1164
  else {
1163
1165
  // --- 没有 dialog，才修改 zindex ---
1164
1166
  if (t.forms[formId].vroot._topMost) {
1165
- t.forms[formId].vroot.$refs.form.$data.zIndexData = ++info.topLastZIndex;
1167
+ t.forms[formId].vroot.$refs.form.$data.zIndex = ++info.topLastZIndex;
1166
1168
  }
1167
1169
  else {
1168
- t.forms[formId].vroot.$refs.form.$data.zIndexData = ++info.lastZIndex;
1170
+ t.forms[formId].vroot.$refs.form.$data.zIndex = ++info.lastZIndex;
1169
1171
  }
1170
1172
  // --- 正常开启 focus ---
1171
1173
  t.forms[formId].vapp._container.dataset.formFocus = '';
@@ -1824,13 +1826,13 @@ export function remove(formId: number): boolean {
1824
1826
  let icon = '';
1825
1827
  if (task.list[taskId].forms[formId]) {
1826
1828
  title = task.list[taskId].forms[formId].vroot.$refs.form.title;
1827
- icon = task.list[taskId].forms[formId].vroot.$refs.form.iconData;
1829
+ icon = task.list[taskId].forms[formId].vroot.$refs.form.iconDataUrl;
1828
1830
  const io = task.list[taskId].runtime.dialogFormIds.indexOf(formId);
1829
1831
  if (io > -1) {
1830
1832
  // --- 取消 dialog mask 记录 ---
1831
1833
  task.list[taskId].runtime.dialogFormIds.splice(io, 1);
1832
1834
  }
1833
- task.list[taskId].forms[formId].vroot.$refs.form.$data.showData = false;
1835
+ task.list[taskId].forms[formId].vroot.$refs.form.$data.isShow = false;
1834
1836
  setTimeout(function() {
1835
1837
  // --- 获取最大的 z index 窗体，并让他获取焦点 ---
1836
1838
  const fid = getMaxZIndexID({
@@ -2026,13 +2028,13 @@ export async function create(opt: types.IFormCreateOptions): Promise<number> {
2026
2028
  changeFocus(form.id);
2027
2029
  }
2028
2030
  else {
2029
- form.vroot.$refs.form.$data.zIndexData = ++info.topLastZIndex;
2031
+ form.vroot.$refs.form.$data.zIndex = ++info.topLastZIndex;
2030
2032
  }
2031
2033
  }
2032
2034
  else {
2033
2035
  // --- 取消置顶 ---
2034
2036
  form.vroot.$data._topMost = false;
2035
- form.vroot.$refs.form.$data.zIndexData = ++info.lastZIndex;
2037
+ form.vroot.$refs.form.$data.zIndex = ++info.lastZIndex;
2036
2038
  }
2037
2039
  return;
2038
2040
  }
@@ -2068,7 +2070,7 @@ export async function create(opt: types.IFormCreateOptions): Promise<number> {
2068
2070
  'current': t.current,
2069
2071
  'files': t.app.files
2070
2072
  });
2071
- this.$refs.form.iconData = (icon instanceof Blob) ? await tool.blob2DataUrl(icon) : '';
2073
+ this.$refs.form.iconDataUrl = (icon instanceof Blob) ? await tool.blob2DataUrl(icon) : '';
2072
2074
  }
2073
2075
  // --- 完成 ---
2074
2076
  resolve({
@@ -2130,7 +2132,16 @@ export async function create(opt: types.IFormCreateOptions): Promise<number> {
2130
2132
  }
2131
2133
  }
2132
2134
  // --- 触发 formCreated 事件 ---
2133
- core.trigger('formCreated', opt.taskId, formId, rtn.vroot.$refs.form.title, rtn.vroot.$refs.form.iconData);
2135
+ core.trigger('formCreated', opt.taskId, formId, rtn.vroot.$refs.form.title, rtn.vroot.$refs.form.iconDataUrl);
2136
+ // --- 判断是否要与 native 实体窗体大小同步 ---
2137
+ if (clickgo.isNative() && (formId === 1) && !clickgo.isImmersion() && !clickgo.hasFrame()) {
2138
+ rtn.vroot.$refs.form.isNativeSync = true;
2139
+ native.invoke('cg-set-size', native.getToken(), rtn.vroot.$refs.form.$el.offsetWidth, rtn.vroot.$refs.form.$el.offsetHeight);
2140
+ window.addEventListener('resize', function(): void {
2141
+ rtn.vroot.$refs.form.setPropData('width', window.innerWidth);
2142
+ rtn.vroot.$refs.form.setPropData('height', window.innerHeight);
2143
+ });
2144
+ }
2134
2145
  return formId;
2135
2146
  }
2136
2147
 
package/dist/lib/fs.js CHANGED
@@ -11,7 +11,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
11
11
  Object.defineProperty(exports, "__esModule", { value: true });
12
12
  exports.copyFile = exports.copyFolder = exports.readDir = exports.rename = exports.chmod = exports.rmdirDeep = exports.rmdir = exports.mkdir = exports.isFile = exports.isDir = exports.stats = exports.unlink = exports.symlink = exports.readLink = exports.putContent = exports.getContent = void 0;
13
13
  const tool = require("./tool");
14
- const clickgoFiles = ['/app/', '/app/demo/', '/app/demo/app.js', '/app/demo/form/', '/app/demo/form/control/', '/app/demo/form/control/block/', '/app/demo/form/control/block/block.css', '/app/demo/form/control/block/block.xml', '/app/demo/form/control/button/', '/app/demo/form/control/button/button.css', '/app/demo/form/control/button/button.js', '/app/demo/form/control/button/button.xml', '/app/demo/form/control/check/', '/app/demo/form/control/check/check.js', '/app/demo/form/control/check/check.xml', '/app/demo/form/control/dialog/', '/app/demo/form/control/dialog/dialog.js', '/app/demo/form/control/dialog/dialog.xml', '/app/demo/form/control/file/', '/app/demo/form/control/file/file.js', '/app/demo/form/control/file/file.xml', '/app/demo/form/control/form/', '/app/demo/form/control/form/form.css', '/app/demo/form/control/form/form.js', '/app/demo/form/control/form/form.xml', '/app/demo/form/control/greatview/', '/app/demo/form/control/greatview/greatview.css', '/app/demo/form/control/greatview/greatview.js', '/app/demo/form/control/greatview/greatview.xml', '/app/demo/form/control/img/', '/app/demo/form/control/img/img.xml', '/app/demo/form/control/label/', '/app/demo/form/control/label/label.xml', '/app/demo/form/control/list/', '/app/demo/form/control/list/list.css', '/app/demo/form/control/list/list.js', '/app/demo/form/control/list/list.xml', '/app/demo/form/control/loading/', '/app/demo/form/control/loading/loading.xml', '/app/demo/form/control/marquee/', '/app/demo/form/control/marquee/marquee.js', '/app/demo/form/control/marquee/marquee.xml', '/app/demo/form/control/menu/', '/app/demo/form/control/menu/menu.js', '/app/demo/form/control/menu/menu.xml', '/app/demo/form/control/monaco/', '/app/demo/form/control/monaco/monaco.js', '/app/demo/form/control/monaco/monaco.xml', '/app/demo/form/control/overflow/', '/app/demo/form/control/overflow/overflow.css', '/app/demo/form/control/overflow/overflow.js', '/app/demo/form/control/overflow/overflow.xml', '/app/demo/form/control/property/', '/app/demo/form/control/property/property.js', '/app/demo/form/control/property/property.xml', '/app/demo/form/control/radio/', '/app/demo/form/control/radio/radio.js', '/app/demo/form/control/radio/radio.xml', '/app/demo/form/control/scroll/', '/app/demo/form/control/scroll/scroll.js', '/app/demo/form/control/scroll/scroll.xml', '/app/demo/form/control/select/', '/app/demo/form/control/select/select.js', '/app/demo/form/control/select/select.xml', '/app/demo/form/control/tab/', '/app/demo/form/control/tab/tab.js', '/app/demo/form/control/tab/tab.xml', '/app/demo/form/control/text/', '/app/demo/form/control/text/text.js', '/app/demo/form/control/text/text.xml', '/app/demo/form/control/view/', '/app/demo/form/control/view/view.css', '/app/demo/form/control/view/view.js', '/app/demo/form/control/view/view.xml', '/app/demo/form/event/', '/app/demo/form/event/form/', '/app/demo/form/event/form/form.css', '/app/demo/form/event/form/form.js', '/app/demo/form/event/form/form.xml', '/app/demo/form/event/screen/', '/app/demo/form/event/screen/screen.js', '/app/demo/form/event/screen/screen.xml', '/app/demo/form/event/task/', '/app/demo/form/event/task/task.js', '/app/demo/form/event/task/task.xml', '/app/demo/form/main.css', '/app/demo/form/main.js', '/app/demo/form/main.xml', '/app/demo/form/method/', '/app/demo/form/method/core/', '/app/demo/form/method/core/core.js', '/app/demo/form/method/core/core.xml', '/app/demo/form/method/dom/', '/app/demo/form/method/dom/dom.css', '/app/demo/form/method/dom/dom.js', '/app/demo/form/method/dom/dom.xml', '/app/demo/form/method/form/', '/app/demo/form/method/form/form.css', '/app/demo/form/method/form/form.js', '/app/demo/form/method/form/form.xml', '/app/demo/form/method/form/test.xml', '/app/demo/form/method/fs/', '/app/demo/form/method/fs/fs.js', '/app/demo/form/method/fs/fs.xml', '/app/demo/form/method/fs/text.js', '/app/demo/form/method/fs/text.xml', '/app/demo/form/method/task/', '/app/demo/form/method/task/locale1.json', '/app/demo/form/method/task/locale2.json', '/app/demo/form/method/task/task.js', '/app/demo/form/method/task/task.xml', '/app/demo/form/method/theme/', '/app/demo/form/method/theme/theme.js', '/app/demo/form/method/theme/theme.xml', '/app/demo/form/method/tool/', '/app/demo/form/method/tool/tool.js', '/app/demo/form/method/tool/tool.xml', '/app/demo/form/method/zip/', '/app/demo/form/method/zip/zip.js', '/app/demo/form/method/zip/zip.xml', '/app/demo/global.css', '/app/demo/res/', '/app/demo/res/icon.svg', '/app/demo/res/img.jpg', '/app/demo/res/r-1.svg', '/app/demo/res/r-2.svg', '/app/demo/res/sql.svg', '/app/demo/res/txt.svg', '/app/demo/res/zip.svg', '/app/task/', '/app/task/app.js', '/app/task/form/', '/app/task/form/bar/', '/app/task/form/bar/bar.js', '/app/task/form/bar/bar.xml', '/app/task/form/desktop/', '/app/task/form/desktop/desktop.xml', '/app/task/locale/', '/app/task/locale/en.json', '/app/task/locale/ja.json', '/app/task/locale/sc.json', '/app/task/locale/tc.json', '/clickgo.js', '/clickgo.ts', '/control/', '/control/common.cgc', '/control/form.cgc', '/control/monaco.cgc', '/control/property.cgc', '/control/task.cgc', '/global.css', '/icon.png', '/index.js', '/index.ts', '/lib/', '/lib/control.js', '/lib/control.ts', '/lib/core.js', '/lib/core.ts', '/lib/dom.js', '/lib/dom.ts', '/lib/form.js', '/lib/form.ts', '/lib/fs.js', '/lib/fs.ts', '/lib/native.js', '/lib/native.ts', '/lib/task.js', '/lib/task.ts', '/lib/theme.js', '/lib/theme.ts', '/lib/tool.js', '/lib/tool.ts', '/lib/zip.js', '/lib/zip.ts', '/theme/', '/theme/familiar.cgt'];
14
+ const clickgoFiles = ['/app/', '/app/demo/', '/app/demo/app.js', '/app/demo/form/', '/app/demo/form/control/', '/app/demo/form/control/block/', '/app/demo/form/control/block/block.css', '/app/demo/form/control/block/block.xml', '/app/demo/form/control/button/', '/app/demo/form/control/button/button.css', '/app/demo/form/control/button/button.js', '/app/demo/form/control/button/button.xml', '/app/demo/form/control/check/', '/app/demo/form/control/check/check.js', '/app/demo/form/control/check/check.xml', '/app/demo/form/control/dialog/', '/app/demo/form/control/dialog/dialog.js', '/app/demo/form/control/dialog/dialog.xml', '/app/demo/form/control/file/', '/app/demo/form/control/file/file.js', '/app/demo/form/control/file/file.xml', '/app/demo/form/control/form/', '/app/demo/form/control/form/form.css', '/app/demo/form/control/form/form.js', '/app/demo/form/control/form/form.xml', '/app/demo/form/control/greatview/', '/app/demo/form/control/greatview/greatview.css', '/app/demo/form/control/greatview/greatview.js', '/app/demo/form/control/greatview/greatview.xml', '/app/demo/form/control/img/', '/app/demo/form/control/img/img.xml', '/app/demo/form/control/label/', '/app/demo/form/control/label/label.xml', '/app/demo/form/control/list/', '/app/demo/form/control/list/list.css', '/app/demo/form/control/list/list.js', '/app/demo/form/control/list/list.xml', '/app/demo/form/control/loading/', '/app/demo/form/control/loading/loading.xml', '/app/demo/form/control/marquee/', '/app/demo/form/control/marquee/marquee.js', '/app/demo/form/control/marquee/marquee.xml', '/app/demo/form/control/menu/', '/app/demo/form/control/menu/menu.js', '/app/demo/form/control/menu/menu.xml', '/app/demo/form/control/monaco/', '/app/demo/form/control/monaco/monaco.js', '/app/demo/form/control/monaco/monaco.xml', '/app/demo/form/control/overflow/', '/app/demo/form/control/overflow/overflow.css', '/app/demo/form/control/overflow/overflow.js', '/app/demo/form/control/overflow/overflow.xml', '/app/demo/form/control/property/', '/app/demo/form/control/property/property.js', '/app/demo/form/control/property/property.xml', '/app/demo/form/control/radio/', '/app/demo/form/control/radio/radio.js', '/app/demo/form/control/radio/radio.xml', '/app/demo/form/control/scroll/', '/app/demo/form/control/scroll/scroll.js', '/app/demo/form/control/scroll/scroll.xml', '/app/demo/form/control/select/', '/app/demo/form/control/select/select.js', '/app/demo/form/control/select/select.xml', '/app/demo/form/control/tab/', '/app/demo/form/control/tab/tab.js', '/app/demo/form/control/tab/tab.xml', '/app/demo/form/control/text/', '/app/demo/form/control/text/text.js', '/app/demo/form/control/text/text.xml', '/app/demo/form/control/view/', '/app/demo/form/control/view/view.css', '/app/demo/form/control/view/view.js', '/app/demo/form/control/view/view.xml', '/app/demo/form/event/', '/app/demo/form/event/form/', '/app/demo/form/event/form/form.css', '/app/demo/form/event/form/form.js', '/app/demo/form/event/form/form.xml', '/app/demo/form/event/screen/', '/app/demo/form/event/screen/screen.js', '/app/demo/form/event/screen/screen.xml', '/app/demo/form/event/task/', '/app/demo/form/event/task/task.js', '/app/demo/form/event/task/task.xml', '/app/demo/form/main.css', '/app/demo/form/main.js', '/app/demo/form/main.xml', '/app/demo/form/method/', '/app/demo/form/method/aform/', '/app/demo/form/method/aform/aform.js', '/app/demo/form/method/aform/aform.xml', '/app/demo/form/method/aform/test.xml', '/app/demo/form/method/core/', '/app/demo/form/method/core/core.js', '/app/demo/form/method/core/core.xml', '/app/demo/form/method/dom/', '/app/demo/form/method/dom/dom.css', '/app/demo/form/method/dom/dom.js', '/app/demo/form/method/dom/dom.xml', '/app/demo/form/method/form/', '/app/demo/form/method/form/form.css', '/app/demo/form/method/form/form.js', '/app/demo/form/method/form/form.xml', '/app/demo/form/method/fs/', '/app/demo/form/method/fs/fs.js', '/app/demo/form/method/fs/fs.xml', '/app/demo/form/method/fs/text.js', '/app/demo/form/method/fs/text.xml', '/app/demo/form/method/task/', '/app/demo/form/method/task/locale1.json', '/app/demo/form/method/task/locale2.json', '/app/demo/form/method/task/task.js', '/app/demo/form/method/task/task.xml', '/app/demo/form/method/theme/', '/app/demo/form/method/theme/theme.js', '/app/demo/form/method/theme/theme.xml', '/app/demo/form/method/tool/', '/app/demo/form/method/tool/tool.js', '/app/demo/form/method/tool/tool.xml', '/app/demo/form/method/zip/', '/app/demo/form/method/zip/zip.js', '/app/demo/form/method/zip/zip.xml', '/app/demo/global.css', '/app/demo/res/', '/app/demo/res/icon.svg', '/app/demo/res/img.jpg', '/app/demo/res/r-1.svg', '/app/demo/res/r-2.svg', '/app/demo/res/sql.svg', '/app/demo/res/txt.svg', '/app/demo/res/zip.svg', '/app/task/', '/app/task/app.js', '/app/task/form/', '/app/task/form/bar/', '/app/task/form/bar/bar.js', '/app/task/form/bar/bar.xml', '/app/task/form/desktop/', '/app/task/form/desktop/desktop.xml', '/app/task/locale/', '/app/task/locale/en.json', '/app/task/locale/ja.json', '/app/task/locale/sc.json', '/app/task/locale/tc.json', '/clickgo.js', '/clickgo.ts', '/control/', '/control/common.cgc', '/control/form.cgc', '/control/monaco.cgc', '/control/property.cgc', '/control/task.cgc', '/global.css', '/icon.png', '/index.js', '/index.ts', '/lib/', '/lib/control.js', '/lib/control.ts', '/lib/core.js', '/lib/core.ts', '/lib/dom.js', '/lib/dom.ts', '/lib/form.js', '/lib/form.ts', '/lib/fs.js', '/lib/fs.ts', '/lib/native.js', '/lib/native.ts', '/lib/task.js', '/lib/task.ts', '/lib/theme.js', '/lib/theme.ts', '/lib/tool.js', '/lib/tool.ts', '/lib/zip.js', '/lib/zip.ts', '/theme/', '/theme/familiar.cgt'];
15
15
  function getContent(path, options) {
16
16
  return __awaiter(this, void 0, void 0, function* () {
17
17
  path = tool.urlResolve('/', path);
package/dist/lib/fs.ts CHANGED
@@ -8,7 +8,7 @@
8
8
  import * as types from '../../types';
9
9
  import * as tool from './tool';
10
10
 
11
- const clickgoFiles = ['/app/', '/app/demo/', '/app/demo/app.js', '/app/demo/form/', '/app/demo/form/control/', '/app/demo/form/control/block/', '/app/demo/form/control/block/block.css', '/app/demo/form/control/block/block.xml', '/app/demo/form/control/button/', '/app/demo/form/control/button/button.css', '/app/demo/form/control/button/button.js', '/app/demo/form/control/button/button.xml', '/app/demo/form/control/check/', '/app/demo/form/control/check/check.js', '/app/demo/form/control/check/check.xml', '/app/demo/form/control/dialog/', '/app/demo/form/control/dialog/dialog.js', '/app/demo/form/control/dialog/dialog.xml', '/app/demo/form/control/file/', '/app/demo/form/control/file/file.js', '/app/demo/form/control/file/file.xml', '/app/demo/form/control/form/', '/app/demo/form/control/form/form.css', '/app/demo/form/control/form/form.js', '/app/demo/form/control/form/form.xml', '/app/demo/form/control/greatview/', '/app/demo/form/control/greatview/greatview.css', '/app/demo/form/control/greatview/greatview.js', '/app/demo/form/control/greatview/greatview.xml', '/app/demo/form/control/img/', '/app/demo/form/control/img/img.xml', '/app/demo/form/control/label/', '/app/demo/form/control/label/label.xml', '/app/demo/form/control/list/', '/app/demo/form/control/list/list.css', '/app/demo/form/control/list/list.js', '/app/demo/form/control/list/list.xml', '/app/demo/form/control/loading/', '/app/demo/form/control/loading/loading.xml', '/app/demo/form/control/marquee/', '/app/demo/form/control/marquee/marquee.js', '/app/demo/form/control/marquee/marquee.xml', '/app/demo/form/control/menu/', '/app/demo/form/control/menu/menu.js', '/app/demo/form/control/menu/menu.xml', '/app/demo/form/control/monaco/', '/app/demo/form/control/monaco/monaco.js', '/app/demo/form/control/monaco/monaco.xml', '/app/demo/form/control/overflow/', '/app/demo/form/control/overflow/overflow.css', '/app/demo/form/control/overflow/overflow.js', '/app/demo/form/control/overflow/overflow.xml', '/app/demo/form/control/property/', '/app/demo/form/control/property/property.js', '/app/demo/form/control/property/property.xml', '/app/demo/form/control/radio/', '/app/demo/form/control/radio/radio.js', '/app/demo/form/control/radio/radio.xml', '/app/demo/form/control/scroll/', '/app/demo/form/control/scroll/scroll.js', '/app/demo/form/control/scroll/scroll.xml', '/app/demo/form/control/select/', '/app/demo/form/control/select/select.js', '/app/demo/form/control/select/select.xml', '/app/demo/form/control/tab/', '/app/demo/form/control/tab/tab.js', '/app/demo/form/control/tab/tab.xml', '/app/demo/form/control/text/', '/app/demo/form/control/text/text.js', '/app/demo/form/control/text/text.xml', '/app/demo/form/control/view/', '/app/demo/form/control/view/view.css', '/app/demo/form/control/view/view.js', '/app/demo/form/control/view/view.xml', '/app/demo/form/event/', '/app/demo/form/event/form/', '/app/demo/form/event/form/form.css', '/app/demo/form/event/form/form.js', '/app/demo/form/event/form/form.xml', '/app/demo/form/event/screen/', '/app/demo/form/event/screen/screen.js', '/app/demo/form/event/screen/screen.xml', '/app/demo/form/event/task/', '/app/demo/form/event/task/task.js', '/app/demo/form/event/task/task.xml', '/app/demo/form/main.css', '/app/demo/form/main.js', '/app/demo/form/main.xml', '/app/demo/form/method/', '/app/demo/form/method/core/', '/app/demo/form/method/core/core.js', '/app/demo/form/method/core/core.xml', '/app/demo/form/method/dom/', '/app/demo/form/method/dom/dom.css', '/app/demo/form/method/dom/dom.js', '/app/demo/form/method/dom/dom.xml', '/app/demo/form/method/form/', '/app/demo/form/method/form/form.css', '/app/demo/form/method/form/form.js', '/app/demo/form/method/form/form.xml', '/app/demo/form/method/form/test.xml', '/app/demo/form/method/fs/', '/app/demo/form/method/fs/fs.js', '/app/demo/form/method/fs/fs.xml', '/app/demo/form/method/fs/text.js', '/app/demo/form/method/fs/text.xml', '/app/demo/form/method/task/', '/app/demo/form/method/task/locale1.json', '/app/demo/form/method/task/locale2.json', '/app/demo/form/method/task/task.js', '/app/demo/form/method/task/task.xml', '/app/demo/form/method/theme/', '/app/demo/form/method/theme/theme.js', '/app/demo/form/method/theme/theme.xml', '/app/demo/form/method/tool/', '/app/demo/form/method/tool/tool.js', '/app/demo/form/method/tool/tool.xml', '/app/demo/form/method/zip/', '/app/demo/form/method/zip/zip.js', '/app/demo/form/method/zip/zip.xml', '/app/demo/global.css', '/app/demo/res/', '/app/demo/res/icon.svg', '/app/demo/res/img.jpg', '/app/demo/res/r-1.svg', '/app/demo/res/r-2.svg', '/app/demo/res/sql.svg', '/app/demo/res/txt.svg', '/app/demo/res/zip.svg', '/app/task/', '/app/task/app.js', '/app/task/form/', '/app/task/form/bar/', '/app/task/form/bar/bar.js', '/app/task/form/bar/bar.xml', '/app/task/form/desktop/', '/app/task/form/desktop/desktop.xml', '/app/task/locale/', '/app/task/locale/en.json', '/app/task/locale/ja.json', '/app/task/locale/sc.json', '/app/task/locale/tc.json', '/clickgo.js', '/clickgo.ts', '/control/', '/control/common.cgc', '/control/form.cgc', '/control/monaco.cgc', '/control/property.cgc', '/control/task.cgc', '/global.css', '/icon.png', '/index.js', '/index.ts', '/lib/', '/lib/control.js', '/lib/control.ts', '/lib/core.js', '/lib/core.ts', '/lib/dom.js', '/lib/dom.ts', '/lib/form.js', '/lib/form.ts', '/lib/fs.js', '/lib/fs.ts', '/lib/native.js', '/lib/native.ts', '/lib/task.js', '/lib/task.ts', '/lib/theme.js', '/lib/theme.ts', '/lib/tool.js', '/lib/tool.ts', '/lib/zip.js', '/lib/zip.ts', '/theme/', '/theme/familiar.cgt'];
11
+ const clickgoFiles = ['/app/', '/app/demo/', '/app/demo/app.js', '/app/demo/form/', '/app/demo/form/control/', '/app/demo/form/control/block/', '/app/demo/form/control/block/block.css', '/app/demo/form/control/block/block.xml', '/app/demo/form/control/button/', '/app/demo/form/control/button/button.css', '/app/demo/form/control/button/button.js', '/app/demo/form/control/button/button.xml', '/app/demo/form/control/check/', '/app/demo/form/control/check/check.js', '/app/demo/form/control/check/check.xml', '/app/demo/form/control/dialog/', '/app/demo/form/control/dialog/dialog.js', '/app/demo/form/control/dialog/dialog.xml', '/app/demo/form/control/file/', '/app/demo/form/control/file/file.js', '/app/demo/form/control/file/file.xml', '/app/demo/form/control/form/', '/app/demo/form/control/form/form.css', '/app/demo/form/control/form/form.js', '/app/demo/form/control/form/form.xml', '/app/demo/form/control/greatview/', '/app/demo/form/control/greatview/greatview.css', '/app/demo/form/control/greatview/greatview.js', '/app/demo/form/control/greatview/greatview.xml', '/app/demo/form/control/img/', '/app/demo/form/control/img/img.xml', '/app/demo/form/control/label/', '/app/demo/form/control/label/label.xml', '/app/demo/form/control/list/', '/app/demo/form/control/list/list.css', '/app/demo/form/control/list/list.js', '/app/demo/form/control/list/list.xml', '/app/demo/form/control/loading/', '/app/demo/form/control/loading/loading.xml', '/app/demo/form/control/marquee/', '/app/demo/form/control/marquee/marquee.js', '/app/demo/form/control/marquee/marquee.xml', '/app/demo/form/control/menu/', '/app/demo/form/control/menu/menu.js', '/app/demo/form/control/menu/menu.xml', '/app/demo/form/control/monaco/', '/app/demo/form/control/monaco/monaco.js', '/app/demo/form/control/monaco/monaco.xml', '/app/demo/form/control/overflow/', '/app/demo/form/control/overflow/overflow.css', '/app/demo/form/control/overflow/overflow.js', '/app/demo/form/control/overflow/overflow.xml', '/app/demo/form/control/property/', '/app/demo/form/control/property/property.js', '/app/demo/form/control/property/property.xml', '/app/demo/form/control/radio/', '/app/demo/form/control/radio/radio.js', '/app/demo/form/control/radio/radio.xml', '/app/demo/form/control/scroll/', '/app/demo/form/control/scroll/scroll.js', '/app/demo/form/control/scroll/scroll.xml', '/app/demo/form/control/select/', '/app/demo/form/control/select/select.js', '/app/demo/form/control/select/select.xml', '/app/demo/form/control/tab/', '/app/demo/form/control/tab/tab.js', '/app/demo/form/control/tab/tab.xml', '/app/demo/form/control/text/', '/app/demo/form/control/text/text.js', '/app/demo/form/control/text/text.xml', '/app/demo/form/control/view/', '/app/demo/form/control/view/view.css', '/app/demo/form/control/view/view.js', '/app/demo/form/control/view/view.xml', '/app/demo/form/event/', '/app/demo/form/event/form/', '/app/demo/form/event/form/form.css', '/app/demo/form/event/form/form.js', '/app/demo/form/event/form/form.xml', '/app/demo/form/event/screen/', '/app/demo/form/event/screen/screen.js', '/app/demo/form/event/screen/screen.xml', '/app/demo/form/event/task/', '/app/demo/form/event/task/task.js', '/app/demo/form/event/task/task.xml', '/app/demo/form/main.css', '/app/demo/form/main.js', '/app/demo/form/main.xml', '/app/demo/form/method/', '/app/demo/form/method/aform/', '/app/demo/form/method/aform/aform.js', '/app/demo/form/method/aform/aform.xml', '/app/demo/form/method/aform/test.xml', '/app/demo/form/method/core/', '/app/demo/form/method/core/core.js', '/app/demo/form/method/core/core.xml', '/app/demo/form/method/dom/', '/app/demo/form/method/dom/dom.css', '/app/demo/form/method/dom/dom.js', '/app/demo/form/method/dom/dom.xml', '/app/demo/form/method/form/', '/app/demo/form/method/form/form.css', '/app/demo/form/method/form/form.js', '/app/demo/form/method/form/form.xml', '/app/demo/form/method/fs/', '/app/demo/form/method/fs/fs.js', '/app/demo/form/method/fs/fs.xml', '/app/demo/form/method/fs/text.js', '/app/demo/form/method/fs/text.xml', '/app/demo/form/method/task/', '/app/demo/form/method/task/locale1.json', '/app/demo/form/method/task/locale2.json', '/app/demo/form/method/task/task.js', '/app/demo/form/method/task/task.xml', '/app/demo/form/method/theme/', '/app/demo/form/method/theme/theme.js', '/app/demo/form/method/theme/theme.xml', '/app/demo/form/method/tool/', '/app/demo/form/method/tool/tool.js', '/app/demo/form/method/tool/tool.xml', '/app/demo/form/method/zip/', '/app/demo/form/method/zip/zip.js', '/app/demo/form/method/zip/zip.xml', '/app/demo/global.css', '/app/demo/res/', '/app/demo/res/icon.svg', '/app/demo/res/img.jpg', '/app/demo/res/r-1.svg', '/app/demo/res/r-2.svg', '/app/demo/res/sql.svg', '/app/demo/res/txt.svg', '/app/demo/res/zip.svg', '/app/task/', '/app/task/app.js', '/app/task/form/', '/app/task/form/bar/', '/app/task/form/bar/bar.js', '/app/task/form/bar/bar.xml', '/app/task/form/desktop/', '/app/task/form/desktop/desktop.xml', '/app/task/locale/', '/app/task/locale/en.json', '/app/task/locale/ja.json', '/app/task/locale/sc.json', '/app/task/locale/tc.json', '/clickgo.js', '/clickgo.ts', '/control/', '/control/common.cgc', '/control/form.cgc', '/control/monaco.cgc', '/control/property.cgc', '/control/task.cgc', '/global.css', '/icon.png', '/index.js', '/index.ts', '/lib/', '/lib/control.js', '/lib/control.ts', '/lib/core.js', '/lib/core.ts', '/lib/dom.js', '/lib/dom.ts', '/lib/form.js', '/lib/form.ts', '/lib/fs.js', '/lib/fs.ts', '/lib/native.js', '/lib/native.ts', '/lib/task.js', '/lib/task.ts', '/lib/theme.js', '/lib/theme.ts', '/lib/tool.js', '/lib/tool.ts', '/lib/zip.js', '/lib/zip.ts', '/theme/', '/theme/familiar.cgt'];
12
12
 
13
13
  export async function getContent(path: string, options?: {
14
14
  'start'?: number;
package/dist/lib/native.js CHANGED
@@ -8,7 +8,7 @@ function getToken() {
8
8
  }
9
9
  exports.getToken = getToken;
10
10
  function invoke(name, ...param) {
11
- if (!clickgo.getNative()) {
11
+ if (!clickgo.isNative()) {
12
12
  return;
13
13
  }
14
14
  return window.clickgoNative.invoke(name, ...param);
package/dist/lib/native.ts CHANGED
@@ -29,7 +29,7 @@ export function getToken(): string {
29
29
  * @param param 参数
30
30
  */
31
31
  export function invoke(name: string, ...param: any[]): any {
32
- if (!clickgo.getNative()) {
32
+ if (!clickgo.isNative()) {
33
33
  return;
34
34
  }
35
35
  return (window as any).clickgoNative.invoke(name, ...param);
package/dist/lib/task.js CHANGED
@@ -9,7 +9,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
9
9
  });
10
10
  };
11
11
  Object.defineProperty(exports, "__esModule", { value: true });
12
- exports.refreshSystemPosition = exports.clearSystem = exports.setSystem = exports.systemTaskInfo = exports.sleep = exports.removeTimer = exports.createTimer = exports.clearLocaleLang = exports.setLocaleLang = exports.setLocale = exports.clearLocale = exports.loadLocale = exports.loadLocaleData = exports.end = exports.run = exports.getList = exports.get = exports.offFrame = exports.onFrame = exports.isMain = exports.setMain = exports.lastId = exports.list = void 0;
12
+ exports.refreshSystemPosition = exports.clearSystem = exports.setSystem = exports.systemTaskInfo = exports.sleep = exports.removeTimer = exports.createTimer = exports.clearLocaleLang = exports.setLocaleLang = exports.setLocale = exports.clearLocale = exports.loadLocale = exports.loadLocaleData = exports.end = exports.run = exports.getList = exports.get = exports.offFrame = exports.onFrame = exports.lastId = exports.list = void 0;
13
13
  const clickgo = require("../clickgo");
14
14
  const core = require("./core");
15
15
  const dom = require("./dom");
@@ -20,19 +20,6 @@ const fs = require("./fs");
20
20
  const native = require("./native");
21
21
  exports.list = {};
22
22
  exports.lastId = 0;
23
- let mainTaskId = 0;
24
- function setMain(taskId) {
25
- if (mainTaskId > 0) {
26
- return false;
27
- }
28
- mainTaskId = taskId;
29
- return true;
30
- }
31
- exports.setMain = setMain;
32
- function isMain(taskId) {
33
- return taskId === mainTaskId;
34
- }
35
- exports.isMain = isMain;
36
23
  const localeData = {
37
24
  'en': {
38
25
  'loading': 'Loading...',
@@ -269,12 +256,18 @@ function run(url, opt = {}) {
269
256
  getVersion: function () {
270
257
  return clickgo.getVersion();
271
258
  },
272
- getNative() {
273
- return clickgo.getNative();
259
+ isNative() {
260
+ return clickgo.isNative();
274
261
  },
275
262
  getPlatform() {
276
263
  return clickgo.getPlatform();
277
264
  },
265
+ isImmersion() {
266
+ return clickgo.isImmersion();
267
+ },
268
+ hasFrame() {
269
+ return clickgo.hasFrame();
270
+ },
278
271
  'control': {
279
272
  'AbstractControl': class extends control.AbstractControl {
280
273
  get taskId() {
@@ -619,9 +612,6 @@ function run(url, opt = {}) {
619
612
  }
620
613
  },
621
614
  'task': {
622
- isMain(taskId) {
623
- return isMain(taskId);
624
- },
625
615
  onFrame: function (fun, opt = {}) {
626
616
  opt.taskId = taskId;
627
617
  return clickgo.task.onFrame(fun, opt);
@@ -638,7 +628,6 @@ function run(url, opt = {}) {
638
628
  },
639
629
  run: function (url, opt = {}) {
640
630
  opt.taskId = taskId;
641
- opt.main = false;
642
631
  return clickgo.task.run(url, opt);
643
632
  },
644
633
  end: function (tid) {
@@ -826,17 +815,18 @@ function run(url, opt = {}) {
826
815
  return -3;
827
816
  }
828
817
  dom.createToStyleList(taskId);
818
+ core.trigger('taskStarted', taskId);
819
+ if (taskId === 1) {
820
+ native.invoke('cg-init', native.getToken());
821
+ }
829
822
  const appCls = new expo.default();
830
823
  yield appCls.main();
831
824
  if (!exports.list[taskId].class) {
832
825
  delete exports.list[taskId];
833
826
  dom.removeFromStyleList(taskId);
827
+ core.trigger('taskEnded', taskId);
834
828
  return -4;
835
829
  }
836
- core.trigger('taskStarted', taskId);
837
- if (taskId === 1) {
838
- native.invoke('cg-init', native.getToken());
839
- }
840
830
  return taskId;
841
831
  });
842
832
  }
@@ -846,7 +836,7 @@ function end(taskId) {
846
836
  if (!task) {
847
837
  return true;
848
838
  }
849
- if (clickgo.getNative() && isMain(taskId)) {
839
+ if (clickgo.isNative() && (taskId === 1)) {
850
840
  native.invoke('cg-close', native.getToken());
851
841
  }
852
842
  const fid = form.getMaxZIndexID({
@@ -860,7 +850,7 @@ function end(taskId) {
860
850
  }
861
851
  for (const fid in task.forms) {
862
852
  const f = task.forms[fid];
863
- core.trigger('formRemoved', taskId, f.id, f.vroot.$refs.form.title, f.vroot.$refs.form.iconData);
853
+ core.trigger('formRemoved', taskId, f.id, f.vroot.$refs.form.title, f.vroot.$refs.form.iconDataUrl);
864
854
  try {
865
855
  f.vapp.unmount();
866
856
  }