clickgo 3.9.1 → 3.10.0

package/README.md

@@ -28,7 +28,7 @@ Load the module loader first, and then load it using the module loader.
 **index.html**
 
 ```html
-<script src="https://cdn.jsdelivr.net/npm/@litert/loader@3.5.0/dist/loader.min.js?path=index&npm={'clickgo':'3.9.1'}"></script>
+<script src="https://cdn.jsdelivr.net/npm/@litert/loader@3.5.0/dist/loader.min.js?path=index&npm={'clickgo':'3.10.0'}"></script>
 ```
 
 **index.js**

package/dist/app/demo/form/control/file/file.js

@@ -31,6 +31,7 @@ class default_1 extends clickgo.form.AbstractForm {
         this.multi = 'false';
         this.dir = 'false';
         this.list = [];
+        this.fd = new FormData();
     }
     select() {
         this.refs.file.select();
@@ -42,6 +43,7 @@ class default_1 extends clickgo.form.AbstractForm {
         }
         for (const file of files) {
             this.list.push((file.webkitRelativePath || file.name) + ' (' + file.size.toString() + ')');
+            this.fd.append('file', file, file.name);
         }
     }
 }

package/dist/app/demo/form/control/list/list.js

@@ -235,5 +235,34 @@ class default_1 extends clickgo.form.AbstractForm {
             yield clickgo.form.dialog('onGesture: ' + dir);
         });
     }
+    onGAdd(e) {
+        clickgo.form.notify({
+            'type': 'info',
+            'title': 'Greatlist @add',
+            'content': 'value: ' + e.detail.value.toString()
+        });
+    }
+    onGRemove(e) {
+        clickgo.form.notify({
+            'type': 'info',
+            'title': 'Greatlist @remove',
+            'content': 'value: ' + e.detail.value.toString()
+        });
+    }
+    onLAdd(e) {
+        console.log('x', e.detail);
+        clickgo.form.notify({
+            'type': 'info',
+            'title': 'List @add',
+            'content': 'value: ' + e.detail.value
+        });
+    }
+    onLRemove(e) {
+        clickgo.form.notify({
+            'type': 'info',
+            'title': 'List @remove',
+            'content': 'value: ' + e.detail.value
+        });
+    }
 }
 exports.default = default_1;

package/dist/app/demo/form/control/list/list.xml

@@ -3,7 +3,7 @@
     <tab v-model="ntab" :tabs="['greatlist', 'adaptation', 'beyond', 'list', 'object', 'async']" style="flex: 1; height: 0;">
         <!-- 默认 -->
         <layout v-if="ntab === 'greatlist'" direction="v" style="flex: 1; width: 0; padding: 10px;">
-            <greatlist v-model="select" :data="slist" :disabled="disabled" :must="must" :multi="multi" :ctrl="ctrl" :selection="selection" :gesture="gesture ? ['top', 'bottom'] : []" @gesture="onGesture" :scroll="scroll" :sizes="sizes" @select="onSelect" style="line-height: 1.3; flex: 1; height: 0;">
+            <greatlist v-model="select" :data="slist" :disabled="disabled" :must="must" :multi="multi" :ctrl="ctrl" :selection="selection" :gesture="gesture ? ['top', 'bottom'] : []" @gesture="onGesture" @add="onGAdd" @Remove="onGRemove" :scroll="scroll" :sizes="sizes" @select="onSelect" style="line-height: 1.3; flex: 1; height: 0;">
                 <template v-slot="data">
                     <layout v-if="data.row.type === 0" align-v="center" gutter="5" style="flex: 1;">
                         <img :src="data.row.src" style="width: 32px; height: 32px;"></img>
@@ -51,7 +51,7 @@
             <label>Raw data:</label>
             <flow direction="v" style="border: solid 1px #b3b3b3; line-height: 1.5; height: 50px; padding: 5px;">{{listData}}</flow>
             <layout gutter="10" style="flex: 1; height: 0;">
-                <list v-model="select2" :disabled="disabled" :must="must" :multi="multi" :ctrl="ctrl" :selection="selection" :gesture="gesture ? ['top', 'bottom'] : []" @gesture="onGesture" :scroll="scroll" :data="listData" @label="label2 = $event" style="flex: 2; width: 0;" :tree="tree" :async="async" :icon="icon" icon-default="../../../res/txt.svg" @load="onSelectLoad">
+                <list v-model="select2" :disabled="disabled" :must="must" :multi="multi" :ctrl="ctrl" :selection="selection" :gesture="gesture ? ['top', 'bottom'] : []" @gesture="onGesture" :scroll="scroll" :data="listData" @label="label2 = $event" style="flex: 2; width: 0;" :tree="tree" :async="async" :icon="icon" icon-default="../../../res/txt.svg" @load="onSelectLoad" @add="onLAdd" @Remove="onLRemove">
                     <menulist>
                         <menulist-item alt="I" @click="showIndex2">Show select</menulist-item>
                     </menulist>

package/dist/app/demo/form/control/select/select.js

@@ -153,11 +153,7 @@ class default_1 extends clickgo.form.AbstractForm {
     onRemote(value, resolve) {
         return __awaiter(this, void 0, void 0, function* () {
             yield clickgo.tool.sleep(300);
-            if (value === '') {
-                resolve(['1', '3', '5']);
-                return;
-            }
-            if (value === '8') {
+            if (!value || value === '8') {
                 resolve();
                 return;
             }
@@ -170,11 +166,37 @@ class default_1 extends clickgo.form.AbstractForm {
                 }]);
         });
     }
-    onAdd(index, value) {
-        this.addRemoveList.unshift('@add, index: ' + index.toString() + ', value: ' + value);
+    onGAdd(e) {
+        clickgo.form.notify({
+            'type': 'info',
+            'title': 'Greatselect @add',
+            'content': 'value: ' + e.detail.value.toString()
+        });
+        if (this.slist[e.detail.value].type === 1) {
+            e.preventDefault();
+        }
+    }
+    onGRemove(e) {
+        clickgo.form.notify({
+            'type': 'info',
+            'title': 'Greaselect @remove',
+            'content': 'value: ' + e.detail.value.toString()
+        });
+    }
+    onAdd(e) {
+        this.addRemoveList.unshift('@add, index: ' + e.detail.index.toString() + ', value: ' + e.detail.value);
     }
-    onRemove(index, value) {
-        this.addRemoveList.unshift('@remove, index: ' + index.toString() + ', value: ' + value);
+    onAdded(e) {
+        this.addRemoveList.unshift('@added, index: ' + e.detail.index.toString() + ', value: ' + e.detail.value);
+    }
+    onRemove(e) {
+        this.addRemoveList.unshift('@remove, index: ' + e.detail.index.toString() + ', value: ' + e.detail.value + ', mode: ' + e.detail.mode);
+    }
+    onRemoved(e) {
+        this.addRemoveList.unshift('@removed, index: ' + e.detail.index.toString() + ', value: ' + e.detail.value + ', mode: ' + e.detail.mode);
+    }
+    onTagclick(e) {
+        this.addRemoveList.unshift('@tagclick, index: ' + e.detail.index.toString() + ', value: ' + e.detail.value);
     }
     changeArea() {
         switch (this.area) {
@@ -202,25 +224,13 @@ class default_1 extends clickgo.form.AbstractForm {
     }
     onMounted() {
         this.watch(() => this.select.join(','), (n, o) => {
-            let select = [];
-            const now = n.split(',');
-            const old = o.split(',');
-            for (const item of now) {
-                if (this.slist[parseInt(item)].type !== 0) {
-                    continue;
-                }
-                select.push(parseInt(item));
-            }
-            if (select.length === now.length) {
+            if (this.multi) {
                 return;
             }
-            select = [];
-            for (const item of old) {
-                select.push(parseInt(item));
+            if (this.slist[parseInt(n)].type === 0) {
+                return;
             }
-            this.select = select;
-        }, {
-            'deep': true
+            this.select = [parseInt(o)];
         });
     }
 }

package/dist/app/demo/form/control/select/select.xml

@@ -4,7 +4,7 @@
             <!-- greatselect -->
             <layout v-if="ntab === 'greatselect'" gutter="10" direction="v" style="flex: 1; width: 0; padding: 10px;">
                 <label>Now select value is {{select}}:</label>
-                <greatselect v-model="select" :data="slist" :area="area" :disabled="disabled" :multi="multi" :sizes="sizes" :style="{'font-size': fontSize ? '16px' : undefined, 'padding': padding ? '15px' : undefined, 'background': background ? 'red' : undefined, 'color': background ? '#FFF' : undefined}" style="line-height: 1.3;">
+                <greatselect v-model="select" :data="slist" :area="area" :disabled="disabled" :multi="multi" :sizes="sizes" :style="{'font-size': fontSize ? '16px' : undefined, 'padding': padding ? '15px' : undefined, 'background': background ? 'red' : undefined, 'color': background ? '#FFF' : undefined}" style="line-height: 1.3;" @add="onGAdd" @remove="onGRemove">
                     <layout align-v="center" gutter="5" style="flex: 1;">
                         <img :src="slist[select[0]] ? slist[select[0]].src : ''" style="width: 32px; height: 32px;"></img>
                         <block>
@@ -45,7 +45,7 @@
                 <layout gutter="10" direction="v" style="padding: 10px;">
                     <label>Now select value is {{select2}}</label>
                     <label>Label: {{label2}}</label>
-                    <select v-model="select2" @label="label2 = $event" :data="slist2" :disabled="disabled" :editable="editable" :multi="multi" :tree="tree" :async="async" :search="search" :remote="remote" :remote-delay="remoteDelay[0]" :icon="icon" icon-default="../../../res/txt.svg" @load="onLoad" @remote="onRemote" @add="onAdd" @remove="onRemove" :style="{'font-size': fontSize ? '16px' : undefined, 'padding': padding ? '15px' : undefined, 'background': background ? 'red' : undefined, 'color': background ? '#FFF' : undefined}"></select>
+                    <select v-model="select2" @label="label2 = $event" :data="slist2" :disabled="disabled" :editable="editable" :multi="multi" :tree="tree" :async="async" :search="search" :remote="remote" :remote-delay="remoteDelay[0]" :icon="icon" icon-default="../../../res/txt.svg" @load="onLoad" @remote="onRemote" @add="onAdd" @remove="onRemove" @added="onAdded" @removed="onRemoved" @tagclick="onTagclick" :style="{'font-size': fontSize ? '16px' : undefined, 'padding': padding ? '15px' : undefined, 'background': background ? 'red' : undefined, 'color': background ? '#FFF' : undefined}"></select>
                     <list :data="addRemoveList" style="height: 100px;"></list>
                     <label>Custom height:</label>
                     <select :data="['1','2','3','4','5']" :disabled="disabled" :editable="editable" :multi="multi" :tree="tree" :async="async" :search="search" :remote="remote" :remote-delay="remoteDelay[0]" :icon="icon" icon-default="../../../res/txt.svg" style="height: 60px;" @load="onLoad" @remote="onRemote" :style="{'font-size': fontSize ? '16px' : undefined, 'padding': padding ? '15px' : undefined, 'background': background ? 'red' : undefined, 'color': background ? '#FFF' : undefined}"></select>

package/dist/app/demo/form/control/tab/tab.js

@@ -48,10 +48,10 @@ class default_1 extends clickgo.form.AbstractForm {
         this.drag = false;
         this.cclose = false;
     }
-    onClose(e, i, v) {
+    onClose(e) {
         return __awaiter(this, void 0, void 0, function* () {
-            if (i !== 10) {
-                yield clickgo.form.dialog('Closed, index: ' + i.toString() + ', value: ' + v);
+            if (e.detail.index !== 10) {
+                yield clickgo.form.dialog('Closed, index: ' + e.detail.index.toString() + ', value: ' + e.detail.value);
                 return;
             }
             e.preventDefault();

package/dist/clickgo.js

@@ -24,7 +24,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.zip = exports.tool = exports.theme = exports.task = exports.storage = 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.9.1';
+const version = '3.10.0';
 function getVersion() {
     return version;
 }

package/dist/clickgo.ts

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-const version = '3.9.1';
+const version = '3.10.0';
 export function getVersion(): string {
     return version;
 }

package/dist/index.js

@@ -101,7 +101,7 @@ function launcher(boot) {
         var _a;
         return __awaiter(this, void 0, void 0, function* () {
             const paths = [
-                loader.cdn + '/npm/vue@3.3.13/dist/vue.global.prod.min.js'
+                loader.cdn + '/npm/vue@3.4.15/dist/vue.global.prod.min.js'
             ];
             let ro = true;
             if (!(window.ResizeObserver)) {

package/dist/index.ts

@@ -176,7 +176,7 @@ export function launcher(boot: AbstractBoot): void {
     (async function() {
         // --- 通过标签加载库 ---
         const paths: string[] = [
-            loader.cdn + '/npm/vue@3.3.13/dist/vue.global.prod.min.js'
+            loader.cdn + '/npm/vue@3.4.15/dist/vue.global.prod.min.js'
         ];
         // --- 判断 ResizeObserver 是否存在 ---
         let ro = true;

package/dist/lib/control.js

@@ -44,6 +44,7 @@ class AbstractControl {
     constructor() {
         this.packageFiles = {};
         this.props = {};
+        this.emits = {};
         this.slots = {};
     }
     get filename() {
@@ -272,6 +273,7 @@ function init(taskId, invoke) {
                             'layout': '',
                             'files': item.files,
                             'props': {},
+                            'emits': {},
                             'data': {},
                             'access': {},
                             'methods': {},
@@ -353,6 +355,11 @@ function init(taskId, invoke) {
                                 };
                             }
                         }
+                        if (cls.emits) {
+                            for (const key in cls.emits) {
+                                t.controls[name].emits[key] = cls.emits[key];
+                            }
+                        }
                         const cdata = Object.entries(cls);
                         for (const item of cdata) {
                             if (item[0] === 'files') {
@@ -445,11 +452,15 @@ function buildComponents(taskId, formId, path) {
         components['cg-' + name] = {
             'template': control.layout.replace(/{{{formId}}}/g, formId.toString()),
             'props': control.props,
+            'emits': control.emits,
             'data': function () {
                 const data = tool.clone(control.data);
                 if (data.props) {
                     delete data.props;
                 }
+                if (data.emits) {
+                    delete data.emits;
+                }
                 return data;
             },
             'methods': control.methods,

package/dist/lib/control.ts

@@ -164,6 +164,9 @@ export abstract class AbstractControl {
     /** --- 组件参数，由用户定义重写 --- */
     public readonly props = {};
 
+    /** --- 组件参数，由用户定义重写 --- */
+    public readonly emits: Record<string, null | ((payload: any) => boolean)> = {};
+
     /** --- 组件的子插槽 --- */
     public readonly slots: Record<string, any> = {};
 
@@ -390,6 +393,7 @@ export async function init(
 
                         'files': item.files,
                         'props': {},
+                        'emits': {},
                         'data': {},
                         'access': {},
                         'methods': {},
@@ -493,6 +497,11 @@ export async function init(
                             };
                         }
                     }
+                    if (cls.emits) {
+                        for (const key in cls.emits) {
+                            t.controls[name].emits[key] = cls.emits[key];
+                        }
+                    }
                     // --- DATA ---
                     const cdata = Object.entries(cls);
                     for (const item of cdata) {
@@ -598,12 +607,16 @@ export function buildComponents(
         components['cg-' + name] = {
             'template': control.layout.replace(/{{{formId}}}/g, formId.toString()),
             'props': control.props,
+            'emits': control.emits,
 
             'data': function() {
                 const data = tool.clone(control.data);
                 if (data.props) {
                     delete data.props;
                 }
+                if (data.emits) {
+                    delete data.emits;
+                }
                 return data;
             },
             'methods': control.methods,

package/dist/lib/tool.js

@@ -73,6 +73,13 @@ function clone(obj) {
             if (obj[i] instanceof Date) {
                 newObj[i] = new Date(obj[i].getTime());
             }
+            else if (obj[i] instanceof FormData) {
+                const fd = new FormData();
+                for (const item of obj[i]) {
+                    fd.append(item[0], item[1]);
+                }
+                newObj[i] = fd;
+            }
             else if (typeof obj[i] === 'object') {
                 newObj[i] = clone(obj[i]);
             }
@@ -86,6 +93,13 @@ function clone(obj) {
             if (obj[key] instanceof Date) {
                 newObj[key] = new Date(obj[key].getTime());
             }
+            else if (obj[key] instanceof FormData) {
+                const fd = new FormData();
+                for (const item of obj[key]) {
+                    fd.append(item[0], item[1]);
+                }
+                newObj[key] = fd;
+            }
             else if (typeof obj[key] === 'object') {
                 newObj[key] = clone(obj[key]);
             }

package/dist/lib/tool.ts

@@ -102,6 +102,13 @@ export function clone(obj: Record<string, any> | any[]): any[] | any {
             if (obj[i] instanceof Date) {
                 newObj[i] = new Date(obj[i].getTime());
             }
+            else if (obj[i] instanceof FormData) {
+                const fd = new FormData();
+                for (const item of obj[i]) {
+                    fd.append(item[0], item[1]);
+                }
+                newObj[i] = fd;
+            }
             else if (typeof obj[i] === 'object') {
                 newObj[i] = clone(obj[i]);
             }
@@ -115,6 +122,13 @@ export function clone(obj: Record<string, any> | any[]): any[] | any {
             if (obj[key] instanceof Date) {
                 newObj[key] = new Date(obj[key].getTime());
             }
+            else if (obj[key] instanceof FormData) {
+                const fd = new FormData();
+                for (const item of obj[key]) {
+                    fd.append(item[0], item[1]);
+                }
+                newObj[key] = fd;
+            }
             else if (typeof obj[key] === 'object') {
                 newObj[key] = clone(obj[key]);
             }
@@ -797,7 +811,7 @@ export function execCommand(ac: string): void {
  * @param before 老值
  * @param after 新值
  */
-export function compar(before: string[], after: string[]): {
+export function compar(before: Array<string | number>, after: Array<string | number>): {
     'remove': Record<string, number>;
     'add': Record<string, number>;
     'length': {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "clickgo",
-  "version": "3.9.1",
+  "version": "3.10.0",
   "description": "Background interface, software interface, mobile phone APP interface operation library.",
   "keywords": [
     "deskrt",

package/types/index.d.ts

@@ -406,6 +406,7 @@ export interface ITask {
 
         'files': Record<string, Blob | string>;
         'props': Record<string, any>;
+        'emits': Record<string, any>;
         'data': Record<string, any>;
         'access': Record<string, any>;
         'methods': Record<string, any>;
@@ -615,6 +616,123 @@ export interface INotifyOptions {
     'progress'?: boolean;
 }
 
+// --- Custom Event Control ---
+
+interface ICustomEvent {
+    'go': boolean;
+    preventDefault: () => void;
+}
+
+// --- Greatlist Control ---
+
+export interface IGreatlistRemoveEvent extends ICustomEvent {
+    'detail': {
+        'index': number;
+        'value': number;
+    };
+}
+
+export interface IGreatlistAddEvent extends ICustomEvent {
+    'detail': {
+        'index': number;
+        'value': number;
+    };
+}
+
+export interface IGreatlistItemclickedEvent {
+    'detail': {
+        'event': MouseEvent | TouchEvent;
+        'value': number;
+        'arrow': boolean;
+    };
+}
+
+// --- Greatselect Control ---
+
+export interface IGreatselectRemoveEvent extends ICustomEvent {
+    'detail': {
+        'value': number;
+    };
+}
+
+export interface IGreatselectAddEvent extends ICustomEvent {
+    'detail': {
+        'value': number;
+    };
+}
+
+// --- List Control ---
+
+export interface IListRemoveEvent extends ICustomEvent {
+    'detail': {
+        'index': number;
+        'value': string;
+    };
+}
+
+export interface IListAddEvent extends ICustomEvent {
+    'detail': {
+        'index': number;
+        'value': string;
+    };
+}
+
+export interface IListItemclickedEvent {
+    'detail': {
+        'event': MouseEvent | TouchEvent;
+        'value': number;
+        'arrow': boolean;
+    };
+}
+
+// --- Select Control ---
+
+export interface ISelectAddEvent extends ICustomEvent {
+    'detail': {
+        'index': number;
+        'value': string;
+    };
+}
+
+export interface ISelectRemoveEvent extends ICustomEvent {
+    'detail': {
+        'index': number;
+        'value': string;
+        'mode': 'backspace' | 'tag' | 'list';
+    };
+}
+
+export interface ISelectAddedEvent {
+    'detail': {
+        'index': number;
+        'value': string;
+    };
+}
+
+export interface ISelectRemovedEvent {
+    'detail': {
+        'index': number;
+        'value': string;
+        'mode': 'backspace' | 'tag' | 'list';
+    };
+}
+
+export interface ISelectTagclickEvent {
+    'detail': {
+        'index': number;
+        'value': string;
+    };
+}
+
+// --- Tab Control ---
+
+export interface ITabCloseEvent extends ICustomEvent {
+    'detail': {
+        'index': number;
+        'value': string;
+    };
+}
+
 // -------------------------
 // ---------- vue ----------
 // -------------------------