Comparing version 3.1.1-dev10 to 3.1.2-dev11
@@ -63,2 +63,4 @@ "use strict"; | ||
'/form/event/task/task.xml', | ||
'/form/method/aform/aform.xml', | ||
'/form/method/aform/test.xml', | ||
'/form/method/core/core.xml', | ||
@@ -69,3 +71,2 @@ '/form/method/dom/dom.css', | ||
'/form/method/form/form.xml', | ||
'/form/method/form/test.xml', | ||
'/form/method/fs/fs.xml', | ||
@@ -72,0 +73,0 @@ '/form/method/fs/text.xml', |
@@ -16,2 +16,3 @@ "use strict"; | ||
const form_2 = require("./method/form/form"); | ||
const aform_1 = require("./method/aform/aform"); | ||
class default_1 extends clickgo.form.AbstractForm { | ||
@@ -42,2 +43,6 @@ constructor() { | ||
} | ||
case 'aform': { | ||
frm = yield aform_1.default.create(); | ||
break; | ||
} | ||
} | ||
@@ -44,0 +49,0 @@ if (typeof frm === 'number') { |
@@ -17,3 +17,2 @@ "use strict"; | ||
this.fid = '0'; | ||
this.sendValue = 'sendValue'; | ||
this.tid = '0'; | ||
@@ -46,7 +45,2 @@ this.type = 'primary'; | ||
} | ||
send() { | ||
clickgo.form.send(parseInt(this.fid), { | ||
'key': this.sendValue | ||
}); | ||
} | ||
changeFocus() { | ||
@@ -129,10 +123,2 @@ clickgo.form.changeFocus(parseInt(this.fid)); | ||
} | ||
createParam() { | ||
clickgo.form.create({ | ||
'layout': '<form width=\'300\' height=\'300\' title=\'normal\'></form>' | ||
}).catch((e) => { throw e; }); | ||
} | ||
createPath() { | ||
this.createForm('test').then((e) => { console.log(e); }).catch((e) => { throw e; }); | ||
} | ||
createTop() { | ||
@@ -207,8 +193,4 @@ return __awaiter(this, void 0, void 0, function* () { | ||
} | ||
hhide() { | ||
return __awaiter(this, void 0, void 0, function* () { | ||
this.hide(); | ||
yield clickgo.tool.sleep(1000); | ||
this.show(); | ||
}); | ||
showLauncher() { | ||
clickgo.form.showLauncher(); | ||
} | ||
@@ -215,0 +197,0 @@ onReceive(obj) { |
@@ -84,3 +84,3 @@ "use strict"; | ||
for (const formId in app.forms) { | ||
clickgo.form.remove(parseInt(formId)); | ||
clickgo.form.close(parseInt(formId)); | ||
} | ||
@@ -87,0 +87,0 @@ } |
"use strict"; | ||
Object.defineProperty(exports, "__esModule", { value: true }); | ||
exports.zip = exports.tool = exports.theme = exports.task = exports.native = exports.fs = exports.form = exports.dom = exports.core = exports.control = exports.vue = exports.getPlatform = exports.getNative = exports.getVersion = void 0; | ||
exports.zip = exports.tool = exports.theme = exports.task = exports.native = exports.fs = exports.form = exports.dom = exports.core = exports.control = exports.vue = exports.hasFrame = exports.isImmersion = exports.getPlatform = exports.isNative = exports.getVersion = void 0; | ||
const version = '3.0.0'; | ||
@@ -10,11 +10,15 @@ function getVersion() { | ||
const native = navigator.userAgent.includes('electron') ? true : false; | ||
function getNative() { | ||
function isNative() { | ||
return native; | ||
} | ||
exports.getNative = getNative; | ||
exports.isNative = isNative; | ||
let platform = 'web'; | ||
let immersion = false; | ||
let frame = false; | ||
if (native) { | ||
const reg = /electron\/(.+?) (.+?)\//.exec(navigator.userAgent); | ||
const reg = /electron\/(.+?) (.+?)\/(.+?) immersion\/([0-9]) frame\/([0-9])/.exec(navigator.userAgent); | ||
if (reg) { | ||
platform = reg[2]; | ||
immersion = reg[4] === '0' ? false : true; | ||
frame = reg[5] === '0' ? false : true; | ||
} | ||
@@ -26,2 +30,10 @@ } | ||
exports.getPlatform = getPlatform; | ||
function isImmersion() { | ||
return immersion; | ||
} | ||
exports.isImmersion = isImmersion; | ||
function hasFrame() { | ||
return frame; | ||
} | ||
exports.hasFrame = hasFrame; | ||
exports.vue = window.Vue; | ||
@@ -28,0 +40,0 @@ exports.control = require("./lib/control"); |
@@ -22,3 +22,3 @@ /** | ||
const native = navigator.userAgent.includes('electron') ? true : false; | ||
export function getNative(): boolean { | ||
export function isNative(): boolean { | ||
return native; | ||
@@ -28,6 +28,11 @@ } | ||
let platform: NodeJS.Platform | 'web' = 'web'; | ||
let immersion: boolean = false; | ||
let frame: boolean = false; | ||
if (native) { | ||
const reg = /electron\/(.+?) (.+?)\//.exec(navigator.userAgent); | ||
const reg = /electron\/(.+?) (.+?)\/(.+?) immersion\/([0-9]) frame\/([0-9])/.exec(navigator.userAgent); | ||
if (reg) { | ||
platform = reg[2] as any; | ||
immersion = reg[4] === '0' ? false : true; | ||
frame = reg[5] === '0' ? false : true; | ||
} | ||
@@ -39,2 +44,16 @@ } | ||
/** | ||
* --- 获取当前 native 是否是沉浸式 --- | ||
*/ | ||
export function isImmersion(): boolean { | ||
return immersion; | ||
} | ||
/** | ||
* --- 是否含有窗体外边框 --- | ||
*/ | ||
export function hasFrame(): boolean { | ||
return frame; | ||
} | ||
export const vue: import('../types/index').IVueObject = (window as any).Vue; | ||
@@ -41,0 +60,0 @@ |
@@ -12,3 +12,3 @@ "use strict"; | ||
Object.defineProperty(exports, "__esModule", { value: true }); | ||
exports.launcher = exports.AbstractBoot = exports.getPlatform = exports.getNative = exports.getVersion = exports.vue = exports.zip = exports.tool = exports.theme = exports.task = exports.native = exports.fs = exports.form = exports.dom = exports.core = exports.control = exports.clickgo = void 0; | ||
exports.launcher = exports.AbstractBoot = exports.hasFrame = exports.isImmersion = exports.getPlatform = exports.isNative = exports.getVersion = exports.vue = exports.zip = exports.tool = exports.theme = exports.task = exports.native = exports.fs = exports.form = exports.dom = exports.core = exports.control = exports.clickgo = void 0; | ||
function getVersion() { | ||
@@ -18,6 +18,6 @@ return exports.clickgo.getVersion(); | ||
exports.getVersion = getVersion; | ||
function getNative() { | ||
return exports.clickgo.getNative(); | ||
function isNative() { | ||
return exports.clickgo.isNative(); | ||
} | ||
exports.getNative = getNative; | ||
exports.isNative = isNative; | ||
function getPlatform() { | ||
@@ -27,2 +27,10 @@ return exports.clickgo.getPlatform(); | ||
exports.getPlatform = getPlatform; | ||
function isImmersion() { | ||
return exports.clickgo.isImmersion(); | ||
} | ||
exports.isImmersion = isImmersion; | ||
function hasFrame() { | ||
return exports.clickgo.hasFrame(); | ||
} | ||
exports.hasFrame = hasFrame; | ||
class AbstractBoot { | ||
@@ -77,2 +85,8 @@ onError() { | ||
} | ||
onRuntimeFileLoad() { | ||
return; | ||
} | ||
onRuntimeFileLoaded() { | ||
return; | ||
} | ||
} | ||
@@ -105,3 +119,9 @@ exports.AbstractBoot = AbstractBoot; | ||
'afterIgnore': new RegExp('^' + loader.cdn.replace(/\./g, '\\.')), | ||
'map': map | ||
'map': map, | ||
'load': (url) => { | ||
boot.onRuntimeFileLoad(url); | ||
}, | ||
'loaded': (url, state) => { | ||
boot.onRuntimeFileLoaded(url, state); | ||
} | ||
}); | ||
@@ -108,0 +128,0 @@ const cg = loader.require('clickgo', files, { |
@@ -22,4 +22,4 @@ // npm publish --tag dev --access public | ||
export function getNative(): boolean { | ||
return clickgo.getNative(); | ||
export function isNative(): boolean { | ||
return clickgo.isNative(); | ||
} | ||
@@ -31,6 +31,14 @@ | ||
export function isImmersion(): boolean { | ||
return clickgo.isImmersion(); | ||
} | ||
export function hasFrame(): boolean { | ||
return clickgo.hasFrame(); | ||
} | ||
/** --- 全局类 --- */ | ||
export abstract class AbstractBoot { | ||
/** --- 入口文件 --- */ | ||
/** --- 入口方法 --- */ | ||
public abstract main(): void | Promise<void>; | ||
@@ -134,2 +142,14 @@ | ||
/** --- 环境文件准备加载时的事件 --- */ | ||
public onRuntimeFileLoad(url: string): void | Promise<void>; | ||
public onRuntimeFileLoad(): void { | ||
return; | ||
} | ||
/** --- 环境文件加载完成的事件 --- */ | ||
public onRuntimeFileLoaded(url: string, state: number): void | Promise<void>; | ||
public onRuntimeFileLoaded(): void { | ||
return; | ||
} | ||
} | ||
@@ -167,3 +187,9 @@ | ||
'afterIgnore': new RegExp('^' + loader.cdn.replace(/\./g, '\\.')), | ||
'map': map | ||
'map': map, | ||
'load': (url) => { | ||
boot.onRuntimeFileLoad(url) as any; | ||
}, | ||
'loaded': (url, state) => { | ||
boot.onRuntimeFileLoaded(url, state) as any; | ||
} | ||
}); | ||
@@ -170,0 +196,0 @@ const cg = loader.require('clickgo', files, { |
@@ -447,3 +447,7 @@ "use strict"; | ||
'data': function () { | ||
return tool.clone(control.data); | ||
const data = tool.clone(control.data); | ||
if (data.props) { | ||
delete data.props; | ||
} | ||
return tool.clone(data); | ||
}, | ||
@@ -450,0 +454,0 @@ 'methods': control.methods, |
@@ -606,3 +606,7 @@ /** | ||
'data': function() { | ||
return tool.clone(control.data); | ||
const data = tool.clone(control.data); | ||
if (data.props) { | ||
delete data.props; | ||
} | ||
return tool.clone(data); | ||
}, | ||
@@ -609,0 +613,0 @@ 'methods': control.methods, |
@@ -235,3 +235,3 @@ "use strict"; | ||
const v = this; | ||
v.$refs.form.$data.showData = true; | ||
v.$refs.form.$data.isShow = true; | ||
if (this._firstShow) { | ||
@@ -248,3 +248,3 @@ this._firstShow = false; | ||
} | ||
v.$refs.form.$data.showData = true; | ||
v.$refs.form.$data.isShow = true; | ||
changeFocus(this.formId); | ||
@@ -255,2 +255,3 @@ } | ||
return __awaiter(this, void 0, void 0, function* () { | ||
this.topMost = true; | ||
this.show(); | ||
@@ -267,3 +268,3 @@ task.list[this.taskId].runtime.dialogFormIds.push(this.formId); | ||
const v = this; | ||
v.$refs.form.$data.showData = false; | ||
v.$refs.form.$data.isShow = false; | ||
} | ||
@@ -364,3 +365,3 @@ onBeforeCreate() { | ||
document.getElementsByTagName('body')[0].appendChild(this.wrap); | ||
if (clickgo.getNative() && (clickgo.getPlatform() === 'win32')) { | ||
if (clickgo.isImmersion()) { | ||
this.wrap.addEventListener('mouseenter', function () { | ||
@@ -759,6 +760,6 @@ native.invoke('cg-mouse-ignore', native.getToken(), false); | ||
'title': item.vroot.$refs.form.title, | ||
'icon': item.vroot.$refs.form.iconData, | ||
'icon': item.vroot.$refs.form.iconDataUrl, | ||
'stateMax': item.vroot.$refs.form.stateMaxData, | ||
'stateMin': item.vroot.$refs.form.stateMinData, | ||
'show': item.vroot.$refs.form.showData, | ||
'show': item.vroot.$refs.form.isShow, | ||
'focus': item.vroot.formFocus | ||
@@ -787,6 +788,6 @@ }; | ||
'title': item.vroot.$refs.form.title, | ||
'icon': item.vroot.$refs.form.iconData, | ||
'icon': item.vroot.$refs.form.iconDataUrl, | ||
'stateMax': item.vroot.$refs.form.stateMaxData, | ||
'stateMin': item.vroot.$refs.form.stateMinData, | ||
'show': item.vroot.$refs.form.showData, | ||
'show': item.vroot.$refs.form.isShow, | ||
'focus': item.vroot.formFocus | ||
@@ -846,6 +847,6 @@ }; | ||
if (t.forms[dialogFormId].vroot._topMost) { | ||
t.forms[dialogFormId].vroot.$refs.form.$data.zIndexData = ++info.topLastZIndex; | ||
t.forms[dialogFormId].vroot.$refs.form.$data.zIndex = ++info.topLastZIndex; | ||
} | ||
else { | ||
t.forms[dialogFormId].vroot.$refs.form.$data.zIndexData = ++info.lastZIndex; | ||
t.forms[dialogFormId].vroot.$refs.form.$data.zIndex = ++info.lastZIndex; | ||
} | ||
@@ -861,6 +862,6 @@ t.forms[dialogFormId].vapp._container.dataset.formFocus = ''; | ||
if (t.forms[formId].vroot._topMost) { | ||
t.forms[formId].vroot.$refs.form.$data.zIndexData = ++info.topLastZIndex; | ||
t.forms[formId].vroot.$refs.form.$data.zIndex = ++info.topLastZIndex; | ||
} | ||
else { | ||
t.forms[formId].vroot.$refs.form.$data.zIndexData = ++info.lastZIndex; | ||
t.forms[formId].vroot.$refs.form.$data.zIndex = ++info.lastZIndex; | ||
} | ||
@@ -1411,3 +1412,3 @@ t.forms[formId].vapp._container.dataset.formFocus = ''; | ||
title = task.list[taskId].forms[formId].vroot.$refs.form.title; | ||
icon = task.list[taskId].forms[formId].vroot.$refs.form.iconData; | ||
icon = task.list[taskId].forms[formId].vroot.$refs.form.iconDataUrl; | ||
const io = task.list[taskId].runtime.dialogFormIds.indexOf(formId); | ||
@@ -1417,3 +1418,3 @@ if (io > -1) { | ||
} | ||
task.list[taskId].forms[formId].vroot.$refs.form.$data.showData = false; | ||
task.list[taskId].forms[formId].vroot.$refs.form.$data.isShow = false; | ||
setTimeout(function () { | ||
@@ -1578,3 +1579,3 @@ const fid = getMaxZIndexID({ | ||
else { | ||
form.vroot.$refs.form.$data.zIndexData = ++info.topLastZIndex; | ||
form.vroot.$refs.form.$data.zIndex = ++info.topLastZIndex; | ||
} | ||
@@ -1584,3 +1585,3 @@ } | ||
form.vroot.$data._topMost = false; | ||
form.vroot.$refs.form.$data.zIndexData = ++info.lastZIndex; | ||
form.vroot.$refs.form.$data.zIndex = ++info.lastZIndex; | ||
} | ||
@@ -1612,3 +1613,3 @@ return; | ||
}); | ||
this.$refs.form.iconData = (icon instanceof Blob) ? yield tool.blob2DataUrl(icon) : ''; | ||
this.$refs.form.iconDataUrl = (icon instanceof Blob) ? yield tool.blob2DataUrl(icon) : ''; | ||
} | ||
@@ -1670,3 +1671,11 @@ resolve({ | ||
} | ||
core.trigger('formCreated', opt.taskId, formId, rtn.vroot.$refs.form.title, rtn.vroot.$refs.form.iconData); | ||
core.trigger('formCreated', opt.taskId, formId, rtn.vroot.$refs.form.title, rtn.vroot.$refs.form.iconDataUrl); | ||
if (clickgo.isNative() && (formId === 1) && !clickgo.isImmersion() && !clickgo.hasFrame()) { | ||
rtn.vroot.$refs.form.isNativeSync = true; | ||
native.invoke('cg-set-size', native.getToken(), rtn.vroot.$refs.form.$el.offsetWidth, rtn.vroot.$refs.form.$el.offsetHeight); | ||
window.addEventListener('resize', function () { | ||
rtn.vroot.$refs.form.setPropData('width', window.innerWidth); | ||
rtn.vroot.$refs.form.setPropData('height', window.innerHeight); | ||
}); | ||
} | ||
return formId; | ||
@@ -1673,0 +1682,0 @@ }); |
@@ -14,3 +14,3 @@ "use strict"; | ||
const tool = require("./tool"); | ||
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']; | ||
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']; | ||
function getContent(path, options) { | ||
@@ -17,0 +17,0 @@ return __awaiter(this, void 0, void 0, function* () { |
@@ -11,3 +11,3 @@ /** | ||
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']; | ||
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']; | ||
@@ -14,0 +14,0 @@ export async function getContent(path: string, options?: { |
@@ -11,3 +11,3 @@ "use strict"; | ||
function invoke(name, ...param) { | ||
if (!clickgo.getNative()) { | ||
if (!clickgo.isNative()) { | ||
return; | ||
@@ -14,0 +14,0 @@ } |
@@ -32,3 +32,3 @@ /** | ||
export function invoke(name: string, ...param: any[]): any { | ||
if (!clickgo.getNative()) { | ||
if (!clickgo.isNative()) { | ||
return; | ||
@@ -35,0 +35,0 @@ } |
@@ -12,3 +12,3 @@ "use strict"; | ||
Object.defineProperty(exports, "__esModule", { value: true }); | ||
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; | ||
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; | ||
const clickgo = require("../clickgo"); | ||
@@ -24,15 +24,2 @@ const core = require("./core"); | ||
exports.lastId = 0; | ||
let mainTaskId = 0; | ||
function setMain(taskId) { | ||
if (mainTaskId > 0) { | ||
return false; | ||
} | ||
mainTaskId = taskId; | ||
return true; | ||
} | ||
exports.setMain = setMain; | ||
function isMain(taskId) { | ||
return taskId === mainTaskId; | ||
} | ||
exports.isMain = isMain; | ||
const localeData = { | ||
@@ -274,4 +261,4 @@ 'en': { | ||
}, | ||
getNative() { | ||
return clickgo.getNative(); | ||
isNative() { | ||
return clickgo.isNative(); | ||
}, | ||
@@ -281,2 +268,8 @@ getPlatform() { | ||
}, | ||
isImmersion() { | ||
return clickgo.isImmersion(); | ||
}, | ||
hasFrame() { | ||
return clickgo.hasFrame(); | ||
}, | ||
'control': { | ||
@@ -626,5 +619,2 @@ 'AbstractControl': class extends control.AbstractControl { | ||
'task': { | ||
isMain(taskId) { | ||
return isMain(taskId); | ||
}, | ||
onFrame: function (fun, opt = {}) { | ||
@@ -646,3 +636,2 @@ opt.taskId = taskId; | ||
opt.taskId = taskId; | ||
opt.main = false; | ||
return clickgo.task.run(url, opt); | ||
@@ -835,2 +824,6 @@ }, | ||
dom.createToStyleList(taskId); | ||
core.trigger('taskStarted', taskId); | ||
if (taskId === 1) { | ||
native.invoke('cg-init', native.getToken()); | ||
} | ||
const appCls = new expo.default(); | ||
@@ -841,8 +834,5 @@ yield appCls.main(); | ||
dom.removeFromStyleList(taskId); | ||
core.trigger('taskEnded', taskId); | ||
return -4; | ||
} | ||
core.trigger('taskStarted', taskId); | ||
if (taskId === 1) { | ||
native.invoke('cg-init', native.getToken()); | ||
} | ||
return taskId; | ||
@@ -857,3 +847,3 @@ }); | ||
} | ||
if (clickgo.getNative() && isMain(taskId)) { | ||
if (clickgo.isNative() && (taskId === 1)) { | ||
native.invoke('cg-close', native.getToken()); | ||
@@ -872,3 +862,3 @@ } | ||
const f = task.forms[fid]; | ||
core.trigger('formRemoved', taskId, f.id, f.vroot.$refs.form.title, f.vroot.$refs.form.iconData); | ||
core.trigger('formRemoved', taskId, f.id, f.vroot.$refs.form.title, f.vroot.$refs.form.iconDataUrl); | ||
try { | ||
@@ -875,0 +865,0 @@ f.vapp.unmount(); |
@@ -32,25 +32,2 @@ /** | ||
/** --- 当前是否设置的主任务的任务 ID,全局只可设置一次 --- */ | ||
let mainTaskId: number = 0; | ||
/** | ||
* --- 将一个任务设置为主任务,全局只可设置一次 --- | ||
* @param taskId 任务 ID | ||
*/ | ||
export function setMain(taskId: number): boolean { | ||
if (mainTaskId > 0) { | ||
return false; | ||
} | ||
mainTaskId = taskId; | ||
return true; | ||
} | ||
/** | ||
* --- 判断一个任务 ID 是不是主任务 --- | ||
* @param taskId 任务 ID | ||
*/ | ||
export function isMain(taskId: number): boolean { | ||
return taskId === mainTaskId; | ||
} | ||
/** --- task lib 用到的语言包 --- */ | ||
@@ -351,4 +328,4 @@ const localeData: Record<string, { | ||
}, | ||
getNative(): boolean { | ||
return clickgo.getNative(); | ||
isNative(): boolean { | ||
return clickgo.isNative(); | ||
}, | ||
@@ -358,2 +335,8 @@ getPlatform(): string { | ||
}, | ||
isImmersion(): boolean { | ||
return clickgo.isImmersion(); | ||
}, | ||
hasFrame(): boolean { | ||
return clickgo.hasFrame(); | ||
}, | ||
'control': { | ||
@@ -721,5 +704,2 @@ 'AbstractControl': class extends control.AbstractControl { | ||
'task': { | ||
isMain(taskId: number): boolean { | ||
return isMain(taskId); | ||
}, | ||
onFrame: function(fun: () => void | Promise<void>, opt: any = {}): number { | ||
@@ -743,3 +723,2 @@ opt.taskId = taskId; | ||
opt.taskId = taskId; | ||
opt.main = false; | ||
return clickgo.task.run(url, opt); | ||
@@ -943,2 +922,8 @@ }, | ||
dom.createToStyleList(taskId); | ||
// --- 触发 taskStarted 事件 --- | ||
core.trigger('taskStarted', taskId); | ||
// --- 第一个任务给 native 发送任务启动成功的消息 --- | ||
if (taskId === 1) { | ||
native.invoke('cg-init', native.getToken()); | ||
} | ||
// --- 执行 app --- | ||
@@ -952,21 +937,5 @@ const appCls: core.AbstractApp = new expo.default(); | ||
dom.removeFromStyleList(taskId); | ||
core.trigger('taskEnded', taskId); | ||
return -4; | ||
} | ||
// --- 触发 taskStarted 事件 --- | ||
core.trigger('taskStarted', taskId); | ||
// --- 给 native 发送任务启动成功的消息 --- | ||
if (taskId === 1) { | ||
native.invoke('cg-init', native.getToken()); | ||
} | ||
// --- 提交 sync --- | ||
/* | ||
if (clickgo.getNative() && opt.sync) { | ||
f.vroot.$refs.form.isNativeSync = true; | ||
native.invoke('cg-set-size', native.getToken(), f.vroot.$refs.form.widthData, f.vroot.$refs.form.heightData); | ||
window.addEventListener('resize', function(): void { | ||
f.vroot.$refs.form.setPropData('width', window.innerWidth); | ||
f.vroot.$refs.form.setPropData('height', window.innerHeight); | ||
}); | ||
} | ||
*/ | ||
return taskId; | ||
@@ -985,3 +954,3 @@ } | ||
// --- 如果是 native 模式 --- | ||
if (clickgo.getNative() && isMain(taskId)) { | ||
if (clickgo.isNative() && (taskId === 1)) { | ||
native.invoke('cg-close', native.getToken()); | ||
@@ -1002,3 +971,3 @@ } | ||
const f = task.forms[fid]; | ||
core.trigger('formRemoved', taskId, f.id, f.vroot.$refs.form.title, f.vroot.$refs.form.iconData); | ||
core.trigger('formRemoved', taskId, f.id, f.vroot.$refs.form.title, f.vroot.$refs.form.iconDataUrl); | ||
try { | ||
@@ -1005,0 +974,0 @@ f.vapp.unmount(); |
{ | ||
"name": "clickgo", | ||
"version": "3.1.1-dev10", | ||
"version": "3.1.2-dev11", | ||
"description": "Background interface, software interface, mobile phone APP interface operation library.", | ||
@@ -5,0 +5,0 @@ "keywords": [ |
@@ -13,4 +13,6 @@ export * as control from '../dist/lib/control'; | ||
export function getVersion(): string; | ||
export function getNative(): boolean; | ||
export function isNative(): boolean; | ||
export function getPlatform(): NodeJS.Platform | 'web'; | ||
export function isImmersion(): boolean; | ||
export function hasFrame(): boolean; | ||
// eslint-disable-next-line @typescript-eslint/naming-convention | ||
@@ -404,6 +406,2 @@ export const AbstractBoot: typeof import('../dist/index').AbstractBoot; | ||
'notify'?: boolean; | ||
/** --- 设置为主应用,整个运行时只能设置一次,因此 App 下不可能被设置 --- */ | ||
'main'?: boolean; | ||
/** --- native 下窗体与实体窗体大小同步,App 模式下无法设置 --- */ | ||
'sync'?: boolean; | ||
/** --- 所属任务,App 模式无法设置 --- */ | ||
@@ -410,0 +408,0 @@ 'taskId'?: number; |
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is too big to display
Sorry, the diff of this file is not supported yet
984496
146
20611