clickgo 3.11.5 → 3.11.6

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

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

@@ -7,6 +7,10 @@
             <img src="../../../res/img.jpg" mode="auto" style="width: 200px; height: 200px;" />
             <label>Mode cover:</label>
             <img src="../../../res/img.jpg" mode="cover" style="width: 200px; height: 250px;" />
+            <label>Slot:</label>
+            <img src="../../../res/img.jpg" mode="cover" align-h="center" align-v="end" style="width: 200px; height: 200px; padding-bottom: 10px; color: #FFF; font-weight: bold; font-size: 18px;">
+                <label>Test</label>
+            </img>
             <label>Mode contain:</label>
             <img src="../../../res/img.jpg" mode="contain" style="border: dotted 1px rgba(0, 0, 0, .5); width: 200px; height: 250px;" />
             <label>You can also use http://, https:// and data: url, load "https://nodejs.org/static/images/logo.svg":</label>

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

package/dist/lib/tool.js

@@ -264,20 +264,20 @@ function layoutInsertAttr(layout, insert, opt = {}) {
 exports.layoutInsertAttr = layoutInsertAttr;
 function layoutClassPrependObject(object) {
     object = object.slice(1, -1).trim();
-    return '{' + object.replace(/(.+?):(.+?)(,|$)/g, function (t, t1, t2, t3) {
+    return '{' + object.replace(/([ a-zA-Z0-9'"`\[\]\-_]+)(\s*:)/g, function (t, t1, t2) {
         t1 = t1.trim();
         if (t1.startsWith('[')) {
             t1 = '[classPrepend(' + t1.slice(1, -1) + ')]';
         }
         else {
             let sp = '';
-            if (t1.startsWith('\'') || t1.startsWith('"')) {
+            if (t1.startsWith('\'') || t1.startsWith('"') || t1.startsWith('`')) {
                 sp = t1[0];
                 t1 = t1.slice(1, -1);
             }
             t1 = `[classPrepend(${sp}${t1}${sp})]`;
         }
-        return t1 + ':' + t2 + t3;
+        return t1 + t2;
     }) + '}';
 }
 function layoutClassPrepend(layout, preps) {
@@ -291,8 +291,8 @@ function layoutClassPrepend(layout, preps) {
             }
         }
         return ` class="${resultList.join(' ')}"`;
-    }).replace(/ :class=(["']).+?["'](\s+[a-zA-Z0-9-_:@]+=|\s*>)/gi, function (t, sp) {
-        return t.replace(new RegExp(` :class=${sp}(.+?)${sp}(\\s+[a-zA-Z0-9-_:@]+=|\\s*>)`, 'gi'), function (t, t1, t2) {
+    }).replace(/ :class=(["']).+?["']((\s+[a-zA-Z0-9-_:@]+(=|\s*>))|(\s*)>)/gi, function (t, sp) {
+        return t.replace(new RegExp(` :class=${sp}(.+?)${sp}((\\s+[a-zA-Z0-9-_:@]+(=|\\s*>))|(\\s*)>)`, 'gi'), function (t, t1, t2) {
             t1 = t1.trim();
             if (t1.startsWith('[')) {
                 t1 = t1.slice(1, -1);

package/dist/lib/tool.ts

@@ -343,6 +343,7 @@ export function layoutInsertAttr(layout: string, insert: string, opt: { 'ignore'
  */
 function layoutClassPrependObject(object: string): string {
     object = object.slice(1, -1).trim();
+    /*
     return '{' + object.replace(/(.+?):(.+?)(,|$)/g, function(t, t1: string, t2: string, t3: string) {
         // --- t1 是 'xxx', t2 是 xxx，t3 是结尾或者 , 分隔符 ---
         t1 = t1.trim();
@@ -359,6 +360,23 @@ function layoutClassPrependObject(object: string): string {
         }
         return t1 + ':' + t2 + t3;
     }) + '}';
+    //*/
+    return '{' + object.replace(/([ a-zA-Z0-9'"`\[\]\-_]+)(\s*:)/g, function(t, t1: string, t2:string) {
+        // --- t1 是 'xxx', t2 是 xxx，t3 是结尾或者 , 分隔符 ---
+        t1 = t1.trim();
+        if (t1.startsWith('[')) {
+            t1 = '[classPrepend(' + t1.slice(1, -1) + ')]';
+        }
+        else {
+            let sp = '';
+            if (t1.startsWith('\'') || t1.startsWith('"') || t1.startsWith('`')) {
+                sp = t1[0];
+                t1 = t1.slice(1, -1);
+            }
+            t1 = `[classPrepend(${sp}${t1}${sp})]`;
+        }
+        return t1 + t2;
+    }) + '}';
 }
 /**
  * --- 给 class 增加 scope 的随机前缀，给 id 新增前缀 ---
@@ -378,8 +396,8 @@ export function layoutClassPrepend(layout: string, preps: string[]): string {
         }
         return ` class="${resultList.join(' ')}"`;
     //}).replace(/ :class=(["']).+?>/gi, function(t, sp) {
-    }).replace(/ :class=(["']).+?["'](\s+[a-zA-Z0-9-_:@]+=|\s*>)/gi, function(t, sp) {
-        return t.replace(new RegExp(` :class=${sp}(.+?)${sp}(\\s+[a-zA-Z0-9-_:@]+=|\\s*>)`, 'gi'), function(t, t1: string, t2: string) {
+    }).replace(/ :class=(["']).+?["']((\s+[a-zA-Z0-9-_:@]+(=|\s*>))|(\s*)>)/gi, function(t, sp) {
+        return t.replace(new RegExp(` :class=${sp}(.+?)${sp}((\\s+[a-zA-Z0-9-_:@]+(=|\\s*>))|(\\s*)>)`, 'gi'), function(t, t1: string, t2: string) {
             // --- t1 为 [] 或 {} ---
             t1 = t1.trim();
             if (t1.startsWith('[')) {

package/package.json

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