cloud-web-corejs 1.0.54-dev.705 → 1.0.54-dev.707

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "cloud-web-corejs",
   "private": false,
-  "version": "1.0.54-dev.705",
+  "version": "1.0.54-dev.707",
   "scripts": {
     "dev": "vue-cli-service serve",
     "lint": "eslint --ext .js,.vue src",

package/src/components/jsonImport/exportUtil.js

@@ -1,25 +1,3 @@
-function isNull(val) {
-  return val == null || val === "" || val === undefined;
-}
-
-export function formatJsonContent(content) {
-  if (isNull(content)) return "";
-  if (typeof content === "object") {
-    try {
-      return JSON.stringify(content, null, 2);
-    } catch (e) {
-      return String(content);
-    }
-  }
-  const text = String(content).trim();
-  if (!text) return "";
-  try {
-    return JSON.stringify(JSON.parse(text), null, 2);
-  } catch (e) {
-    return text;
-  }
-}
-
 function parseExportContent(content) {
   if (!content) {
     return { list: [], isArray: true };
@@ -62,129 +40,59 @@ export function getExportArchiveType(url) {
   return config ? config.type : null;
 }
 
-function getFormScriptPrefix(item) {
-  const scriptCode = item.scriptCode || "script";
-  const formCode = item.formCode;
-  return formCode ? `S-${scriptCode}-${formCode}` : `S-${scriptCode}`;
+function getFormScriptFileName(scriptCode, formCode) {
+  const code = scriptCode || "script";
+  return formCode ? `S&${code}&${formCode}` : `S&${code}`;
 }
 
-function appendFormTemplateExtraFiles(item, extraFiles, usedNames) {
+function buildFormTemplateScriptExtras(item) {
   const formCode = item.formCode || "form";
+  const usedNames = {};
 
-  if (!isNull(item.formViewContent)) {
-    const formatted = formatJsonContent(item.formViewContent);
-    item.formViewContent = formatted;
-    extraFiles.push({
-      fileName: uniqueFileName(`F-${formCode}-Item`, usedNames),
-      content: formatted,
-    });
-  }
-
-  (item.formScriptDTOs || []).forEach((scriptItem) => {
-    if (!scriptItem || isNull(scriptItem.script)) return;
-    const scriptCode = scriptItem.scriptCode || "script";
-    const scriptFormCode = scriptItem.formCode || formCode;
-    const formatted = formatJsonContent(scriptItem.script);
-    scriptItem.script = formatted;
-    extraFiles.push({
+  return (item.formScriptDTOs || []).reduce((files, scriptItem) => {
+    if (!scriptItem) return files;
+    files.push({
       fileName: uniqueFileName(
-        `FS-${scriptCode}-${scriptFormCode}-Item`,
+        getFormScriptFileName(scriptItem.scriptCode, scriptItem.formCode || formCode),
         usedNames
       ),
-      content: formatted,
-    });
-  });
-}
-
-function formatExportFields(item, archiveType) {
-  if (archiveType === ARCHIVE_TYPE.FORM_SCRIPT && !isNull(item.script)) {
-    item.script = formatJsonContent(item.script);
-    return;
-  }
-  if (archiveType === ARCHIVE_TYPE.FORM_TEMPLATE) {
-    if (!isNull(item.formViewContent)) {
-      item.formViewContent = formatJsonContent(item.formViewContent);
-    }
-    (item.formScriptDTOs || []).forEach((scriptItem) => {
-      if (scriptItem && !isNull(scriptItem.script)) {
-        scriptItem.script = formatJsonContent(scriptItem.script);
-      }
-    });
-  }
-}
-
-function processFormScriptArchive(item) {
-  const prefix = getFormScriptPrefix(item);
-  formatExportFields(item, ARCHIVE_TYPE.FORM_SCRIPT);
-  const extraFiles = [];
-
-  if (!isNull(item.script)) {
-    extraFiles.push({
-      fileName: `${prefix}-Item`,
-      content: item.script,
+      content: JSON.stringify(scriptItem, null, 2),
     });
-  }
-
-  return {
-    mainContent: JSON.stringify(item, null, 2),
-    mainFileName: `${prefix}-Source`,
-    extraFiles,
-  };
-}
-
-function processFormTemplateArchive(item) {
-  const formCode = item.formCode || "form";
-  const extraFiles = [];
-  const usedNames = {};
-
-  appendFormTemplateExtraFiles(item, extraFiles, usedNames);
-
-  return {
-    mainContent: JSON.stringify(item, null, 2),
-    mainFileName: `F-${formCode}-Source`,
-    extraFiles,
-  };
-}
-
-function processTableArchive(item) {
-  return {
-    mainContent: JSON.stringify(item, null, 2),
-    mainFileName: `T-${item.taBm || "table"}`,
-    extraFiles: [],
-  };
+    return files;
+  }, []);
 }
 
-export function processArchiveExport(content, archiveType) {
-  const { list, invalid } = parseExportContent(content);
-  if (invalid || !list.length) {
-    return { mainContent: content, mainFileName: null, extraFiles: [] };
-  }
+function buildArchiveResult(item, archiveType) {
+  const mainContent = JSON.stringify(item, null, 2);
 
-  const item = list[0];
   switch (archiveType) {
     case ARCHIVE_TYPE.FORM_SCRIPT:
-      return processFormScriptArchive(item);
+      return {
+        mainContent,
+        mainFileName: getFormScriptFileName(item.scriptCode, item.formCode),
+        extraFiles: [],
+      };
     case ARCHIVE_TYPE.FORM_TEMPLATE:
-      return processFormTemplateArchive(item);
+      return {
+        mainContent,
+        mainFileName: `F&${item.formCode || "form"}`,
+        extraFiles: buildFormTemplateScriptExtras(item),
+      };
     case ARCHIVE_TYPE.TABLE:
-      return processTableArchive(item);
+      return {
+        mainContent,
+        mainFileName: `T&${item.taBm || "table"}`,
+        extraFiles: [],
+      };
     default:
-      return { mainContent: content, mainFileName: null, extraFiles: [] };
+      return { mainContent, mainFileName: null, extraFiles: [] };
   }
 }
 
-/** 批量导出：仅格式化主 JSON 中的大字段，不额外拆文件 */
-export function formatBatchExportContent(content, url) {
-  const archiveType = getExportArchiveType(url);
-  if (!archiveType || archiveType === ARCHIVE_TYPE.TABLE) {
-    return content;
-  }
-
-  const { list, isArray, invalid } = parseExportContent(content);
+export function processArchiveExport(content, archiveType) {
+  const { list, invalid } = parseExportContent(content);
   if (invalid || !list.length) {
-    return content;
+    return { mainContent: content, mainFileName: null, extraFiles: [] };
   }
-
-  list.forEach((item) => formatExportFields(item, archiveType));
-  return JSON.stringify(isArray ? list : list[0], null, 2);
+  return buildArchiveResult(list[0], archiveType);
 }

package/src/components/jsonImport/index.js

@@ -5,7 +5,6 @@ import exportDialog from "./exportDialog.vue";
 import { getBdEnv } from "@base/api/user";
 import { encrypt } from "@base/utils/aes";
 import {
-  formatBatchExportContent,
   getExportArchiveType,
   processArchiveExport,
 } from "./exportUtil";
@@ -107,9 +106,12 @@ moudule.install = function (Vue) {
             if (archiveType) {
               const processed = processArchiveExport(content, archiveType);
               downloadTxt(processed.mainFileName, processed.mainContent);
-              downloadExtraFiles(processed.extraFiles);
+              (processed.extraFiles || []).forEach((file, index) => {
+                setTimeout(() => {
+                  downloadTxt(file.fileName, file.content);
+                }, (index + 1) * 300);
+              });
             } else {
-              content = formatBatchExportContent(content, options.url);
               let fileName = options.fileName;
               if (!fileName) {
                 const timeStr = res.time
@@ -157,15 +159,6 @@ moudule.install = function (Vue) {
   };
 };
 
-function downloadExtraFiles(extraFiles) {
-  if (!extraFiles || !extraFiles.length) return;
-  extraFiles.forEach((file, index) => {
-    setTimeout(() => {
-      downloadTxt(file.fileName, file.content);
-    }, (index + 1) * 300);
-  });
-}
-
 function downloadTxt(fileName, content) {
   // 创建Blob对象
   const blob = new Blob([content], { type: "text/plain;charset=utf-8" });

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 + "%";
+}