@wiajs/core 1.1.31 → 1.1.33

package/dist/core.cjs

@@ -1,5 +1,5 @@
 /*!
-  * wia core v1.1.31
+  * wia core v1.1.33
   * (c) 2015-2025 Sibyl Yu and contributors
   * Released under the MIT License.
   */

package/dist/core.js

@@ -1,5 +1,5 @@
 /*!
-  * wia core v1.1.31
+  * wia core v1.1.33
   * (c) 2015-2025 Sibyl Yu and contributors
   * Released under the MIT License.
   */

package/dist/core.min.js

@@ -1,10 +1,10 @@
 /*!
-  * wia core v1.1.31
+  * wia core v1.1.33
   * (c) 2015-2025 Sibyl Yu and contributors
   * Released under the MIT License.
   */
 /*!
-  * wia core v1.1.31
+  * wia core v1.1.33
   * (c) 2015-2025 Sibyl Yu and contributors
   * Released under the MIT License.
   */

package/dist/core.mjs

@@ -1,5 +1,5 @@
 /*!
-  * wia core v1.1.31
+  * wia core v1.1.33
   * (c) 2015-2025 Sibyl Yu and contributors
   * Released under the MIT License.
   */

package/dist/jsx-runtime.js

@@ -1,5 +1,5 @@
 /*!
-  * wia core v1.1.31
+  * wia core v1.1.33
   * (c) 2015-2025 Sibyl Yu and contributors
   * Released under the MIT License.
   */
@@ -16,7 +16,62 @@ function jsx(tag, {children, ...props} = {}) {
   if (typeof tag === 'function') R = tag({children, ...props});
   else if (typeof tag === 'string') {
     const attrs = props || {};
-    const attrsString = Object.keys(attrs)
+    const attrsArray = [];
+
+    // 特殊处理 className 和 htmlFor
+    if (attrs.className) {
+      attrsArray.push(`class="${attrs.className}"`);
+      delete attrs.className;
+    }
+    
+    if (attrs.htmlFor) {
+      attrsArray.push(`for="${attrs.htmlFor}"`);
+      delete attrs.htmlFor;
+    }
+
+    // 处理 style 对象
+    if (attrs.style && typeof attrs.style === 'object') {
+      const styleArray = [];
+      for (const [key, value] of Object.entries(attrs.style)) {
+        if (value == null) continue;
+        
+        // 转换驼峰式属性为CSS属性（backgroundColor -> background-color）
+        const cssProp = key.replace(/[A-Z]/g, m => `-${m.toLowerCase()}`);
+        
+        // 处理数值属性（添加px单位）
+        let cssValue = value;
+        if (typeof value === 'number' && 
+            // 这些属性不需要单位
+            !['zIndex', 'opacity', 'fontWeight', 'flex', 'order', 'zoom'].includes(key)) {
+          cssValue = `${value}px`;
+        }
+        
+        styleArray.push(`${cssProp}:${cssValue}`);
+      }
+      attrsArray.push(`style="${styleArray.join(';')}"`);
+      delete attrs.style;
+    }
+    
+    // 处理其他属性
+    for (const [key, value] of Object.entries(attrs)) {
+      // 跳过特殊处理的属性
+      if (key === 'children' || key === 'className' || key === 'htmlFor') continue;
+      
+      // 处理布尔属性（如 disabled, checked 等）
+      if (typeof value === 'boolean') {
+        if (value) {
+          attrsArray.push(key);
+        }
+      } 
+      // 处理动态值属性
+      else if (value != null) {
+        attrsArray.push(`${key}="${value}"`);
+      }
+    }
+
+    const attrsString = attrsArray.join(' ');
+
+/*    const attrsString = Object.keys(attrs)
       .map(attr => {
         if (attr[0] === '_') {
           if (attrs[attr]) return attr.replace('_', '');
@@ -26,18 +81,29 @@ function jsx(tag, {children, ...props} = {}) {
       })
       .filter(attr => !!attr)
       .join(' ');
-
-    if (['path', 'img', 'circle', 'polygon', 'line', 'input'].indexOf(tag) >= 0)
+*/
+    // 自闭合标签处理
+    const voidElements = ['input', 'img', 'br', 'hr', 'meta', 'link', 'area', 'base', 'col', 'embed', 'param', 'source', 'track', 'wbr', 'path', 'circle', 'polygon', 'line', 'rect', 'ellipse', 'use', 'stop'];
+    if (voidElements.includes(tag))
       R = `<${tag} ${attrsString} />`.trim();
     else {
       const childrenContent = Array.isArray(children)
         ? children
-            .filter(c => !!c)
-            .map(c => (Array.isArray(c) ? c.join('') : c))
+            .filter(c => c != null) // 只过滤 null/undefined
+            .map(c => {
+              if (Array.isArray(c)) return c.join('');
+              
+              // 特殊处理布尔值（不渲染）
+              if (typeof c === 'boolean') return '';
+              
+              return c;
+            })
             .join('')
-        : children;
+        : children != null
+          ? (typeof children === 'boolean' ? '' : children)
+          : '';
 
-      R = `<${tag} ${attrsString}>${childrenContent ?? ''}</${tag}>`.trim();
+      R = `<${tag} ${attrsString}>${childrenContent}</${tag}>`.trim();
     }
   }
 
@@ -47,12 +113,18 @@ function jsx(tag, {children, ...props} = {}) {
 function Fragment({children} = {}) {
   const R = Array.isArray(children)
     ? children
-        .filter(c => !!c)
-        .map(c => (Array.isArray(c) ? c.join('') : c))
+        .filter(c => c != null) // 只过滤 null/undefined
+        .map(c => {
+          if (Array.isArray(c)) return c.join('');
+          if (typeof c === 'boolean') return '';
+          return c;
+        })
         .join('')
-    : children;
+    : children != null
+      ? (typeof children === 'boolean' ? '' : children)
+      : '';
 
-  return R ?? '';
+  return R;
 }
 
 var Fragment_1 = jsxRuntime.Fragment = Fragment;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wiajs/core",
-  "version": "1.1.31",
+  "version": "1.1.33",
   "description": "wia app core package",
   "main": "./dist/core.cjs",
   "module": "./dist/core.mjs",

package/util/tool.js

@@ -130,43 +130,47 @@ function newFileName(len) {
 
 /**
  * 比较方法，用于对象数组排序，常用于数据表排序
- * @param {*} k 对象属性key
- * @param {*} asc 升序、降序，默认升序
- * @param {*} type 类型auto, number、datetime、string，缺省 auto
+ * @param {string} k 对象属性key
+ * @param {boolean} desc 升序、降序，默认升序
+ * @param {string} type 类型auto, number、date、string，缺省 auto
+ * @param {string} [sub] 子对象
  */
-function compareObj(k, desc, type) {
-  return function (o1, o2) {
-		let R = 0;
-		try {
-			let v1 = o1[k];
-			let v2 = o2[k];
-			// 数字、日期字符串，按数字、日期排序
-			if ($.isStr(v1) || $.isStr(v2)) {
-				// 金额可能有千字分隔符，需替换
-				if (type.toLowerCase() === 'number') {
-					v1 = v1.replaceAll(',', '');
-					v2 = v2.replaceAll(',', '');
-				}
-
-				if ($.isDateStr(v1) && $.isDateStr(v2)) {
-					v1 = Date.parse(v1);
-					v2 = Date.parse(v2);
-				} else if ($.isNumStr(v1) && $.isNumStr(v2)) {
-					v1 = Number(v1);
-					v2 = Number(v2);
-				}
-			}
-
-			if (v1 < v2) {
-				R = desc ? 1 : -1;
-			} else if (v1 > v2) {
-				R = desc ? -1 : 1;
-			}
-		} catch(ex) {
-			console.log('compareObj exp:', ex.message);
-		}
-    return R;
-  };
+function compareObj(k, desc, type, sub) {
+  return (o1, o2) => {
+    let R = 0
+    try {
+      let v1 = sub ? o1[sub][k] : o1[k]
+      let v2 = sub ? o2[sub][k] : o2[k]
+
+      // log({v1, v2, type}, 'compareObj')
+
+      if (typeof v1 === 'string' || typeof v2 === 'string') {
+        // 数字、日期字符串，按数字、日期排序
+        // 金额可能有千字分隔符，需替换
+        if (type.toLowerCase() === 'number') {
+          if (typeof v1 === 'string') {
+            v1 = v1.replaceAll(',', '').replaceAll(/null|-|^$/g, '0')
+            v1 = Number(v1)
+          }
+          if (typeof v2 === 'string') {
+            v2 = v2.replaceAll(',', '').replaceAll(/null|-|^$/g, '0')
+            v2 = Number(v2)
+          }
+        } else if (type.toLowerCase() === 'date') {
+          v1 = Date.parse(v1)
+          v2 = Date.parse(v2)
+        }
+      }
+
+      if (v1 < v2) R = desc ? 1 : -1
+      else if (v1 > v2) R = desc ? -1 : 1
+
+      // log({v1, v2, R}, 'compareObj')
+    } catch (ex) {
+      console.log('compareObj exp:', ex.message)
+    }
+    return R
+  }
 }
 
 /**