cloud-web-corejs 1.0.276 → 1.0.277

package/src/components/xform/form-designer/form-widget/field-widget/mixins/date-limit-mixin.js

@@ -1,8 +1,23 @@
+/* 日期组件的最小日期支持配置为「当前时间」，此处统一解析。
+   默认值（含「当前时间」与相对偏移）已收敛到 relative-default-mixin，不在此处理。 */
+export const DATE_VALUE_TYPE_NOW = "now";
+
 export default {
   methods: {
     getDateLimitOptions() {
       return this.field.options || {};
     },
+    isNowDateValueType(valueType) {
+      return valueType === DATE_VALUE_TYPE_NOW;
+    },
+    /* 最小日期：固定日期或当前时间 */
+    getDateLimitMinValue() {
+      const options = this.getDateLimitOptions();
+      if (this.isNowDateValueType(options.minDateType)) {
+        return new Date();
+      }
+      return options.minDate;
+    },
     initDateLimitPickerOptions() {
       const pickerOptions = { ...(this.pickerOptions || {}) };
       if (["year", "month", "date", "datetime"].includes(this.field.options.type)) {
@@ -79,7 +94,7 @@ export default {
       const options = this.getDateLimitOptions();
       const currentTime = time.getTime();
 
-      const minDate = this.parseDateLimitValue(options.minDate);
+      const minDate = this.parseDateLimitValue(this.getDateLimitMinValue());
       if (minDate !== null && currentTime < this.normalizeDateLimitDayTime(minDate, false)) {
         return true;
       }
@@ -119,7 +134,7 @@ export default {
       }
 
       const options = this.getDateLimitOptions();
-      const minDate = this.parseDateLimitValue(options.minDate);
+      const minDate = this.parseDateLimitValue(this.getDateLimitMinValue());
       if (minDate !== null && currentTime < this.normalizeDateLimitDayTime(minDate, false)) {
         return true;
       }

package/src/components/xform/form-designer/form-widget/field-widget/mixins/echart-bar-mixin.js

@@ -376,21 +376,15 @@ modules = {
     },*/
     loadDataDefaultHandle() {
       let reportTemplate = this.getFormRef().reportTemplate;
-      let formCode = reportTemplate.formCode;
       let formScriptEnabled = this.field.options.formScriptEnabled || false;
       let scriptCode = this.field.options.formScriptCode
       if (!scriptCode) return;
       let accessParam = this.handleCustomEvent(this.field.options.formScriptParam)
       return this.formHttp({
         scriptCode: scriptCode,
-        data: {
-          formCode: formCode,
-          formVersion: reportTemplate.formVersion,
-          taBm: this.fieldKeyName,
-          data: {
-            ...accessParam
-          }
-        },
+        data: this.buildFormScriptData(reportTemplate, {
+          ...accessParam
+        }),
         callback: res => {
           let rows = res.objx || [];
           this.setValue(rows)

package/src/components/xform/form-designer/form-widget/field-widget/mixins/echart-category-mixin.js

@@ -248,21 +248,15 @@ modules = {
     },*/
     loadDataDefaultHandle() {
       let reportTemplate = this.getFormRef().reportTemplate;
-      let formCode = reportTemplate.formCode;
       let formScriptEnabled = this.field.options.formScriptEnabled || false;
       let scriptCode = this.field.options.formScriptCode
       if (!scriptCode) return;
       let accessParam = this.handleCustomEvent(this.field.options.formScriptParam)
       return this.formHttp({
         scriptCode: scriptCode,
-        data: {
-          formCode: formCode,
-          formVersion: reportTemplate.formVersion,
-          taBm: this.fieldKeyName,
-          data: {
-            ...accessParam
-          }
-        },
+        data: this.buildFormScriptData(reportTemplate, {
+          ...accessParam
+        }),
         callback: res => {
           let rows = res.objx || [];
           this.setValue(rows)

package/src/components/xform/form-designer/form-widget/field-widget/mixins/echart-pie-mixin.js

@@ -171,21 +171,15 @@ modules = {
     },*/
     loadDataDefaultHandle() {
       let reportTemplate = this.getFormRef().reportTemplate;
-      let formCode = reportTemplate.formCode;
       let formScriptEnabled = this.field.options.formScriptEnabled || false;
       let scriptCode = this.field.options.formScriptCode
       if (!scriptCode) return;
       let accessParam = this.handleCustomEvent(this.field.options.formScriptParam)
       return this.formHttp({
         scriptCode: scriptCode,
-        data: {
-          formCode: formCode,
-          formVersion: reportTemplate.formVersion,
-          taBm: this.fieldKeyName,
-          data: {
-            ...accessParam
-          }
-        },
+        data: this.buildFormScriptData(reportTemplate, {
+          ...accessParam
+        }),
         callback: res => {
           let rows = res.objx || [];
           this.setValue(rows)

package/src/components/xform/form-designer/form-widget/field-widget/mixins/relative-default-mixin.js

@@ -0,0 +1,107 @@
+/**
+ * 日期/时间组件「相对默认值」的取值入口（date、date-range、time、time-range 共用）。
+ *
+ * 相对值必须每次初始化重算，绝不能写回 options.defaultValue —— options 会被序列化保存，
+ * 写回就变成死值。这里的做法是：先照常跑 initFieldModel（此时 options.defaultValue 为空，
+ * 不会填任何值），再在「本该取默认值」的场景下用 initValue 灌入现算的相对值。
+ *
+ * 放在 initFieldModel 之后灌值还顺带绕开了 utc-transform-mixin：相对值本身就是本地时间，
+ * 若参与 UTC→本地转换会再偏一次时区。
+ */
+import { resolveDefaultValueFromOptions } from "./relativeDateUtil";
+
+export default {
+  methods: {
+    /**
+     * 当前配置对应的相对默认值；未配相对默认值返回 undefined（调用方走静态默认值）。
+     * @param {Date} baseDate 基准时刻，仅测试用
+     */
+    getRelativeDefaultValue(baseDate) {
+      return resolveDefaultValueFromOptions(
+        this.field?.options,
+        this.field?.type,
+        baseDate
+      );
+    },
+
+    /** @returns {Boolean} 值是否为空（范围组件的空值是空数组） */
+    isEmptyFieldValue(value) {
+      if (value === null || value === undefined || value === "") {
+        return true;
+      }
+      return Array.isArray(value) && value.length === 0;
+    },
+
+    /**
+     * 是否落在「新增时取默认值」的场景。
+     * 判定与 fieldMixin.initFieldModel 里的默认值分支保持一致：值为空 + 新增单据/新增明细行。
+     * @returns {Boolean}
+     */
+    willInitDefaultValue() {
+      if (!this.field?.formItemFlag) {
+        return false;
+      }
+      const currentData
+        = this.tableParam && this.tableParam.row
+          ? this.tableParam.row
+          : this.formModel;
+      if (!currentData) {
+        return false;
+      }
+      if (!this.isEmptyFieldValue(currentData[this.fieldKeyName])) {
+        return false;
+      }
+      if (this.tableParam) {
+        return !this.tableParam.row.id; //明细：只有新增行才填默认值
+      }
+      const dataId = this.getFormRef()?.dataId ?? null;
+      return !dataId; //主表：只有新增单据才填默认值
+    },
+
+    /** 取值入口，替代各日期组件 created 里直接调的 initFieldModel */
+    initRelativeFieldModel() {
+      const relativeValue = this.getRelativeDefaultValue();
+      if (relativeValue === undefined) {
+        this.initFieldModel();
+        return;
+      }
+      const shouldInit = this.willInitDefaultValue();
+      this.initFieldModel();
+      if (shouldInit) {
+        this.initValue(relativeValue);
+      }
+    },
+
+    /*
+     * 表单重置：相对模式按重置时刻重算，与新增时同口径；静态默认值维持 fieldMixin 的行为。
+     * 这里不委托 fieldMixin.resetField，是为了不把它那条重依赖链（公式引擎、codemirror）
+     * 拖进本文件；它对本 mixin 覆盖的日期/时间组件也只多一段附件组件的分支，用不上。
+     */
+    resetField() {
+      if (this.subFormItemFlag) {
+        return;
+      }
+      const relativeValue = this.getRelativeDefaultValue();
+      this.setValue(
+        relativeValue === undefined
+          ? this.field.options.defaultValue
+          : relativeValue
+      );
+    },
+
+    /* 设计器里改默认值配置后的预览刷新，由 propertyMixin.emitDefaultValueChange 调用 */
+    refreshDefaultValue() {
+      if (this.designState !== true) {
+        return;
+      }
+      const relativeValue = this.getRelativeDefaultValue();
+      if (relativeValue !== undefined) {
+        this.fieldModel = relativeValue;
+        return;
+      }
+      if (this.field.options.defaultValue !== undefined) {
+        this.fieldModel = this.field.options.defaultValue;
+      }
+    },
+  },
+};

package/src/components/xform/form-designer/form-widget/field-widget/mixins/relativeDateUtil.js

@@ -0,0 +1,321 @@
+/**
+ * 日期/时间组件「相对默认值」的统一求值器（date、date-range、time、time-range 共用）。
+ *
+ * 描述符 { offset, unit, align }：先按 offset 平移 unit，再按 align 对齐到该单位的起/止。
+ *   {offset: 0,  unit: 'day'}                  → 今天
+ *   {offset: 7,  unit: 'day'}                  → 7天后
+ *   {offset: -1, unit: 'month', align: 'start'} → 上月1号
+ *   {offset: -1, unit: 'month', align: 'end'}   → 上月最后一天
+ *
+ * 老配置 defaultValueType='now'（date/time 的「当前时间」勾选）在此读时归一为 {offset:0}，
+ * 不改存量表单 JSON，也不做数据迁移。
+ */
+import moment from "moment";
+
+export const DEFAULT_VALUE_TYPE_NOW = "now";
+export const DEFAULT_VALUE_TYPE_RELATIVE = "relative";
+
+/* 日期类单位：date/date-range 可用 */
+export const DATE_UNITS = ["day", "week", "month", "quarter", "year"];
+/* 时间类单位：time/time-range 可用，date 组件在 datetime 类型下也可用 */
+export const TIME_UNITS = ["hour", "minute", "second"];
+export const ALIGN_TYPES = ["none", "start", "end"];
+
+export const KIND_DATE = "date";
+export const KIND_TIME = "time";
+
+const RANGE_WIDGET_TYPES = ["date-range", "time-range"];
+const TIME_WIDGET_TYPES = ["time", "time-range"];
+
+/* el-time-picker 的 value-format 在组件里写死为 HH:mm:ss */
+const TIME_VALUE_FORMAT = "HH:mm:ss";
+
+const UNIT_LABELS = {
+  day: "天",
+  week: "周",
+  month: "月",
+  quarter: "季",
+  year: "年",
+  hour: "小时",
+  minute: "分钟",
+  second: "秒",
+};
+
+/** @returns {String} 组件类型对应的求值口径：time/time-range 为时间类，其余按日期类 */
+export function getRelativeKind(widgetType) {
+  return TIME_WIDGET_TYPES.includes(widgetType) ? KIND_TIME : KIND_DATE;
+}
+
+/** @returns {Boolean} 是否范围组件（值为长度 2 的数组） */
+export function isRangeWidgetType(widgetType) {
+  return RANGE_WIDGET_TYPES.includes(widgetType);
+}
+
+/** @returns {Array} 该口径下可选的单位；日期类额外放开时分秒（datetime 类型要用） */
+export function getAvailableUnits(kind) {
+  return kind === KIND_TIME ? [...TIME_UNITS] : [...DATE_UNITS, ...TIME_UNITS];
+}
+
+export function getUnitLabel(unit) {
+  return UNIT_LABELS[unit] || unit;
+}
+
+/** @returns {Boolean} 该单位是否为时间类（时/分/秒） */
+export function isTimeUnit(unit) {
+  return TIME_UNITS.includes(unit);
+}
+
+/**
+ * 描述符补全：offset 取整、unit/align 落到白名单内。
+ * @param {Object} descriptor 原始描述符，可为 null
+ * @param {String} kind KIND_DATE / KIND_TIME
+ * @returns {Object} { offset, unit, align }
+ */
+export function normalizeRelativeDescriptor(descriptor, kind = KIND_DATE) {
+  const source
+    = descriptor && typeof descriptor === "object" ? descriptor : {};
+  const units = getAvailableUnits(kind);
+  const offset = Number(source.offset);
+  const unit = units.includes(source.unit)
+    ? source.unit
+    : kind === KIND_TIME
+    ? "hour"
+    : "day";
+  const align = ALIGN_TYPES.includes(source.align) ? source.align : "none";
+  return {
+    offset: Number.isFinite(offset) ? Math.trunc(offset) : 0,
+    unit,
+    align,
+  };
+}
+
+/** 范围描述符补全，两端各自独立 */
+export function normalizeRelativeRangeDescriptor(descriptor, kind = KIND_DATE) {
+  const source
+    = descriptor && typeof descriptor === "object" ? descriptor : {};
+  return {
+    start: normalizeRelativeDescriptor(source.start, kind),
+    end: normalizeRelativeDescriptor(source.end, kind),
+  };
+}
+
+/* 周的起止按 ISO 周算（周一为一周之始）：moment 未加载中文语言包，
+   startOf('week') 会按 en 口径落到周日，与国内习惯不符 */
+function getAlignUnit(unit) {
+  return unit === "week" ? "isoWeek" : unit;
+}
+
+/**
+ * element 的 format/value-format 转 moment 格式。
+ * 只有 y（年）和 d（日）两族记号不同，M/H/m/s/A 两边一致。
+ */
+export function toMomentFormat(elFormat) {
+  const tokenMap = { yyyy: "YYYY", yy: "YY", dd: "DD", d: "D" };
+  return String(elFormat).replace(
+    /yyyy|yy|dd|d/g,
+    (token) => tokenMap[token]
+  );
+}
+
+/** @returns {Boolean} 该组件的值是否带时分秒 */
+export function hasTimePart(type, valueFormat) {
+  if (String(type || "").indexOf("datetime") > -1) {
+    return true;
+  }
+  return /[Hhms]/.test(String(valueFormat || ""));
+}
+
+/** "HH:mm:ss" → 把时分秒盖到 moment 实例上；解析不出来就原样返回 */
+function applyTimeOfDay(momentValue, timeText) {
+  const matched = /^(\d{1,2}):(\d{1,2})(?::(\d{1,2}))?$/.exec(
+    String(timeText || "").trim()
+  );
+  if (!matched) {
+    return momentValue;
+  }
+  return momentValue.set({
+    hour: Number(matched[1]),
+    minute: Number(matched[2]),
+    second: Number(matched[3] || 0),
+    millisecond: 0,
+  });
+}
+
+/**
+ * 求出描述符对应的时刻。
+ * @param {Object} descriptor 描述符
+ * @param {Object} config { kind, baseDate }
+ */
+export function resolveRelativeMoment(descriptor, config = {}) {
+  const kind = config.kind || KIND_DATE;
+  const { offset, unit, align } = normalizeRelativeDescriptor(
+    descriptor,
+    kind
+  );
+  const momentValue = config.baseDate ? moment(config.baseDate) : moment();
+  if (offset) {
+    momentValue.add(offset, unit);
+  }
+  if (align === "start") {
+    momentValue.startOf(getAlignUnit(unit));
+  } else if (align === "end") {
+    momentValue.endOf(getAlignUnit(unit));
+  }
+  return momentValue;
+}
+
+/**
+ * 按组件的取值格式输出。
+ * time 类固定 HH:mm:ss；date 类 valueFormat 为空时 picker 的值是 Date 对象。
+ */
+export function formatRelativeMoment(momentValue, config = {}) {
+  if ((config.kind || KIND_DATE) === KIND_TIME) {
+    return momentValue.format(TIME_VALUE_FORMAT);
+  }
+  const valueFormat = config.valueFormat;
+  if (!valueFormat) {
+    return momentValue.toDate();
+  }
+  if (valueFormat === "timestamp") {
+    return momentValue.valueOf();
+  }
+  return momentValue.format(toMomentFormat(valueFormat));
+}
+
+/*
+ * 时分秒口径：单位是日期类（天及以上）时，端点时刻取 defaultTime（起 00:00:00 / 止 23:59:59），
+ * 保证「当前到+7天」是整天区间，between 查询不会漏掉首尾当天的数据；
+ * 单位是时间类（时/分/秒）时用户要的就是时刻精度，不套 defaultTime。
+ */
+function shouldApplyDefaultTime(descriptor, config) {
+  if (!config.defaultTime) {
+    return false;
+  }
+  if (!hasTimePart(config.type, config.valueFormat)) {
+    return false;
+  }
+  return !isTimeUnit(normalizeRelativeDescriptor(descriptor, config.kind).unit);
+}
+
+/**
+ * 单值组件的相对默认值。
+ * @param {Object} descriptor 描述符
+ * @param {Object} config { kind, type, valueFormat, defaultTime, baseDate }
+ */
+export function resolveRelativeValue(descriptor, config = {}) {
+  const momentValue = resolveRelativeMoment(descriptor, config);
+  if (shouldApplyDefaultTime(descriptor, config)) {
+    applyTimeOfDay(momentValue, config.defaultTime);
+  }
+  const value = formatRelativeMoment(momentValue, config);
+  /* date 组件的 dates（多选日期）类型，值是数组 */
+  return config.type === "dates" ? [value] : value;
+}
+
+/**
+ * 范围组件的相对默认值，返回长度 2 的数组。
+ * config.defaultTime 为 ["00:00:00", "23:59:59"] 这样的两端时刻。
+ */
+export function resolveRelativeRangeValue(descriptor, config = {}) {
+  const { start, end } = normalizeRelativeRangeDescriptor(
+    descriptor,
+    config.kind
+  );
+  const defaultTime = Array.isArray(config.defaultTime)
+    ? config.defaultTime
+    : [];
+  return [
+    resolveRelativeValue(start, { ...config, defaultTime: defaultTime[0] }),
+    resolveRelativeValue(end, { ...config, defaultTime: defaultTime[1] }),
+  ];
+}
+
+/** 描述符 → 一句话规则，如「7天后」「1月前·月初」 */
+export function describeRelativeDescriptor(descriptor, kind = KIND_DATE) {
+  const { offset, unit, align } = normalizeRelativeDescriptor(descriptor, kind);
+  const unitLabel = getUnitLabel(unit);
+  let text = "当前";
+  if (offset > 0) {
+    text = `${offset}${unitLabel}后`;
+  } else if (offset < 0) {
+    text = `${-offset}${unitLabel}前`;
+  }
+  if (align === "start") {
+    text += `·${unitLabel}初`;
+  } else if (align === "end") {
+    text += `·${unitLabel}末`;
+  }
+  return text;
+}
+
+/** 设计器预览用：把求值结果转成可读文本 */
+export function toPreviewText(value) {
+  if (value === null || value === undefined || value === "") {
+    return "";
+  }
+  if (Array.isArray(value)) {
+    return value.map((item) => toPreviewText(item)).join(" ~ ");
+  }
+  if (value instanceof Date) {
+    return moment(value).format("YYYY-MM-DD HH:mm:ss");
+  }
+  if (typeof value === "number") {
+    return moment(value).format("YYYY-MM-DD HH:mm:ss");
+  }
+  return String(value);
+}
+
+/** @returns {Boolean} options 上是否配了相对默认值（含老的 now 勾选） */
+export function isRelativeDefaultType(defaultValueType) {
+  return (
+    defaultValueType === DEFAULT_VALUE_TYPE_RELATIVE
+    || defaultValueType === DEFAULT_VALUE_TYPE_NOW
+  );
+}
+
+/**
+ * 从 options 读出描述符：'now' 归一为 offset 0，'relative' 取 defaultValueRelative。
+ * 未配相对默认值返回 null，调用方走原有静态默认值逻辑。
+ * @param {Object} options 组件 options
+ * @param {String} widgetType 组件类型
+ */
+export function getRelativeDescriptor(options, widgetType) {
+  const source = options || {};
+  if (!isRelativeDefaultType(source.defaultValueType)) {
+    return null;
+  }
+  const kind = getRelativeKind(widgetType);
+  const isRange = isRangeWidgetType(widgetType);
+  if (source.defaultValueType === DEFAULT_VALUE_TYPE_NOW) {
+    /* 老的「当前时间」勾选：两端都取此刻 */
+    const now = normalizeRelativeDescriptor(null, kind);
+    return isRange ? { start: now, end: { ...now } } : now;
+  }
+  return isRange
+    ? normalizeRelativeRangeDescriptor(source.defaultValueRelative, kind)
+    : normalizeRelativeDescriptor(source.defaultValueRelative, kind);
+}
+
+/**
+ * 组件 options → 相对默认值。未配相对默认值返回 undefined。
+ * @param {Object} options 组件 options
+ * @param {String} widgetType 组件类型
+ * @param {Date} baseDate 基准时刻，仅测试用；不传取当前时刻
+ */
+export function resolveDefaultValueFromOptions(options, widgetType, baseDate) {
+  const descriptor = getRelativeDescriptor(options, widgetType);
+  if (!descriptor) {
+    return undefined;
+  }
+  const source = options || {};
+  const config = {
+    kind: getRelativeKind(widgetType),
+    type: source.type,
+    valueFormat: source.valueFormat,
+    defaultTime: source.defaultTime,
+    baseDate,
+  };
+  return isRangeWidgetType(widgetType)
+    ? resolveRelativeRangeValue(descriptor, config)
+    : resolveRelativeValue(descriptor, config);
+}

package/src/components/xform/form-designer/form-widget/field-widget/mixins/time-limit-mixin.js

@@ -0,0 +1,77 @@
+/* 时间组件的最小时间支持配置为「当前时间」，此处统一解析。
+   默认值（含「当前时间」与相对偏移）已收敛到 relative-default-mixin，不在此处理。 */
+export const TIME_VALUE_TYPE_NOW = "now";
+
+const MAX_TIME_VALUE = "23:59:59";
+
+export default {
+  methods: {
+    getTimeLimitOptions() {
+      return this.field.options || {};
+    },
+    isNowTimeValueType(valueType) {
+      return valueType === TIME_VALUE_TYPE_NOW;
+    },
+    getNowTimeValue() {
+      const now = new Date();
+      const pad = (val) => (val < 10 ? "0" + val : String(val));
+      return `${pad(now.getHours())}:${pad(now.getMinutes())}:${pad(
+        now.getSeconds()
+      )}`;
+    },
+    normalizeTimeValue(val) {
+      if (val === null || val === undefined || val === "") {
+        return null;
+      }
+      const matched = /^(\d{1,2}):(\d{1,2})(?::(\d{1,2}))?$/.exec(String(val).trim());
+      if (!matched) {
+        return null;
+      }
+      const hour = Number(matched[1]);
+      const minute = Number(matched[2]);
+      const second = Number(matched[3] || 0);
+      if (hour > 23 || minute > 59 || second > 59) {
+        return null;
+      }
+      const pad = (v) => (v < 10 ? "0" + v : String(v));
+      return `${pad(hour)}:${pad(minute)}:${pad(second)}`;
+    },
+    parseTimeLimitValue(val) {
+      const normalized = this.normalizeTimeValue(val);
+      if (normalized === null) {
+        return null;
+      }
+      const parts = normalized.split(":");
+      return Number(parts[0]) * 3600 + Number(parts[1]) * 60 + Number(parts[2]);
+    },
+    /* 最小时间：固定时间或当前时间 */
+    getTimeLimitMinValue() {
+      const options = this.getTimeLimitOptions();
+      if (this.isNowTimeValueType(options.minTimeType)) {
+        return this.getNowTimeValue();
+      }
+      return this.normalizeTimeValue(options.minTime);
+    },
+    initTimeLimitPickerOptions() {
+      const pickerOptions = { ...(this.pickerOptions || {}) };
+      const minTime = this.getTimeLimitMinValue();
+      if (minTime === null) {
+        delete pickerOptions.selectableRange;
+      } else {
+        pickerOptions.selectableRange = `${minTime} - ${MAX_TIME_VALUE}`;
+      }
+      this.pickerOptions = pickerOptions;
+    },
+    isTimeLimitViolated(value) {
+      const currentTime = this.parseTimeLimitValue(value);
+      if (currentTime === null) {
+        return false;
+      }
+      const minTime = this.parseTimeLimitValue(this.getTimeLimitMinValue());
+      return minTime !== null && currentTime < minTime;
+    },
+    getTimeLimitViolationMessage() {
+      return `时间不能小于${this.getTimeLimitMinValue()}`;
+    },
+  },
+};

package/src/components/xform/form-designer/form-widget/field-widget/mixins/vabsearch-mixin.js

@@ -175,5 +175,18 @@ export default {
     fieldModelLabel() {
       return this.showValue;
     },
+    // 对比旧值：label 存在原单同行的伴随字段(vabSearchName)，从 oldRow 取
+    resolveCompareOldDisplay(oldRow) {
+      if (!oldRow) return null;
+      let labelField = this.field.options.vabSearchName || this.fieldKeyName;
+      let multipleChoices = this.field.options.multipleChoices || false;
+      if (multipleChoices) {
+        let arr = oldRow[this.fieldKeyName];
+        return Array.isArray(arr)
+          ? arr.map((item) => item && item[labelField]).join(",")
+          : null;
+      }
+      return oldRow[labelField] ?? null;
+    },
   }
 }

package/src/components/xform/form-designer/form-widget/field-widget/number-widget.vue

@@ -85,16 +85,21 @@ export default {
   computed: {
     numberValue: {
       get() {
-        let fieldModel = this.fieldModel;
-        return fieldModel === null ? undefined : fieldModel;
+        const fieldModel = this.fieldModel;
+        if (fieldModel === null || fieldModel === undefined) {
+          return undefined;
+        }
+        return fieldModel;
       },
       set(val) {
-        let newValue = val === undefined ? null : val;
-        this.fieldModel = newValue
-        let currentData =
-        this.tableParam && this.tableParam.row
-          ? this.tableParam.row
-          : this.formModel;
+        // 清空时存 null 而非 undefined：undefined 会被 JSON.stringify 丢弃，
+        // 导致该字段不进请求体，后台按“未传即不更新”处理，清空无法落库。
+        const newValue = val === undefined || val === null ? null : val;
+        this.fieldModel = newValue;
+        const currentData =
+          this.tableParam && this.tableParam.row
+            ? this.tableParam.row
+            : this.formModel;
         currentData[this.fieldKeyName] = newValue;
       },
     },