cloud-web-corejs 1.0.54-dev.690 → 1.0.54-dev.693

package/package.json

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

package/src/api/user.js

@@ -119,6 +119,14 @@ export function getLoginConfig(option) {
   });
 }
 
+export function getLogicParamValue(option) {
+  return request({
+    url: USER_PREFIX + "/logic_param/getParamValue",
+    method: "post",
+    ...option,
+  });
+}
+
 export function getIdmLoginUrl(option) {
   return request({
     url: USER_PREFIX + "/auth/idmLoginUrl",

package/src/components/xform/form-designer/setting-panel/property-editor/container-data-table/table-column-dialog.vue

@@ -1112,13 +1112,18 @@ export default {
         const next = Object.assign({}, row);
         const orig = widgetMap[next.columnId];
         if (orig) {
-          if (!next.widget && orig.widget) {
+          // 仅 formatS 未变更时补回 widget，避免清空 formatS 后又被快照还原
+          const formatUnchanged = next.formatS === orig.formatS;
+          const editFormatUnchanged = next.editFormatS === orig.editFormatS;
+          if (formatUnchanged && !next.widget && orig.widget) {
             next.widget = orig.widget;
           }
-          if (!next.editWidget && orig.editWidget) {
+          if (editFormatUnchanged && !next.editWidget && orig.editWidget) {
             next.editWidget = orig.editWidget;
           }
           if (
+            formatUnchanged &&
+            next.formatS === "widgetRender" &&
             (!next.widgetList || !next.widgetList.length) &&
             orig.widgetList &&
             orig.widgetList.length

package/src/components/xform/form-designer/widget-panel/widgetsConfig.js

@@ -48,7 +48,7 @@ export const containers = [
       // anchor 模式：插入位置 replace=替换占位行 / before=占位行之前 / after=占位行之后
       dynamicSchemaAnchorPosition: "replace",
       // anchor 模式：是否继承占位行的列布局(单元格数量/宽度/跨列)，否则按 dynamicSchemaColumns 平铺
-      dynamicSchemaInheritLayout: true,
+      dynamicSchemaInheritLayout: false,
       ...defaultWfConfig,
     },
   },
@@ -3717,6 +3717,7 @@ export const advancedFields = [
 
       ...httpConfig,
       ...defaultWfConfig,
+      formScriptEnabled: false,
       //-------------------
       onCreated: "",
       onMounted: "",

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

@@ -1,148 +1,148 @@
-import {
-  isEmptyStr,
-  isEmptyArrayFieldValue,
-  isArrayValueWidgetType,
-  isVabsearchWidgetType,
-  isVabsearchMultiWidget,
-} from "./util";
-import { resolveColumnRequiredFlag } from "./tableColumnHelper";
-
-/** 数据表格行内字段候选 key（column.prop 为权威存储字段） */
-export function getCellFieldKeys(fieldWidget, columnConfig) {
-  const keys = [];
-  const addKey = (key) => {
-    if (key && !keys.includes(key)) {
-      keys.push(key);
-    }
-  };
-
-  addKey(columnConfig?.prop);
-
-  if (!fieldWidget) {
-    return keys;
-  }
-
-  const options = fieldWidget.options || {};
-  if (
-    isVabsearchWidgetType(fieldWidget.type) &&
-    !isVabsearchMultiWidget(fieldWidget)
-  ) {
-    addKey(options.vabSearchName);
-    addKey(getWidgetFieldKey(fieldWidget));
-  } else {
-    addKey(getWidgetFieldKey(fieldWidget));
-  }
-
-  return keys;
-}
-
-export function getCellFieldKey(fieldWidget, columnConfig) {
-  const keys = getCellFieldKeys(fieldWidget, columnConfig);
-  return keys.length ? keys[0] : null;
-}
-
-export function getWidgetFieldKey(widget) {
-  if (!widget?.options) {
-    return null;
-  }
-  const o = widget.options.name;
-  return (widget.options.keyNameEnabled && widget.options.keyName) || o;
-}
-
-export function isCellFieldRequired(columnConfig, fieldWidget) {
-  if (!fieldWidget || fieldWidget.options?.hidden) {
-    return false;
-  }
-  if (fieldWidget.options?.required) {
-    return true;
-  }
-  return resolveColumnRequiredFlag(columnConfig);
-}
-
-export function shouldSkipCellValidation(fieldWidget) {
-  if (!fieldWidget) {
-    return true;
-  }
-  if (fieldWidget.options?.hidden) {
-    return true;
-  }
-  if (fieldWidget.options?.disabled) {
-    return true;
-  }
-  return false;
-}
-
-export function isEmptyCellValue(fieldWidget, value) {
-  if (!fieldWidget) {
-    return false;
-  }
-  const type = fieldWidget.type;
-  const options = fieldWidget.options || {};
-
-  if (type === "number") {
-    return value === null || value === undefined || value === "";
-  }
-
-  if (isArrayValueWidgetType(type, options)) {
-    return isEmptyArrayFieldValue(value, type, options);
-  }
-
-  if (type === "select" || type === "radio" || type === "status") {
-    if (value === null || value === undefined || value === "") {
-      return true;
-    }
-    if (typeof value === "string" && !/[^\s]/.test(value)) {
-      return true;
-    }
-    return false;
-  }
-
-  return isEmptyStr(value);
-}
-
-/** 从行数据中读取单元格值（兼容 column.prop 与 widget 字段名不一致） */
-export function getCellValueFromRow(row, fieldWidget, columnConfig) {
-  if (!row) {
-    return undefined;
-  }
-  const keys = getCellFieldKeys(fieldWidget, columnConfig);
-  if (!keys.length) {
-    return undefined;
-  }
-  let fallbackValue;
-  for (const key of keys) {
-    const value = row[key];
-    if (fallbackValue === undefined) {
-      fallbackValue = value;
-    }
-    if (!isEmptyCellValue(fieldWidget, value)) {
-      return value;
-    }
-  }
-  return fallbackValue;
-}
-
-export function isEmptyCellValueInRow(row, fieldWidget, columnConfig) {
-  return isEmptyCellValue(
-    fieldWidget,
-    getCellValueFromRow(row, fieldWidget, columnConfig)
-  );
-}
-
-export function buildCellRequiredHint(fieldWidget, columnConfig, t1Fn) {
-  const options = fieldWidget?.options || {};
-  if (options.requiredHint) {
-    return t1Fn(options.requiredHint);
-  }
-  const label = t1Fn(
-    options.label || columnConfig?.label || columnConfig?.prop || ""
-  );
-  return t1Fn("[{label}]不能为空", { label });
-}
-
-export function buildTableCellFormProp(tableFieldKeyName, rowIndex, fieldKey) {
-  if (!tableFieldKeyName || !fieldKey || rowIndex < 0) {
-    return null;
-  }
-  return `${tableFieldKeyName}.${rowIndex}.${fieldKey}`;
-}
+import {
+  isEmptyStr,
+  isEmptyArrayFieldValue,
+  isArrayValueWidgetType,
+  isVabsearchWidgetType,
+  isVabsearchMultiWidget,
+} from "./util";
+import { resolveColumnRequiredFlag } from "./tableColumnHelper";
+
+/** 数据表格行内字段候选 key（column.prop 为权威存储字段） */
+export function getCellFieldKeys(fieldWidget, columnConfig) {
+  const keys = [];
+  const addKey = (key) => {
+    if (key && !keys.includes(key)) {
+      keys.push(key);
+    }
+  };
+
+  addKey(columnConfig?.prop);
+
+  if (!fieldWidget) {
+    return keys;
+  }
+
+  const options = fieldWidget.options || {};
+  if (
+    isVabsearchWidgetType(fieldWidget.type) &&
+    !isVabsearchMultiWidget(fieldWidget)
+  ) {
+    addKey(options.vabSearchName);
+    addKey(getWidgetFieldKey(fieldWidget));
+  } else {
+    addKey(getWidgetFieldKey(fieldWidget));
+  }
+
+  return keys;
+}
+
+export function getCellFieldKey(fieldWidget, columnConfig) {
+  const keys = getCellFieldKeys(fieldWidget, columnConfig);
+  return keys.length ? keys[0] : null;
+}
+
+export function getWidgetFieldKey(widget) {
+  if (!widget?.options) {
+    return null;
+  }
+  const o = widget.options.name;
+  return (widget.options.keyNameEnabled && widget.options.keyName) || o;
+}
+
+export function isCellFieldRequired(columnConfig, fieldWidget) {
+  if (!fieldWidget || fieldWidget.options?.hidden) {
+    return false;
+  }
+  if (fieldWidget.options?.required) {
+    return true;
+  }
+  return resolveColumnRequiredFlag(columnConfig);
+}
+
+export function shouldSkipCellValidation(fieldWidget) {
+  if (!fieldWidget) {
+    return true;
+  }
+  if (fieldWidget.options?.hidden) {
+    return true;
+  }
+  if (fieldWidget.options?.disabled) {
+    return true;
+  }
+  return false;
+}
+
+export function isEmptyCellValue(fieldWidget, value) {
+  if (!fieldWidget) {
+    return false;
+  }
+  const type = fieldWidget.type;
+  const options = fieldWidget.options || {};
+
+  if (type === "number") {
+    return value === null || value === undefined || value === "";
+  }
+
+  if (isArrayValueWidgetType(type, options)) {
+    return isEmptyArrayFieldValue(value, type, options);
+  }
+
+  if (type === "select" || type === "radio" || type === "status") {
+    if (value === null || value === undefined || value === "") {
+      return true;
+    }
+    if (typeof value === "string" && !/[^\s]/.test(value)) {
+      return true;
+    }
+    return false;
+  }
+
+  return isEmptyStr(value);
+}
+
+/** 从行数据中读取单元格值（兼容 column.prop 与 widget 字段名不一致） */
+export function getCellValueFromRow(row, fieldWidget, columnConfig) {
+  if (!row) {
+    return undefined;
+  }
+  const keys = getCellFieldKeys(fieldWidget, columnConfig);
+  if (!keys.length) {
+    return undefined;
+  }
+  let fallbackValue;
+  for (const key of keys) {
+    const value = row[key];
+    if (fallbackValue === undefined) {
+      fallbackValue = value;
+    }
+    if (!isEmptyCellValue(fieldWidget, value)) {
+      return value;
+    }
+  }
+  return fallbackValue;
+}
+
+export function isEmptyCellValueInRow(row, fieldWidget, columnConfig) {
+  return isEmptyCellValue(
+    fieldWidget,
+    getCellValueFromRow(row, fieldWidget, columnConfig)
+  );
+}
+
+export function buildCellRequiredHint(fieldWidget, columnConfig, t1Fn) {
+  const options = fieldWidget?.options || {};
+  if (options.requiredHint) {
+    return t1Fn(options.requiredHint);
+  }
+  const label = t1Fn(
+    options.label || columnConfig?.label || columnConfig?.prop || ""
+  );
+  return t1Fn("[{label}]不能为空", { label });
+}
+
+export function buildTableCellFormProp(tableFieldKeyName, rowIndex, fieldKey) {
+  if (!tableFieldKeyName || !fieldKey || rowIndex < 0) {
+    return null;
+  }
+  return `${tableFieldKeyName}.${rowIndex}.${fieldKey}`;
+}

package/src/utils/vab.js

@@ -42,6 +42,7 @@ const FILE_ICON_NAME_MAP = {
   txt: "ico-txt.svg",
   java: "ico-java.svg",
   vue: "ico-vue.svg",
+  ftl: "ico-ftl.svg",
   xml: "ico-xml.svg",
   flash: "ico-flash.svg",
   zip: "ico-yasuobao.svg",
@@ -76,6 +77,7 @@ const FILE_ICON_TYPE_MAP = {
   txt: "txt",
   java: "java",
   vue: "vue",
+  ftl: "ftl",
   xml: "xml",
   swf: "flash",
   zip: "zip",
@@ -85,6 +87,95 @@ const FILE_ICON_TYPE_MAP = {
   psd: "psd",
 };
 
+let typeList = [
+  "doc",
+  "docx",
+  "xls",
+  "xlsx",
+  "ppt",
+  "pptx",
+  "csv",
+  "wps",
+  "dps",
+  "et",
+  "ett",
+  "wpt",
+  "vsd",
+  "vsdx",
+  "wmf",
+  "emf",
+  "psd",
+  "eps",
+  "pdf",
+  "xmind",
+  "obj",
+  "3ds",
+  "stl",
+  "ply",
+  "gltf",
+  "glb",
+  "off",
+  "3dm",
+  "fbx",
+  "dae",
+  "wrl",
+  "3mf",
+  "ifc",
+  "brep",
+  "step",
+  "iges",
+  "fcstd",
+  "bim",
+  "dwg",
+  "dxf",
+  "dwf",
+  "iges",
+  "igs",
+  "dwt",
+  "dng",
+  "ifc",
+  "dwfx",
+  "stl",
+  "cf2",
+  "plt",
+  "txt",
+  "xml",
+  "md",
+  "java",
+  "php",
+  "py",
+  "js",
+  "css",
+  "zip",
+  "rar",
+  "jar",
+  "tar",
+  "gzip",
+  "7z",
+  "mp3",
+  "wav",
+  "mp4",
+  "flv",
+  "avi",
+  "rm",
+  "mkv",
+  "mpeg",
+  "mpg",
+  "rmvb",
+  "wmv",
+  "3gp",
+  "swf",
+  "drawio",
+  "tif",
+  "tiff",
+  "jfif",
+  "webp",
+  "tga",
+  "svg",
+  "vue",
+  "ftl",
+];
+
 const accessToken = imFun.store.getters["user/token"];
 
 const loadingText = "";
@@ -117,9 +208,9 @@ install = (Vue, opts = {}) => {
       option.addCreateInfo = defaultOption.addCreateInfo;
     }
     if (
-      opts.queryCreateInfo === null
-      || opts.queryCreateInfo === undefined
-      || opts.queryCreateInfo === true
+      opts.queryCreateInfo === null ||
+      opts.queryCreateInfo === undefined ||
+      opts.queryCreateInfo === true
     ) {
       option.queryCreateInfo = defaultOption.queryCreateInfo;
     }
@@ -300,93 +391,6 @@ install = (Vue, opts = {}) => {
   /* 全局事件总线 */
   Vue.prototype.$baseEventBus = new Vue();
 
-  let typeList = [
-    "doc",
-    "docx",
-    "xls",
-    "xlsx",
-    "ppt",
-    "pptx",
-    "csv",
-    "wps",
-    "dps",
-    "et",
-    "ett",
-    "wpt",
-    "vsd",
-    "vsdx",
-    "wmf",
-    "emf",
-    "psd",
-    "eps",
-    "pdf",
-    "xmind",
-    "obj",
-    "3ds",
-    "stl",
-    "ply",
-    "gltf",
-    "glb",
-    "off",
-    "3dm",
-    "fbx",
-    "dae",
-    "wrl",
-    "3mf",
-    "ifc",
-    "brep",
-    "step",
-    "iges",
-    "fcstd",
-    "bim",
-    "dwg",
-    "dxf",
-    "dwf",
-    "iges",
-    "igs",
-    "dwt",
-    "dng",
-    "ifc",
-    "dwfx",
-    "stl",
-    "cf2",
-    "plt",
-    "txt",
-    "xml",
-    "md",
-    "java",
-    "php",
-    "py",
-    "js",
-    "css",
-    "zip",
-    "rar",
-    "jar",
-    "tar",
-    "gzip",
-    "7z",
-    "mp3",
-    "wav",
-    "mp4",
-    "flv",
-    "avi",
-    "rm",
-    "mkv",
-    "mpeg",
-    "mpg",
-    "rmvb",
-    "wmv",
-    "3gp",
-    "swf",
-    "drawio",
-    "tif",
-    "tiff",
-    "jfif",
-    "webp",
-    "tga",
-    "svg",
-    "vue",
-  ];
   Vue.prototype.$commonFileUtil = {
     // 文件类型获取与判断接口
     getFileSuffix: function (name) {
@@ -779,8 +783,8 @@ install = (Vue, opts = {}) => {
       if (Array.isArray(attachment)) {
         let currentFile = attachment[index];
         let typeStr = Object.prototype.toString.call(currentFile);
-        let url
-          = typeStr === "[object Object]"
+        let url =
+          typeStr === "[object Object]"
             ? currentFile.domain + currentFile.url
             : currentFile;
         if (that.$commonFileUtil.isPictureFile(url)) {
@@ -790,8 +794,8 @@ install = (Vue, opts = {}) => {
         }
       } else {
         let typeStr = Object.prototype.toString.call(attachment);
-        let url
-          = typeStr === "[object Object]"
+        let url =
+          typeStr === "[object Object]"
             ? attachment.domain + attachment.url
             : attachment;
         if (that.$commonFileUtil.isPictureFile(url)) {
@@ -819,11 +823,11 @@ install = (Vue, opts = {}) => {
     let visibleKey = target.$attrs["visible-key"] || "showEdit";
     let parentTarget = target.$attrs["parent-target"] || target.$parent;
     let originTarget = parentTarget.$refs._viewDialog ? parentTarget : target;
-    let updateParam
-      = param !== null
-      && param !== undefined
-      && param.updateParam !== null
-      && param.updateParam !== undefined
+    let updateParam =
+      param !== null &&
+      param !== undefined &&
+      param.updateParam !== null &&
+      param.updateParam !== undefined
         ? param.updateParam
         : {};
     for (let key in updateParam) {
@@ -1048,8 +1052,8 @@ install = (Vue, opts = {}) => {
       let price;
       if (priceRoundType === "roundHalfUp") {
         price = (
-          Math.round(value * Math.pow(10, priceScale))
-          / Math.pow(10, priceScale)
+          Math.round(value * Math.pow(10, priceScale)) /
+          Math.pow(10, priceScale)
         ).toFixed(priceScale);
       } else if (priceRoundType === "roundUp") {
         price = (
@@ -1057,8 +1061,8 @@ install = (Vue, opts = {}) => {
         ).toFixed(priceScale);
       } else {
         price = (
-          Math.floor(value * Math.pow(10, priceScale))
-          / Math.pow(10, priceScale)
+          Math.floor(value * Math.pow(10, priceScale)) /
+          Math.pow(10, priceScale)
         ).toFixed(priceScale);
       }
       return price;
@@ -1087,8 +1091,8 @@ install = (Vue, opts = {}) => {
         /* dicts.forEach((item) => {
           dictMap[item.sn] = item.value;
         }); */
-        option.success
-          && option.success({
+        option.success &&
+          option.success({
             dicts,
             dictMap,
           });
@@ -1223,8 +1227,8 @@ install = (Vue, opts = {}) => {
         return i18n._t(path, lang, { zh: { [path]: path } }, null, values);
       } else {
         return (
-          i18n.t(path, values)
-          || i18n._t(path, lang, { zh: { [path]: path } }, null, values)
+          i18n.t(path, values) ||
+          i18n._t(path, lang, { zh: { [path]: path } }, null, values)
         );
       }
     }