clickgo 3.11.31 → 3.11.33

package/README.md

@@ -7,12 +7,9 @@
     </a>
     <a href="https://www.npmjs.com/package/clickgo">
         <img alt="NPM stable version" src="https://img.shields.io/npm/v/clickgo?color=brightgreen&logo=npm" />
-        <img alt="NPM beta version" src="https://img.shields.io/npm/v/clickgo/beta?color=yellowgreen&logo=npm" />
-        <img alt="NPM development version" src="https://img.shields.io/npm/v/clickgo/dev?color=yellow&logo=npm" />
-    </a><br>
+    </a>
     <a href="https://github.com/maiyun/clickgo/releases">
         <img alt="GitHub releases" src="https://img.shields.io/github/v/release/maiyun/clickgo?color=brightgreen&logo=github" />
-        <img alt="GitHub pre-releases" src="https://img.shields.io/github/v/release/maiyun/clickgo?color=yellow&logo=github&include_prereleases" />
     </a>
     <a href="https://github.com/maiyun/clickgo/issues">
         <img alt="GitHub issues" src="https://img.shields.io/github/issues/maiyun/clickgo?color=blue&logo=github" />
@@ -28,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.1/dist/loader.min.js?path=index&npm={'clickgo':'3.11.31'}"></script>
+<script src="https://cdn.jsdelivr.net/npm/@litert/loader@3.5.1/dist/loader.min.js?path=index&npm={'clickgo':'3.11.33'}"></script>
 ```
 
 **index.js**

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

@@ -68,6 +68,23 @@ class default_1 extends clickgo.form.AbstractForm {
         this.select = [];
         this.select2 = ['Appraise'];
         this.label2 = [''];
+        this.listData5 = [
+            {
+                'name': 'hi',
+                'id': '1'
+            },
+            {
+                'name': 'hi2',
+                'id': '2',
+                'sub': [
+                    {
+                        'name': 'hi3',
+                        'id': '3'
+                    }
+                ]
+            }
+        ];
+        this.listMap5 = undefined;
         this.selectObject = ['test'];
         this.listDataObject = {
             'test': 'This is test',

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

@@ -64,6 +64,10 @@
                         </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="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>
         </layout>

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

@@ -51,7 +51,7 @@
                     <select :data="['1','2','3','4','5']" :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" 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>
                     <label>Always editable: {{aemodel}}</label>
                     <layout gutter="10">
-                        <select v-model="aemodel" :data="editableData ? ['1','2','3','4','5'] : ['6','7','8','9','10']" :disabled="disabled" editable :multi="multi" :plain="plain" :tree="tree" :async="async" :search="search" :remote="remote" :remote-delay="remoteDelay[0]" :icon="icon" icon-default="../../../res/txt.svg" placeholder="Please enter" @load="onLoad" @remote="onRemote" style="flex: 1;" :style="{'font-size': fontSize ? '16px' : undefined, 'padding': padding ? '15px' : undefined, 'background': background ? 'red' : undefined, 'color': background ? '#FFF' : undefined}"></select>
+                        <select v-model="aemodel" :data="editableData ? ['1','2','3',{'label':'is 4','value':'4'},'5'] : ['6','7','8','9','10']" :disabled="disabled" editable editablelabel :multi="multi" :plain="plain" :tree="tree" :async="async" :search="search" :remote="remote" :remote-delay="remoteDelay[0]" :icon="icon" icon-default="../../../res/txt.svg" placeholder="Please enter" @load="onLoad" @remote="onRemote" style="flex: 1;" :style="{'font-size': fontSize ? '16px' : undefined, 'padding': padding ? '15px' : undefined, 'background': background ? 'red' : undefined, 'color': background ? '#FFF' : undefined}"></select>
                         <button @click="aemodel.length=0">clear</button>
                         <button @click="aemodel[0] = '4'">4</button>
                         <button @click="aemodel[0] = '22'">22</button>

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

@@ -39,6 +39,7 @@ class default_1 extends clickgo.form.AbstractForm {
         this.checked1 = false;
         this.checked2 = false;
         this.checked3 = false;
+        this.checked4 = 0;
         this.disabled = false;
     }
     onChange(e) {

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

@@ -13,6 +13,10 @@
             <switch :disabled="disabled" @change="onChange" />
             <label style="flex: 1;">not</label>
         </layout>
+        <layout gutter="10" align-v="center">
+            <switch v-model="checked4" :disabled="disabled" :map="{'true':0,'false':1}"></switch>
+            <label style="flex: 1;">{{checked4}}</label>
+        </layout>
         <button @click="disabled = !disabled">{{disabled ? 'Remove' : 'Set'}} disabled</button>
     </layout>
 </form>

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

package/dist/lib/control.js

@@ -92,16 +92,19 @@ class AbstractControl {
     }
     get l() {
         return (key, data) => {
-            var _a, _b, _c, _d, _e, _f;
-            if (data) {
-                return (_c = (_b = (_a = data[this.locale]) === null || _a === void 0 ? void 0 : _a[key]) !== null && _b !== void 0 ? _b : data['en'][key]) !== null && _c !== void 0 ? _c : '[LocaleError]' + key;
-            }
-            else if (this.localeData) {
-                return (_f = (_e = (_d = this.localeData[this.locale]) === null || _d === void 0 ? void 0 : _d[key]) !== null && _e !== void 0 ? _e : this.localeData['en'][key]) !== null && _f !== void 0 ? _f : '[LocaleError]' + key;
-            }
-            else {
-                return '[LocaleError]' + key;
+            var _a, _b;
+            const loc = (_b = (_a = this.localeData) === null || _a === void 0 ? void 0 : _a[this.locale][key]) !== null && _b !== void 0 ? _b : '[LocaleError]' + key;
+            if (!data) {
+                return loc;
             }
+            let i = -1;
+            return loc.replace(/\?/g, function () {
+                ++i;
+                if (!data[i]) {
+                    return '';
+                }
+                return data[i];
+            });
         };
     }
     get classPrepend() {

package/dist/lib/control.ts

@@ -102,20 +102,20 @@ export abstract class AbstractControl {
     /**
      * --- 获取语言内容 ---
      */
-    public get l(): (
-        key: string,
-        data?: Record<string, Record<string, string>>
-    ) => string {
-        return (key: string, data?: Record<string, Record<string, string>>): string => {
-            if (data) {
-                return data[this.locale]?.[key] ?? data['en'][key] ?? '[LocaleError]' + key;
-            }
-            else if ((this as any).localeData) {
-                return (this as any).localeData[this.locale]?.[key] ?? (this as any).localeData['en'][key] ?? '[LocaleError]' + key;
-            }
-            else {
-                return '[LocaleError]' + key;
+    public get l(): (key: string, data?: string[]) => string {
+        return (key: string, data?: string[]): string => {
+            const loc = (this as any).localeData?.[this.locale][key] ?? '[LocaleError]' + key;
+            if (!data) {
+                return loc;
             }
+            let i: number = -1;
+            return loc.replace(/\?/g, function() {
+                ++i;
+                if (!data[i]) {
+                    return '';
+                }
+                return data[i];
+            });
         };
     }
 
@@ -219,36 +219,28 @@ export abstract class AbstractControl {
         };
     }
 
-    /**
-     * --- 获取 props 中的 boolean 类型的值 ----
-     */
+    /** --- 获取 props 中的 boolean 类型的值 --- */
     public get propBoolean() {
         return (name: keyof this['props']): boolean => {
             return tool.getBoolean((this.props as any)[name]);
         };
     }
 
-    /**
-     * --- 获取 props 中的 number 类型的值 ----
-     */
+    /** --- 获取 props 中的 number 类型的值 --- */
     public get propNumber() {
         return (name: keyof this['props']): number => {
             return tool.getNumber((this.props as any)[name]);
         };
     }
 
-    /**
-     * --- 获取 props 中的 int 类型的值 ----
-     */
+    /** --- 获取 props 中的 int 类型的值 --- */
     public get propInt() {
         return (name: keyof this['props']): number => {
             return Math.round(this.propNumber(name));
         };
     }
 
-    /**
-     * --- 获取 props 中的 array 类型的值 ----
-     */
+    /** --- 获取 props 中的 array 类型的值 --- */
     public get propArray() {
         return (name: keyof this['props']): any[] => {
             return tool.getArray((this.props as any)[name]);

package/dist/lib/tool.js

@@ -470,9 +470,15 @@ function getArray(param) {
     if (typeof param !== 'string') {
         return param;
     }
+    param = param.trim();
     let rtn = [];
     if (param.startsWith('[')) {
-        rtn = JSON.parse(param);
+        try {
+            rtn = JSON.parse(param);
+        }
+        catch (_a) {
+            return [];
+        }
     }
     else {
         param = param.replace(/ /g, '');

package/dist/lib/tool.ts

@@ -627,16 +627,22 @@ export function getNumber(param: string | number): number {
 }
 
 /**
- * --- 根据参数获取最终的数组型 ---
+ * --- 根据参数获取最终的数组型，可传入类似 [1,2,3] 或 1,2,3 ---
  * @param param 参数
  */
 export function getArray(param: string | any[]): any[] {
     if (typeof param !== 'string') {
         return param;
     }
+    param = param.trim();
     let rtn: any[] = [];
     if (param.startsWith('[')) {
-        rtn = JSON.parse(param);
+        try {
+            rtn = JSON.parse(param);
+        }
+        catch {
+            return [];
+        }
     }
     else {
         param = param.replace(/ /g, '');

package/package.json

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