cloud-web-corejs 1.0.276 → 1.0.277

package/src/components/xform/utils/format.js

@@ -1,97 +1,118 @@
-// import dayjs from 'dayjs'
-import moment from 'moment'
+function parseToDate(input) {
+  if (input == null || input === "") {
+    return null;
+  }
+  if (input instanceof Date) {
+    return isNaN(input.getTime()) ? null : input;
+  }
+  if (typeof input === "number") {
+    const ms = String(input).length === 10 ? input * 1000 : input;
+    const date = new Date(ms);
+    return isNaN(date.getTime()) ? null : date;
+  }
+  if (typeof input === "string") {
+    const trimmed = input.trim();
+    if (!trimmed) {
+      return null;
+    }
+    if (/^[0-9]+$/.test(trimmed)) {
+      const num = parseInt(trimmed, 10);
+      const ms = trimmed.length === 10 ? num * 1000 : num;
+      const date = new Date(ms);
+      return isNaN(date.getTime()) ? null : date;
+    }
+    const date = new Date(
+      trimmed.includes("-") ? trimmed.replace(/-/g, "/") : trimmed
+    );
+    return isNaN(date.getTime()) ? null : date;
+  }
+  return null;
+}
 
-function validateDate(dateStr) {
-	let date = new Date( Date.parse(dateStr) )
-	return (date instanceof Date) && !isNaN(date.getTime())
+function formatByPattern(date, pattern) {
+  const parsedDate = parseToDate(date);
+  if (!parsedDate) {
+    return date;
+  }
+  const pad = (n) => String(n).padStart(2, "0");
+  const tokens = {
+    YYYY: String(parsedDate.getFullYear()),
+    MM: pad(parsedDate.getMonth() + 1),
+    DD: pad(parsedDate.getDate()),
+    HH: pad(parsedDate.getHours()),
+    mm: pad(parsedDate.getMinutes()),
+    ss: pad(parsedDate.getSeconds()),
+    hh: pad(parsedDate.getHours() % 12 || 12),
+  };
+  let result = pattern;
+  Object.keys(tokens).forEach((key) => {
+    result = result.replace(key, tokens[key]);
+  });
+  return result;
 }
 
 export function formatDate1(date) {
-	if (!validateDate(date)) {
-		return date;
-	}
-
-	// return dayjs(date).format('YYYY-MM-DD')
-	return moment(date).format('YYYY-MM-DD')
+  return formatByPattern(date, "YYYY-MM-DD");
 }
 
 export function formatDate2(date) {
-	if (!validateDate(date)) {
-		return date;
-	}
-
-	// return dayjs(date).format('YYYY/MM/DD')
-	return moment(date).format('YYYY/MM/DD')
+  return formatByPattern(date, "YYYY/MM/DD");
 }
 
 export function formatDate3(date) {
-	if (!validateDate(date)) {
-		return date;
-	}
-
-	// return dayjs(date).format('YYYY年MM月DD日')
-	return moment(date).format('YYYY年MM月DD日')
+  return formatByPattern(date, "YYYY年MM月DD日");
 }
 
 export function formatDate4(date) {
-	if (!validateDate(date)) {
-		return date;
-	}
-
-	// return dayjs(date).format('YYYY-MM-DD HH:mm:ss')
-	return moment(date).format('YYYY-MM-DD HH:mm:ss')
+  return formatByPattern(date, "YYYY-MM-DD HH:mm:ss");
 }
 
 export function formatDate5(date) {
-	if (!validateDate(date)) {
-		return date;
-	}
-
-	// return dayjs(date).format('YYYY-MM-DD hh:mm:ss')
-	return moment(date).format('YYYY-MM-DD hh:mm:ss')
+  return formatByPattern(date, "YYYY-MM-DD hh:mm:ss");
 }
 
 // ###,###,###,##0.######
 export function formatNumber1(v) {
-	if (typeof(v) != "number") {
-		return v;
-	}
+  if (typeof v != "number") {
+    return v;
+  }
   let length = getFixedSize(v);
-	switch(length){
-		case 0:
-				v = v.toFixed(0)
-				break;
-		case 1:
-				v = v.toFixed(1)
-				break;
-		case 2:
-				v = v.toFixed(2)
-				break;
-		case 3:
-				v = v.toFixed(3)
-				break;
-		case 4:
-				v = v.toFixed(4)
-				break;
-		case 5:
-				v = v.toFixed(5)
-				break;
-		default:
-				v = v.toFixed(6)
-	}
-	let res = v.toString().replace(/\d+/, function(n){ // 先提取整数部分
-		return n.replace(/(\d)(?=(\d{3})+$)/g,function($1){
-			return $1+",";
-			});
-		})
-	return res;
+  switch (length) {
+    case 0:
+      v = v.toFixed(0);
+      break;
+    case 1:
+      v = v.toFixed(1);
+      break;
+    case 2:
+      v = v.toFixed(2);
+      break;
+    case 3:
+      v = v.toFixed(3);
+      break;
+    case 4:
+      v = v.toFixed(4);
+      break;
+    case 5:
+      v = v.toFixed(5);
+      break;
+    default:
+      v = v.toFixed(6);
+  }
+  let res = v.toString().replace(/\d+/, function (n) {
+    // 先提取整数部分
+    return n.replace(/(\d)(?=(\d{3})+$)/g, function ($1) {
+      return $1 + ",";
+    });
+  });
+  return res;
 }
 
-function getFixedSize(v){
+function getFixedSize(v) {
   let size = 0;
-  if(v!==null && v!==undefined){
+  if (v !== null && v !== undefined) {
     let arr = v.toString().split(".");
-    if(arr.length>1){
+    if (arr.length > 1) {
       size = arr[1].length;
     }
   }
@@ -99,123 +120,128 @@ function getFixedSize(v){
 }
 //###,###,###,##0.00####
 export function formatNumber2(v) {
-	if (typeof(v) != "number") {
-		return v;
-	}
-
-	let length = getFixedSize(v);
-	switch(length){
-		case 0:
-		case 1:
-		case 2:
-				v = v.toFixed(2)
-				break;
-		case 3:
-				v = v.toFixed(3)
-				break;
-		case 4:
-				v = v.toFixed(4)
-				break;
-		case 5:
-				v = v.toFixed(5)
-				break;
-		default:
-				v = v.toFixed(6)
-	}
-
-	let res = v.toString().replace(/\d+/, function(n){ // 先提取整数部分
-		return n.replace(/(\d)(?=(\d{3})+$)/g,function($1){
-			return $1+",";
-			});
-		})
-	return res;
+  if (typeof v != "number") {
+    return v;
+  }
+
+  let length = getFixedSize(v);
+  switch (length) {
+    case 0:
+    case 1:
+    case 2:
+      v = v.toFixed(2);
+      break;
+    case 3:
+      v = v.toFixed(3);
+      break;
+    case 4:
+      v = v.toFixed(4);
+      break;
+    case 5:
+      v = v.toFixed(5);
+      break;
+    default:
+      v = v.toFixed(6);
+  }
+
+  let res = v.toString().replace(/\d+/, function (n) {
+    // 先提取整数部分
+    return n.replace(/(\d)(?=(\d{3})+$)/g, function ($1) {
+      return $1 + ",";
+    });
+  });
+  return res;
 }
 
 // ###,###,###,##0.000000
 export function formatNumber3(v) {
-	if (typeof(v) != "number") {
-		return v;
-	}
-
-	v = v.toFixed(6)
-	let res = v.toString().replace(/\d+/, function(n){ // 先提取整数部分
-		return n.replace(/(\d)(?=(\d{3})+$)/g,function($1){
-			return $1+",";
-			});
-		})
-	return res;
+  if (typeof v != "number") {
+    return v;
+  }
+
+  v = v.toFixed(6);
+  let res = v.toString().replace(/\d+/, function (n) {
+    // 先提取整数部分
+    return n.replace(/(\d)(?=(\d{3})+$)/g, function ($1) {
+      return $1 + ",";
+    });
+  });
+  return res;
 }
 // ###,###,###,##0.000
 export function formatNumber4(v) {
-	if (typeof(v) != "number") {
-		return v;
-	}
-
-	v = v.toFixed(3)
-	let res = v.toString().replace(/\d+/, function(n){ // 先提取整数部分
-		return n.replace(/(\d)(?=(\d{3})+$)/g,function($1){
-			return $1+",";
-			});
-		})
-	return res;
+  if (typeof v != "number") {
+    return v;
+  }
+
+  v = v.toFixed(3);
+  let res = v.toString().replace(/\d+/, function (n) {
+    // 先提取整数部分
+    return n.replace(/(\d)(?=(\d{3})+$)/g, function ($1) {
+      return $1 + ",";
+    });
+  });
+  return res;
 }
 
 // ###,###,###,##0.00
 export function formatNumber5(v) {
-	if (typeof(v) != "number") {
-		return v;
-	}
-
-	v = v.toFixed(2)
-	let res = v.toString().replace(/\d+/, function(n){ // 先提取整数部分
-		return n.replace(/(\d)(?=(\d{3})+$)/g,function($1){
-			return $1+",";
-			});
-		})
-	return res;
+  if (typeof v != "number") {
+    return v;
+  }
+
+  v = v.toFixed(2);
+  let res = v.toString().replace(/\d+/, function (n) {
+    // 先提取整数部分
+    return n.replace(/(\d)(?=(\d{3})+$)/g, function ($1) {
+      return $1 + ",";
+    });
+  });
+  return res;
 }
 
 // ###,###,###,##0
 export function formatNumber6(v) {
-	if (typeof(v) != "number") {
-		return v;
-	}
-
-	v = v.toFixed(0)
-	let res = v.toString().replace(/\d+/, function(n){ // 先提取整数部分
-		return n.replace(/(\d)(?=(\d{3})+$)/g,function($1){
-			return $1+",";
-			});
-		})
-	return res;
+  if (typeof v != "number") {
+    return v;
+  }
+
+  v = v.toFixed(0);
+  let res = v.toString().replace(/\d+/, function (n) {
+    // 先提取整数部分
+    return n.replace(/(\d)(?=(\d{3})+$)/g, function ($1) {
+      return $1 + ",";
+    });
+  });
+  return res;
 }
 
 // ###,##0.00##%
 export function formatNumber7(v) {
-	if (typeof(v) != "number") {
-		return v;
-	}
-
-	let length = getFixedSize(v);
-	v = v*100
-	switch(length){
-		case 0:
-		case 1:
-		case 2:
-				v = v.toFixed(2)
-				break;
-		case 3:
-				v = v.toFixed(3)
-				break;
-		default:
-				v = v.toFixed(4)
-	}
-
-	let res = v.toString().replace(/\d+/, function(n){ // 先提取整数部分
-		return n.replace(/(\d)(?=(\d{3})+$)/g,function($1){
-			return $1+",";
-			});
-		})
-	return res+'%';
-}
+  if (typeof v != "number") {
+    return v;
+  }
 
+  let length = getFixedSize(v);
+  v = v * 100;
+  switch (length) {
+    case 0:
+    case 1:
+    case 2:
+      v = v.toFixed(2);
+      break;
+    case 3:
+      v = v.toFixed(3);
+      break;
+    default:
+      v = v.toFixed(4);
+  }
+
+  let res = v.toString().replace(/\d+/, function (n) {
+    // 先提取整数部分
+    return n.replace(/(\d)(?=(\d{3})+$)/g, function ($1) {
+      return $1 + ",";
+    });
+  });
+  return res + "%";
+}

package/src/components/xform/utils/queryParamUtil.js

@@ -0,0 +1,84 @@
+/**
+ * 宿主注入查询表格的查询参数（dataTableOption.queryParam）合并规则。
+ *
+ * 查询表格发给后台的请求体形如：
+ *   { condition: [{ field, value, filter }, ...], current, size, searchCount, ...其它平铺参数 }
+ * 其中 `condition` 由查询区字段按类型自动组装（见 data-table-mixin.js 的 getSearchFormData），
+ * 平铺参数则是给后台脚本（formScriptParam 那套约定）读的。
+ *
+ * 宿主（选择弹框 / 表单弹框 / 表单抽屉）传进来的 queryParam 此前是整体 Object.assign，
+ * 于是带 `condition` 的写法会把查询区当场输入的条件**整个覆盖掉**。这里把 `condition`
+ * 单独拿出来做追加合并，其余键保持原来的平铺覆盖语义。
+ *
+ * 使用方：data-table-mixin.js（PC）、list-h5-item.vue（H5）两条查询链路。
+ */
+
+/** 未显式给 filter 时的默认比较符：数组按 in，其余按 eq（宿主条件是精确过滤，不该默认 like） */
+function defaultFilter(value) {
+  return Array.isArray(value) ? "in" : "eq";
+}
+
+/**
+ * 把 condition 归一成 [{ field, value, filter }]。接受三种写法：
+ *   1. 数组：[{ field: "status", value: 1, filter: "eq" }]（原生格式，filter 可省）
+ *   2. 对象简写：{ status: 1, type: ["A", "B"] } → filter 自动取 eq / in
+ *   3. 对象 + 比较符：{ createTime: { value: ["2026-01-01", "2026-12-31"], filter: "between" } }
+ * @param {Array|Object} condition
+ * @returns {Array} 归一后的条件项数组；无效输入返回空数组
+ */
+export function normalizeCondition(condition) {
+  if (!condition) return [];
+  if (Array.isArray(condition)) {
+    return condition
+      .filter((item) => item && item.field)
+      .map((item) => ({
+        ...item,
+        filter: item.filter || defaultFilter(item.value),
+      }));
+  }
+  if (typeof condition !== "object") return [];
+  return Object.keys(condition).map((field) => {
+    let raw = condition[field];
+    // 只有「纯对象且带 value 键」才当成 {value, filter} 写法，避免把业务对象拆错
+    let isDetail
+      = raw
+      && typeof raw === "object"
+      && !Array.isArray(raw)
+      && Object.prototype.hasOwnProperty.call(raw, "value");
+    let value = isDetail ? raw.value : raw;
+    return {
+      field: field,
+      value: value,
+      filter: (isDetail && raw.filter) || defaultFilter(value),
+    };
+  });
+}
+
+/**
+ * 合并宿主 queryParam 到请求参数上（原地修改 queryParams 并返回它）。
+ * - `condition`：追加到查询区已组装的条件之后；**同 field 以宿主的为准**（先剔旧再追加），
+ *   这样宿主条件既不会被用户输入顶掉，也不会和用户输入同字段撞成两条。
+ * - 其余键：平铺覆盖（与改造前一致）。
+ * @param {Object} queryParams 查询表格已组装好的请求参数
+ * @param {Object} queryParam  宿主注入的查询参数
+ * @returns {Object} queryParams
+ */
+export function mergeQueryParam(queryParams, queryParam) {
+  if (!queryParams || !queryParam) return queryParams;
+
+  let hostCondition = normalizeCondition(queryParam.condition);
+  Object.keys(queryParam).forEach((key) => {
+    if (key !== "condition") queryParams[key] = queryParam[key];
+  });
+
+  if (!hostCondition.length) return queryParams;
+
+  let hostFields = hostCondition.map((item) => item.field);
+  let baseCondition = Array.isArray(queryParams.condition)
+    ? queryParams.condition.filter(
+        (item) => !item || hostFields.indexOf(item.field) < 0
+      )
+    : [];
+  queryParams.condition = baseCondition.concat(hostCondition);
+  return queryParams;
+}

package/src/components/xform/utils/tableColumnHelper.js

@@ -91,14 +91,13 @@ export function applyColumnLabelIcon(col, columnConfig) {
   const tooltip = columnConfig.labelTooltip;
   const required = resolveColumnRequiredFlag(columnConfig);
   const title = col.title;
-  const displayIconClass = iconClass || (tooltip ? "el-icon-info" : null);
 
-  if (!displayIconClass && !required) {
+  if (!iconClass && !required) {
     return col;
   }
 
   const buildIcon = (h) => {
-    const icon = h("i", { class: ["vxe-cell-help-icon", displayIconClass] });
+    const icon = h("i", { class: ["vxe-cell-help-icon", iconClass] });
     if (!tooltip) {
       return icon;
     }
@@ -116,15 +115,15 @@ export function applyColumnLabelIcon(col, columnConfig) {
     );
   };
 
-  if (displayIconClass && position === "front" && !required) {
+  if (iconClass && position === "front" && !required) {
     col.titlePrefix = {
-      icon: displayIconClass,
+      icon: iconClass,
       ...buildVxeTitlePrefixTooltip(tooltip),
     };
     return col;
   }
 
-  if (required && !displayIconClass) {
+  if (required && !iconClass) {
     col.titlePrefix = { icon: "vxe-cell--required-icon" };
     return col;
   }
@@ -137,11 +136,11 @@ export function applyColumnLabelIcon(col, columnConfig) {
     if (required) {
       nodes.push(h("i", { class: "vxe-cell--required-icon" }));
     }
-    if (displayIconClass && position === "front") {
+    if (iconClass && position === "front") {
       nodes.push(buildIcon(h));
     }
     nodes.push(h("span", { class: "vxe-cell--title" }, title));
-    if (displayIconClass && position === "rear") {
+    if (iconClass && position === "rear") {
       nodes.push(buildIcon(h));
     }
     return nodes;