clickgo 3.14.1 → 3.14.3

package/README.md

@@ -25,7 +25,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.7/dist/loader.min.js?path=index&npm={'clickgo':'3.14.1'}"></script>
+<script src="https://cdn.jsdelivr.net/npm/@litert/loader@3.5.7/dist/loader.min.js?path=index&npm={'clickgo':'3.14.3'}"></script>
 ```
 
 **index.js**

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

@@ -33,6 +33,8 @@ class default_1 extends clickgo.form.AbstractForm {
         this.ts = undefined;
         this.tz = undefined;
         this.disabled = false;
+        this.start = false;
+        this.bottom = false;
     }
     settime() {
         this.ts = clickgo.tool.rand(1504304812000, 1704304812000);

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

@@ -1,7 +1,11 @@
 <form width="400" height="350" title="Date">
     <layout direction="v" gutter="10" style="padding: 10px; flex: 1;">
         <label>Timestamp: {{ts}}, Time zone: {{tz}}</label>
-        <date v-model="ts" v-model:tz="tz" :date="date" :time="time" :zone="zone" :disabled="disabled" />
+        <date v-model="ts" v-model:tz="tz" :date="date" :time="time" :zone="zone" :disabled="disabled" :start="start ? 1704067200_000 : undefined">
+            <template v-if="bottom" v-slot="d">
+                <layout style="flex: 1;" align-h="center">{{d.year}}</layout>
+            </template>
+        </date>
         <layout gutter="10">
             <button @click="date = !date" style="flex: 1;">{{date ? '' : '!'}}date</button>
             <button @click="time = !time" style="flex: 1;">{{time ? '' : '!'}}time</button>
@@ -10,6 +14,8 @@
         <layout gutter="10">
             <button @click="disabled = !disabled" style="flex: 1;">{{disabled ? '' : '!'}}disabled</button>
             <button @click="settime" style="flex: 1;">Set time</button>
+            <button @click="start = !start" style="flex: 1;">{{start ? '' : '!'}}start</button>
+            <button @click="bottom = !bottom" style="flex: 1;">{{bottom ? '' : '!'}}bottom</button>
         </layout>
     </layout>
 </form>

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

@@ -43,6 +43,8 @@ class default_1 extends clickgo.form.AbstractForm {
                 'child': ['val1', 'val2', 'val3', 'val4']
             }
         ];
+        this.plain = false;
+        this.size = ['m'];
     }
     get maxLine() {
         let len = 0;

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

@@ -1,6 +1,6 @@
 <form title="Desc" width="500" height="500" padding="10">
     <layout gutter="10" direction="v" style="flex: 1;">
-        <desc :border="border" :collapse="collapse">
+        <desc :border="border" :collapse="collapse" :size="size[0]" :plain="plain">
             <desc-row>
                 <desc-head>HEAD1</desc-head>
                 <desc-head>HEAD2</desc-head>
@@ -22,6 +22,10 @@
             <button @click="border = !border" style="flex: 1">border: {{border ? 'true' : 'false'}}</button>
             <button @click="collapse = !collapse" style="flex: 1;">collapse: {{collapse ? 'true' : 'false'}}</button>
         </layout>
+        <layout gutter="10">
+            <button @click="plain = !plain" style="flex: 1;">plain: {{plain ? 'true' : 'false'}}</button>
+            <select v-model="size" style="flex: 1;" :data="['s', 'm']" />
+        </layout>
         <label>Test: {{cols}}</label>
         <flow style="flex: 1;">
             <desc :border="border" :collapse="collapse" style="flex: 1;">

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

@@ -85,6 +85,7 @@ class default_1 extends clickgo.form.AbstractForm {
             }
         ];
         this.listMap5 = undefined;
+        this.disabledList = [];
         this.selectObject = ['test'];
         this.listDataObject = {
             'test': 'This is test',

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

@@ -57,20 +57,24 @@
                         <menulist-item alt="I" @click="showIndex2">Show select</menulist-item>
                     </menulist>
                 </list>
-                <list :disabled="disabled" :must="must" :multi="multi" :ctrl="ctrl" :selection="selection" :gesture="gesture ? ['top', 'bottom'] : []" @gesture="onGesture" :scroll="scroll" :virtual="virtual" :data="listData2" :check="check" style="flex: 1; width: 0;">
-                    <template v-slot:row="data">
-                        <layout gutter="10" align-v="center">
-                            <label style="flex: 1;">{{data.row.label}}</label>
-                            <button v-if="data.index === 4">abc</button>
-                        </layout>
-                    </template>
-                </list>
+                <layout direction="v" gutter="10" style="flex: 1; width: 0;">
+                    <list :disabled="disabled" :must="must" :multi="multi" :ctrl="ctrl" :selection="selection" :gesture="gesture ? ['top', 'bottom'] : []" @gesture="onGesture" :scroll="scroll" :virtual="virtual" :data="listData2" :check="check" :disabledList="disabledList" style="flex: 1;">
+                        <template v-slot:row="data">
+                            <layout gutter="10" align-v="center">
+                                <label style="flex: 1;">{{data.row.label}}</label>
+                                <button v-if="data.index === 4">abc</button>
+                            </layout>
+                        </template>
+                    </list>
+                    <button v-if="!disabledList.length" @click="disabledList = ['7']">disabledList</button>
+                    <label v-else>{{disabledList}}</label>
+                </layout>
                 <layout direction="v" gutter="10" style="flex: 1; width: 0;">
                     <list :disabled="disabled" :must="must" :multi="multi" :ctrl="ctrl" :selection="selection" :gesture="gesture ? ['top', 'bottom'] : []" @gesture="onGesture" :scroll="scroll" :virtual="virtual":data="listData5" :check="check" :map="listMap5" style="flex: 1;"></list>
                     <button v-if="listMap5===undefined" @click="listMap5={'label':'name','value':'id','children':'sub'}">Set map</button>
                 </layout>
             </layout>
-            <label class="tip">Right-click (computer) or press and hold (phone) to open the universal menu.</label>
+            <label class="mtip">Right-click (computer) or press and hold (phone) to open the universal menu.</label>
         </layout>
         <!-- object -->
         <layout v-else-if="ntab === 'object'" direction="v" gutter="10" style="flex: 1; width: 0; padding: 10px;">

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

@@ -61,8 +61,8 @@
                             <template v-slot:pop>
                                 <menulist>
                                     <layout>
-                                        <menulist-item alt="A" style="padding: 20px;">Box 1</menulist-item>
-                                        <menulist-item alt="B" style="padding: 20px;">
+                                        <menulist-item alt="A">Box 1</menulist-item>
+                                        <menulist-item alt="B">
                                             <template v-slot>Box 2</template>
                                             <template v-slot:pop>
                                                 <menulist>

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

@@ -110,6 +110,7 @@ class default_1 extends clickgo.form.AbstractForm {
         this.s3other = false;
         this.slist3r = ['a', 'b', 'c', 'haha3'];
         this.editableData = true;
+        this.disabledList = [];
         this.padding = false;
         this.fontSize = false;
         this.background = false;

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

@@ -45,9 +45,10 @@
                 <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" :plain="plain" :tree="tree" :async="async" :search="search" :remote="remote" :remote-delay="remoteDelay[0]" :icon="icon" icon-default="../../../res/txt.svg" :disabledList="disabledList" @load="onLoad" @remote="onRemote" @add="onAdd" @remove="onRemove" @added="onAdded" @removed="onRemoved" @change="onChange" @changed="onChanged" @tagclick="onTagclick" style="flex: 1;" :style="{'font-size': fontSize ? '16px' : undefined, 'background': background ? 'red' : undefined, 'color': background ? '#FFF' : undefined}"></select>
                     <layout gutter="10">
-                        <select v-model="select2" @label="label2 = $event" :data="slist2" :disabled="disabled" :editable="editable" :multi="multi" :plain="plain" :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" @change="onChange" @changed="onChanged" @tagclick="onTagclick" style="flex: 1;" :style="{'font-size': fontSize ? '16px' : undefined, 'background': background ? 'red' : undefined, 'color': background ? '#FFF' : undefined}"></select>
-                        <button @click="select2[0]='ha6'">Select disabled</button>
+                        <button @click="select2[0]='ha6'" style="flex: 1">Select disabled</button>
+                        <button v-if="!disabledList.length" @click="disabledList = ['haha3']" style="flex: 1">disabledList</button>
                     </layout>
                     <list :data="addRemoveList" style="height: 100px;"></list>
                     <label>Custom height:</label>

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

@@ -49,7 +49,6 @@ class default_1 extends clickgo.form.AbstractForm {
         this.type = ['text'];
         this.disabled = false;
         this.readonly = false;
-        this.adaption = false;
         this.scroll = true;
         this.wrap = true;
         this.menu = false;

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

@@ -2,7 +2,7 @@
     <layout direction="v" gutter="10" style="padding: 10px; flex: 1; width: 0;">
         <label>Text Length: {{value.length}}, Selection Start: {{selectionStart}}, Selection End: {{selectionEnd}}, Focus: {{isFocus}}</label>
         <label>Scroll Left: {{scrollLeft}}, Scroll Top: {{scrollTop}}, Scroll Height: {{scrollHeight}}, Scroll Width: {{scrollWidth}}, Client Height: {{clientHeight}}, Client Width: {{clientWidth}}</label>
-        <text v-model="value" placeholder="placeholder" :type="type[0]" :gesture="gesture ? ['top', 'bottom'] : []" @gesture="onGesture" :disabled="disabled" :readonly="readonly" :adaption="adaption" :scroll="scroll" :maxlength="maxlength" :wrap="wrap" :max="max" :min="min" :plain="plain" v-model:scroll-left="scrollLeft" v-model:scroll-top="scrollTop" v-model:selection-start="selectionStart" v-model:selection-end="selectionEnd" @clientheight="clientHeight = $event" @clientwidth="clientWidth = $event" @scrollheight="scrollHeight = $event" @scrollwidth="scrollWidth = $event" @focus="isFocus = true" @blur="isFocus = false" @beforechange="onBeforechange" :style="{'flex': (type[0] === 'multi') && (!adaption || scroll || !wrap) ? '1' : undefined, 'line-height': lineHeight, 'font-size': fontSize + 'px', 'background': background, 'color': background ? '#FFF' : undefined, 'height': (type[0] === 'multi') && (!adaption || scroll || !wrap) ? '0' : undefined, 'border-width': textBorder}" :class="[phcolor && ('ph-' + phcolor)]">
+        <text v-model="value" placeholder="placeholder" :type="type[0]" :gesture="gesture ? ['top', 'bottom'] : []" @gesture="onGesture" :disabled="disabled" :readonly="readonly" :scroll="scroll" :maxlength="maxlength" :wrap="wrap" :max="max" :min="min" :plain="plain" v-model:scroll-left="scrollLeft" v-model:scroll-top="scrollTop" v-model:selection-start="selectionStart" v-model:selection-end="selectionEnd" @clientheight="clientHeight = $event" @clientwidth="clientWidth = $event" @scrollheight="scrollHeight = $event" @scrollwidth="scrollWidth = $event" @focus="isFocus = true" @blur="isFocus = false" @beforechange="onBeforechange" :style="{'flex': (type[0] === 'multi') && (scroll || !wrap) ? '1' : undefined, 'line-height': lineHeight, 'font-size': fontSize + 'px', 'background': background, 'color': background ? '#FFF' : undefined, 'height': (type[0] === 'multi') && (scroll || !wrap) ? '0' : undefined, 'border-width': textBorder}" :class="[phcolor && ('ph-' + phcolor)]">
             <menulist v-if="menu">
                 <menulist-item>Custom</menulist-item>
             </menulist>
@@ -32,7 +32,6 @@
         <layout gutter="10">
             <button @click="lineHeight = lineHeight === 1 ? 1.5 : 1" style="flex: 1;">line to {{lineHeight === 1 ? 1.5 : 1}}</button>
             <button @click="fontSize = fontSize === 12 ? 16 : 12" style="flex: 1;">size to {{fontSize === 12 ? 16 : 12}}</button>
-            <button @click="adaption = !adaption" style="flex: 1;">{{adaption ? '' : '!'}}adaption</button>
             <button @click="longClick" style="flex: 1;">{{long ? '' : '!'}}long</button>
         </layout>
         <layout gutter="10">

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.14.1';
+const version = '3.14.3';
 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.14.1';
+const version = '3.14.3';
 export function getVersion(): string {
     return version;
 }

package/dist/lib/dom.js

@@ -219,7 +219,6 @@ function unwatchPosition(el) {
     const formId = formWrap.dataset.formId;
     const panelWrap = findParentByData(el, 'panel-id');
     const panelId = panelWrap ? panelWrap.dataset.panelId : 'default';
-    const item = watchPositionObjects[formId][panelId][index];
     el.removeAttribute('data-cg-poindex');
     delete watchPositionObjects[formId][panelId][index];
     if (Object.keys(watchPositionObjects[formId][panelId]).length) {
@@ -1990,7 +1989,6 @@ function siblings(el) {
     }
     const list = [];
     for (let i = 0; i < el.parentNode.children.length; ++i) {
-        el.previousElementSibling;
         const e = el.parentNode.children.item(i);
         if (e === el) {
             continue;

package/dist/lib/dom.ts

@@ -292,7 +292,6 @@ export function unwatchPosition(el: HTMLElement): void {
     // --- 获取监视标签的所属 panel ---
     const panelWrap = findParentByData(el, 'panel-id');
     const panelId = panelWrap ? panelWrap.dataset.panelId! : 'default';
-    const item = watchPositionObjects[formId][panelId][index];
     el.removeAttribute('data-cg-poindex');
     delete watchPositionObjects[formId][panelId][index];
     if (Object.keys(watchPositionObjects[formId][panelId]).length) {
@@ -1181,7 +1180,7 @@ const watchTimerHandler = function(): void {
                         item.handler({
                             'position': position,
                             'size': size
-                        });
+                        }) as any;
                     }
                     watchPositionObjects[formId][panelId][index].rect = rect;
                 };
@@ -2514,7 +2513,6 @@ export function siblings(el: HTMLElement): HTMLElement[] {
     }
     const list: HTMLElement[] = [];
     for (let i = 0; i < el.parentNode.children.length; ++i) {
-        el.previousElementSibling
         const e = el.parentNode.children.item(i) as HTMLElement;
         if (e === el) {
             continue;
@@ -2579,11 +2577,10 @@ export async function exitFullscreen(): Promise<boolean> {
 }
 
 /**
- * 
- * @param tagName 
- * @returns 
+ * --- 创建 element ---
+ * @param tagName 标签名
  */
-export function createElement<K extends keyof HTMLElementTagNameMap>(tagName: K): HTMLElementTagNameMap[K] {
+export function createElement<T extends keyof HTMLElementTagNameMap>(tagName: T): HTMLElementTagNameMap[T] {
     return document.createElement(tagName);
 }
 

package/dist/lib/form.js

@@ -1817,15 +1817,16 @@ function hidePop(pop) {
     }
     else {
         if (popInfo.list[level]) {
-            popInfo.list[level].removeAttribute('data-cg-open');
-            popInfo.list[level].removeAttribute('data-cg-level');
+            const opop = popInfo.list[level];
+            opop.removeAttribute('data-cg-open');
+            opop.removeAttribute('data-cg-level');
             clickgo.dom.unwatchSize(popInfo.list[level]);
             clickgo.dom.unwatchPosition(pop);
             clickgo.tool.sleep(334).then(() => {
-                if (popInfo.list[level].dataset.cgLevel !== undefined) {
+                if (opop.dataset.cgLevel !== undefined) {
                     return;
                 }
-                popInfo.list[level].dataset.cgPopNone = '';
+                opop.dataset.cgPopNone = '';
             }).catch(() => {
             });
         }

package/dist/lib/form.ts

@@ -2381,15 +2381,17 @@ export function hidePop(pop?: HTMLElement | types.IVue): void {
     }
     else {
         if (popInfo.list[level]) {
-            popInfo.list[level].removeAttribute('data-cg-open');
-            popInfo.list[level].removeAttribute('data-cg-level');
+            /** --- el 对应的 pop --- */
+            const opop = popInfo.list[level];
+            opop.removeAttribute('data-cg-open');
+            opop.removeAttribute('data-cg-level');
             clickgo.dom.unwatchSize(popInfo.list[level]);
             clickgo.dom.unwatchPosition(pop);
             clickgo.tool.sleep(334).then(() => {
-                if (popInfo.list[level].dataset.cgLevel !== undefined) {
+                if (opop.dataset.cgLevel !== undefined) {
                     return;
                 }
-                popInfo.list[level].dataset.cgPopNone = '';
+                opop.dataset.cgPopNone = '';
             }).catch(() => {
                 //
             });

package/package.json

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