@cloudbase/weda-ui-mp 3.30.0 → 3.31.0

package/components/form/uploaderFile/index.json

@@ -4,6 +4,7 @@
   "usingComponents": {
     "mp-cells": "weui-miniprogram/cells/cells",
     "mp-cell": "weui-miniprogram/cell/cell",
-    "mp-actionSheet": "weui-miniprogram/actionsheet/actionsheet"
+    "mp-actionSheet": "weui-miniprogram/actionsheet/actionsheet",
+    "wd-button": "../../wd-button/index"
   }
 }

package/components/form/uploaderFile/index.wxml

@@ -6,8 +6,7 @@
         {{label}}
       </view>
       <view class="weda-uploader-files__btn-contain">
-        <button class="weui-btn weda-uploader-files__btn" bindtap="onButtonTap" disabled="{{disabled}}">{{uploadButtonText}}</button>
-
+        <wd-button size="sm" disabled="{{disabled}}" variant="outline" text="{{uploadButtonText}}" bindtap="onButtonTap"> </wd-button>
         <view wx:if="{{maxCount!=1}}" class="weda-uploader-files__tips">{{uploadTipText}}</view>
         <view wx:else>
           <slot name="tips"></slot>

package/components/swiper/index.js

@@ -41,6 +41,12 @@ Component({
       value: true,
       type: Boolean,
     },
+    // 新增统一字段：circularEnabled 一旦显式有值（true/false），优先级高于历史 circular 字段。
+    // 仅当用户在编辑器主动开启/关闭时才有值；缺省时（null）保持旧 circular 字段语义。
+    circularEnabled: {
+      type: null,
+      value: null,
+    },
     vertical: {
       value: false,
       type: Boolean,
@@ -82,4 +88,13 @@ Component({
       },
     ]),
   },
+  observers: {
+    // 当 circularEnabled 显式设置时（非 null/undefined），用其值覆盖 circular，
+    // 让 wxml 中的 circular="{{circular}}" 直接反映新字段语义，无需改动模板。
+    circularEnabled: function (circularEnabled) {
+      if (circularEnabled === null || circularEnabled === undefined) return;
+      if (this.data.circular === circularEnabled) return;
+      this.setData({ circular: circularEnabled });
+    },
+  },
 });

package/components/wd-form/remote-value.js

@@ -1,4 +1,5 @@
 import { WdCompError } from '../../utils/error';
+import { convertDayjs } from '../../utils/getFormLegacy.js';
 
 // father-son 是老的，新的叫many-one
 const SINGLE_SELECT_FORMATS = [
@@ -14,22 +15,86 @@ const SINGLE_SELECT_FORMATS = [
 
 const MULTI_SELECT_FORMATS = ['many-many', 'one-many'];
 
+// 判断关联关系字段是否有有效值（排除 null, undefined, '', {}, []）
+function isValidRelationValue(value) {
+  if (value === null || value === undefined || value === '') {
+    return false;
+  }
+  // 排除空对象 {}
+  if (typeof value === 'object' && !Array.isArray(value) && Object.keys(value).length === 0) {
+    return false;
+  }
+  // 排除空数组 []
+  if (Array.isArray(value) && value.length === 0) {
+    return false;
+  }
+  return true;
+}
+
+// 单选关联字段值规范化：对象提取 _id，空对象置 undefined，原始值（字符串/null）透传
+// 用于 father-son / related / many-one / one-one / one-one-r
+function normalizeSingleRelationValue(v, fallback) {
+  if (v && typeof v === 'object' && !Array.isArray(v)) {
+    return isValidRelationValue(v) ? v._id : undefined;
+  }
+  // 字符串/null/undefined 等原始值，透传 fallback（即原始字段值）
+  return fallback;
+}
+
+// 多选关联字段值规范化：过滤无效项后提取每个 _id，空结果置 undefined
+// 用于 one-many / many-many
+function normalizeMultiRelationValue(v) {
+  if (Array.isArray(v)) {
+    const ids = v
+      .map((item) => (isValidRelationValue(item) ? item?.['_id'] : undefined))
+      .filter((id) => id !== undefined && id !== null && id !== '');
+    return ids.length > 0 ? ids : undefined;
+  }
+  if (!isValidRelationValue(v)) {
+    return undefined;
+  }
+  return v;
+}
+
+// 日期字段格式化：将后端 $date 对象 / 'date'/'datetime' format 转为时间戳
+function normalizeDateValue(fieldValue, format, type) {
+  if (type !== 'number') return undefined;
+  if (fieldValue && Object.prototype.hasOwnProperty.call(fieldValue, '$date')) {
+    return convertDayjs(fieldValue)?.valueOf() ?? null;
+  }
+  if (['date', 'datetime'].includes(format)) {
+    return convertDayjs(fieldValue)?.valueOf() ?? null;
+  }
+  return undefined;
+}
+
 export function convertRemoteValueToFormData(dataSourceType, dataSourceProfile, fetchedInitialValues) {
-  if (dataSourceType === 'experssion') {
+  // 修正历史拼写错误 'experssion'，但保留兼容
+  if (dataSourceType === 'expression' || dataSourceType === 'experssion') {
     return fetchedInitialValues;
   }
-  const result = Object.keys(fetchedInitialValues).reduce((acc, field) => {
+  return Object.keys(fetchedInitialValues).reduce((acc, field) => {
     const format = dataSourceProfile?.schema?.properties?.[field]?.format;
-    acc[field] = fetchedInitialValues[field];
-    if ([...SINGLE_SELECT_FORMATS, 'father-son'].includes(format) && fetchedInitialValues[field]['_id']) {
-      acc[field] = fetchedInitialValues[field]['_id'];
+    const type = dataSourceProfile?.schema?.properties?.[field]?.type;
+    const fieldValue = fetchedInitialValues[field];
+    acc[field] = fieldValue;
+
+    // 关联关系字段：father-son / related / many-one / one-one / one-one-r
+    if (['father-son', 'related', ...SINGLE_SELECT_FORMATS].includes(format)) {
+      acc[field] = normalizeSingleRelationValue(fieldValue, fieldValue);
+    } else if (MULTI_SELECT_FORMATS.includes(format)) {
+      // 多选关联：one-many / many-many
+      acc[field] = normalizeMultiRelationValue(fieldValue);
     }
-    if (MULTI_SELECT_FORMATS.includes(format)) {
-      acc[field] = fetchedInitialValues[field].map((item) => item['_id']);
+
+    // 日期字段：转时间戳（覆盖关联字段处理结果，因为日期字段不会同时是关联字段）
+    const dateValue = normalizeDateValue(fieldValue, format, type);
+    if (dateValue !== undefined) {
+      acc[field] = dateValue;
     }
+
     return acc;
   }, {});
-  return result;
 }
 
 export function convertFormDataToSubmitParams(dataSourceProfile, formData, formType, _id, fields) {
@@ -38,10 +103,12 @@ export function convertFormDataToSubmitParams(dataSourceProfile, formData, formT
     const format = dataSourceProfile.schema?.properties?.[cur]?.format;
     acc[cur] = formData[cur];
     if (SINGLE_SELECT_FORMATS.includes(format)) {
-      acc[cur] = { _id: formData[cur] };
+      // 空值（null/undefined/''/{}）时不转换，保持 null，避免提交 { _id: null } 或 { _id: {} }
+      acc[cur] = isValidRelationValue(formData[cur]) ? { _id: formData[cur] } : null;
     }
     if (MULTI_SELECT_FORMATS.includes(format)) {
-      acc[cur] = acc[cur]?.map((_id) => ({ _id }));
+      // 空值时返回 null，有值时转换为 [{ _id: 'xxx' }] 格式
+      acc[cur] = isValidRelationValue(formData[cur]) ? formData[cur].map((_id) => ({ _id })) : null;
     }
     if ('x-json' === format && typeof formData[cur] === 'string') {
       try {

package/components/wd-input-number/index.js

@@ -105,6 +105,10 @@ Component({
     },
     min: {},
     max: {},
+    inputValue: {
+      type: Number,
+      value: null,
+    },
   },
   data: {
     isInit: true,
@@ -181,21 +185,20 @@ Component({
       const toReal = getRealValue({ value: toShow, format });
       const detail = { ...e.detail, value: toReal };
 
-      if (needSetData) {
-        this.changeForm(detail);
-        this.triggerEvent('change', detail);
-      } else {
-        this.triggerEvent('input', detail);
-      }
-
       const upDownState = this.getStepDisabled(null, toReal);
 
-      needSetData &&
+      // 先更新 realValue，避免 value 观察者触发时 realValue 还是旧值导致重复处理
+      if (needSetData) {
         this.setData({
           realValue: toReal,
           showValue: toShow,
           ...upDownState,
         });
+        this.changeForm(detail);
+        this.triggerEvent('change', detail);
+      } else {
+        this.triggerEvent('input', detail);
+      }
 
       return toReal;
     },
@@ -288,7 +291,7 @@ Component({
         ...{ ...this.properties, ...props },
         type: format,
       });
-      const toReal = getRealValue({ value: toShow });
+      const toReal = getRealValue({ value: toShow, format });
 
       const { stepPlusDisabled, stepMinusDisabled } = this.getStepDisabled(
         { readOnly, disabled, status, max, min, format },
@@ -447,24 +450,17 @@ Component({
     },
     // 监听非输入引起的value变化，比如调用 setValue, clearValue
     value: function (value) {
+      if (equal(value, this.data.realValue)) return;
       const { format } = this.properties;
 
-      let toReal = this.data.realValue;
-      let toShow = this.data.showValue;
+      // value 是真实值，不需要做百分比转换，只需要格式化显示
+      const toReal = isNumber(value) ? value : null;
 
-      if (!this.data.isInit) {
-        toReal = isNumber(value) ? value : null;
-        toShow = this.getShowValue({
-          ...this.properties,
-          value: `${isNumber(value) ? value : ''}`,
-          type: format,
-        });
-      }
-
-      // 初始化时同步真实值到表单
-      if (isNumber(toReal) && this.data.isInit) {
-        this.changeForm({ value: toReal });
-      }
+      const toShow = this.getShowValue({
+        ...this.properties,
+        value: `${isNumber(value) ? value : ''}`,
+        type: format,
+      });
 
       const readValue = `${toShow}${getPercentUnit(format)}`;
 
@@ -482,22 +478,6 @@ Component({
         });
       }, 0);
     },
-    inputValue: function (inputValue) {
-      if (equal(inputValue, this.data._oldInputValue)) return;
-      const { toReal, toShow, stepPlusDisabled, stepMinusDisabled, readValue } = this.getRealAndShowData({
-        value: inputValue,
-      });
-
-      this.setData({
-        readValue,
-        realValue: toReal,
-        showValue: this.data.readOnly ? readValue : toShow,
-        stepPlusDisabled,
-        stepMinusDisabled,
-      });
-      this.changeForm({ value: toReal });
-      this.data._oldInputValue = inputValue;
-    },
   },
   lifetimes: {
     attached: function () {

package/components/wd-input-phone/index.wxml

@@ -53,4 +53,5 @@
   readOnly="{{readOnly}}"
   value="{{value}}"
   cursorSpacing="{{cursorSpacing}}"
+  type="{{type}}"
 ></inner-input>

package/components/wd-menu-layout/wd-menu-layout.wxss

@@ -712,6 +712,10 @@
   align-items: center;
 }
 
+.wd-menulayout-menu__list.wedatea2td-list {
+  padding: calc(var(--wd-space-base) * 2);
+}
+
 .wd-menulayout-h5__drawer {
   position: fixed;
 }

package/components/wd-menu-list/wd-menu-list.wxss

@@ -710,4 +710,8 @@
   width: 100%;
   display: flex;
   align-items: center;
+}
+
+.wd-menulayout-menu__list.wedatea2td-list {
+  padding: calc(var(--wd-space-base) * 2);
 }

package/components/wd-select/select/index.js

@@ -299,6 +299,14 @@ Component({
       if (Array.isArray(values) && Array.isArray(options)) {
         const rm = arrayToMap(options, 'value');
         labels = values.map((d) => {
+          // 兜底：value 元素可能是关联字段对象（{ _id } / {} 空对象等）
+          // 对象一律提取 _id 当 key；提取不到说明是空值，直接返回空串避免渲染 [object Object]
+          if (d && typeof d === 'object' && !Array.isArray(d)) {
+            if (d._id === undefined || d._id === null || d._id === '') {
+              return '';
+            }
+            d = d._id;
+          }
           const obj = rm[d];
           let item = lodashGet(obj, 'text') ?? lodashGet(obj, 'label') ?? d;
           return textToString(item);

package/components/wd-select/select/index.wxml

@@ -1,7 +1,13 @@
  <wd-form-item-read-only version="{{version}}" readOnly="{{readOnly}}" readValue="{{displayValue}}">
       <view class="wd-select">
           <view class="wd-select-input-group"  bindchange="onChange" bindtap="onOpenPicker" data-show="true">
-            <label class="wd-select-input {{displayValue ? '' : 'weui-input__placeholder'}}">{{displayValue || placeholder}}</label>
+            <input
+              class="wd-select-input"
+              placeholder-class="weui-input__placeholder"
+              placeholder="{{placeholder}}"
+              value="{{displayValue}}"
+              disabled="true"
+            />
           </view>
           <block wx:if="{{allPickerShow}}">
             <dropdownSelect

package/components/wd-select/select/index.wxss

@@ -1,6 +1,7 @@
 /* 标准化样式适配 start */
 .wd-form-item .wd-form-input-wrap .wd-select {
   width: 100%;
+  height: 100%;
 }
 .wd-form-item .wd-form-input-wrap .wd-select .wd-select-input-group {
   height: 100%;

package/package.json

@@ -3,7 +3,7 @@
   "miniprogram": "./",
   "packageManager": "yarn@3.0.2",
   "dependencies": {},
-  "version": "3.30.0",
+  "version": "3.31.0",
   "main": "./",
   "publishConfig": {
     "access": "public"