@cloudbase/weda-ui 3.6.2 → 3.6.5

package/dist/web/components/form-input-hooks/validator.js

@@ -7,8 +7,8 @@ const pattern = {
     cnName: /^[\u2E80-\uFE4F]{2,6}(?:·[\u2E80-\uFE4F]{2,6})*$/,
     userName: /^[\da-zA-Z\u2E80-\uFE4F \s]{2,}$/,
     carId: /^[京津沪渝冀豫云辽黑湘皖鲁新苏浙赣鄂桂甘晋蒙陕吉闽贵粤青藏川宁琼使领A-Z]{1}[A-Z]{1}[A-Z0-9]{4}[A-Z0-9挂学警港澳]{1}$/,
-    mobile: /^1[3456789]\d{9}$/,
-    tel: /^(0\d{2,3}-)?(\d{7,8})$/,
+    mobile: /^(\+\d{1,4}[\s-]?)?(\(?\d{1,4}\)?[\s-]?)?(\d{1,4}[\s-]?)?(\d{1,4})?\d{1,9}(\s?(x|ext)\s?\d{1,6})?$/,
+    tel: /^(\+\d{1,4}[\s-]?)?(\(?\d{1,4}\)?[\s-]?)?(\d{1,4}[\s-]?)?(\d{1,4})?\d{1,9}(\s?(x|ext)\s?\d{1,6})?$/,
     address: /^[\da-zA-Z\u2E80-\uFE4F \s-]{4,400}$/,
     date: /((^((1[8-9]\d{2})|([2-9]\d{3}))([-\/\._])(10|12|0?[13578])([-\/\._])(3[01]|[12][0-9]|0?[1-9])$)|(^((1[8-9]\d{2})|([2-9]\d{3}))([-\/\._])(11|0?[469])([-\/\._])(30|[12][0-9]|0?[1-9])$)|(^((1[8-9]\d{2})|([2-9]\d{3}))([-\/\._])(0?2)([-\/\._])(2[0-8]|1[0-9]|0?[1-9])$)|(^([2468][048]00)([-\/\._])(0?2)([-\/\._])(29)$)|(^([3579][26]00)([-\/\._])(0?2)([-\/\._])(29)$)|(^([1][89][0][48])([-\/\._])(0?2)([-\/\._])(29)$)|(^([2-9][0-9][0][48])([-\/\._])(0?2)([-\/\._])(29)$)|(^([1][89][2468][048])([-\/\._])(0?2)([-\/\._])(29)$)|(^([2-9][0-9][2468][048])([-\/\._])(0?2)([-\/\._])(29)$)|(^([1][89][13579][26])([-\/\._])(0?2)([-\/\._])(29)$)|(^([2-9][0-9][13579][26])([-\/\._])(0?2)([-\/\._])(29)$))/,
     numVcode: /^[0-9]{4,8}$/,

package/dist/web/components/navigationBar/common.js

@@ -39,7 +39,7 @@ export const MenuLogo = React.memo(function MenuLogo({ navigationStyle, classNam
 });
 // icon回显
 export const IconShow = ({ onIcon, menuColor, menuFontSize }) => {
-    return (_jsx(_Fragment, { children: (onIcon === null || onIcon === void 0 ? void 0 : onIcon.includes('td:')) ? (_jsx(IconFont, { name: onIcon === null || onIcon === void 0 ? void 0 : onIcon.split(':')[1], className: `${CLASS_PREFIX}__fonticon`, style: { color: menuColor, fontSize: menuFontSize } })) : (_jsx("div", { className: `${CLASS_PREFIX}__fonticon lcap-icon lcap-icon-${onIcon}`, style: { color: menuColor, fontSize: menuFontSize } })) }));
+    return (_jsx(_Fragment, { children: (onIcon === null || onIcon === void 0 ? void 0 : onIcon.includes('td:')) ? (_jsx(IconFont, { name: onIcon === null || onIcon === void 0 ? void 0 : onIcon.split(':')[1], className: `${CLASS_PREFIX}__fonticon wd-icon`, style: { color: menuColor, fontSize: menuFontSize } })) : (_jsx("div", { className: `${CLASS_PREFIX}__fonticon lcap-icon lcap-icon-${onIcon}`, style: { color: menuColor, fontSize: menuFontSize } })) }));
 };
 // 菜单图标
 export const renderMenuIcon = (iconUrl, iconPath, navigationStyle) => {

package/dist/web/components/richTextView/index.css

@@ -94,7 +94,8 @@
   background-color: #f5f7fa;
 }
 .weda-RichTextView table td {
-  background-color: white;
+  background-color: #ffffff;
+  text-align: center;
 }
 .weda-RichTextView table th > p,
 .weda-RichTextView table td > p {

package/dist/web/components/wd-input/wd-input.d.ts

@@ -81,10 +81,10 @@ export declare const WdInput: React.ForwardRefExoticComponent<CommonPropsType &
 }]>> & {
     wrapClassName?: string;
     classRoot?: string;
-    inputPattern?: string;
+    inputPattern?: RegExp;
 } & React.RefAttributes<any>>;
 export type WdInputProps = CommonPropsType & DataType & EventsType & {
     wrapClassName?: string;
     classRoot?: string;
-    inputPattern?: string;
+    inputPattern?: RegExp;
 };

package/dist/web/components/wd-input-phone/wd-input-phone.js

@@ -9,6 +9,6 @@ const rules = [{ format: 'mobile', message: '手机校验失败' }];
 export const WdInputPhone = forwardRef(function WdInputPhone(props, ref) {
     const { classPrefix } = useConfig();
     const wrapCls = `${classPrefix}-form-input-number-wrap `;
-    const pattern = '^[0-9\\-]{0,11}$';
-    return (_jsx(WdInput, { ...props, inputPattern: pattern, maxLength: 11, wrapClassName: wrapCls, classRoot: "input-phone", rules: rules, ref: ref }));
+    const pattern = /^[()\d\s+-ext]{0,20}$/;
+    return (_jsx(WdInput, { ...props, inputPattern: pattern, maxLength: 20, wrapClassName: wrapCls, classRoot: "input-phone", rules: rules, ref: ref }));
 });

package/dist/web/components/wd-table/utils/index.js

@@ -184,19 +184,22 @@ const getSearchValues = (searchValues) => {
         };
     });
 };
-const getPageParam = (_sort, params, _defaultPageSize, _defaultPageIndex, supportManyRelated, columns, isSupportMultipleSort) => {
+const getPageParam = ({ defaultSort, sort: _sort, params, _defaultPageSize, _defaultPageIndex, supportManyRelated, columns, isSupportMultipleSort, }) => {
+    let sort = defaultSort;
+    // 运行态有值，以运行态为准
+    if ((_sort === null || _sort === void 0 ? void 0 : _sort.length) && _sort[0].order) {
+        params.orderBy = _sort[0].by;
+        params.orderType = _sort[0].order;
+        sort = _sort;
+    }
     // 后端根据业务字段排序
-    const sort = _sort.map((n) => {
+    sort = sort.map((n) => {
         var _a;
         return ({
             ...n,
             by: ((_a = columns === null || columns === void 0 ? void 0 : columns.find((i) => n.by === i.slotKey)) === null || _a === void 0 ? void 0 : _a.fieldKey) || n.by,
         });
     });
-    if ((sort === null || sort === void 0 ? void 0 : sort.length) && sort[0].order) {
-        params.orderBy = sort[0].by;
-        params.orderType = sort[0].order;
-    }
     const _pageSize = parseInt(`${params.pageSize}`);
     params.pageSize = isNaN(_pageSize) ? _defaultPageSize : _pageSize;
     const _pageNo = parseInt(`${params.pageNo}`);
@@ -219,7 +222,7 @@ export const getQueryParams = ({ queryParams, wList, viewFieldsData, connectorPa
     var _a, _b;
     const _defaultPageSize = 10;
     const _defaultPageIndex = 1;
-    const { pageIndex: pageNo, pageSize, sort } = queryParams;
+    const { pageIndex: pageNo, pageSize, sort, defaultSort } = queryParams;
     let params = {
         pageNo,
         pageSize,
@@ -266,7 +269,16 @@ export const getQueryParams = ({ queryParams, wList, viewFieldsData, connectorPa
         params = Object.assign({}, connectorParams, params);
     }
     // 运行态主动排序进行覆盖
-    params = getPageParam(sort, params, _defaultPageSize, _defaultPageIndex, supportManyRelated, columns, isSupportMultipleSort);
+    params = getPageParam({
+        defaultSort,
+        sort,
+        params,
+        _defaultPageSize,
+        _defaultPageIndex,
+        supportManyRelated,
+        columns,
+        isSupportMultipleSort,
+    });
     return params;
 };
 // 获取视图

package/dist/web/components/wd-table/wd-table.js

@@ -151,10 +151,11 @@ export const WdTable = forwardRef(function TableComp(tableProps, ref) {
     const [queryParams, setQueryParams] = useState({
         pageIndex: initPageIndex,
         pageSize: initPageSize,
-        sort: _sort,
+        sort: [],
         searchValues: [],
         orderBy,
         orderType,
+        defaultSort: _sort,
     });
     const columnSetsKey = columnSets === null || columnSets === void 0 ? void 0 : columnSets.map((i) => i.key);
     // 过滤权限字段
@@ -629,7 +630,8 @@ export const WdTable = forwardRef(function TableComp(tableProps, ref) {
                 pageSize: defaultPageSize,
                 orderBy: orderBy,
                 orderType: orderType,
-                sort: _sort,
+                defaultSort: _sort,
+                sort: [],
             }));
         }
         else {

package/dist/web/components/wd-textarea/calcTextareaHeight.d.ts

@@ -0,0 +1 @@
+export declare function getHeight(id: any): number | "auto";

package/dist/web/components/wd-textarea/calcTextareaHeight.js

@@ -0,0 +1,45 @@
+const HIDDEN_TEXTAREA_STYLE = `
+  min-height:0 !important;
+  max-height:none !important;
+  height:0 !important;
+  visibility:hidden !important;
+  overflow-y:hidden !important;
+  position:absolute !important;
+  z-index:-1000 !important;
+  top:0 !important;
+  right:0 !important
+`;
+const SIZING_PROPS = [
+    'letter-spacing',
+    'line-height',
+    'padding-top',
+    'padding-bottom',
+    'font-family',
+    'font-weight',
+    'font-size',
+    'font-variant',
+    'text-rendering',
+    'text-transform',
+    'width',
+    'text-indent',
+    'padding-left',
+    'padding-right',
+    'border-width',
+    'box-sizing',
+];
+export function getHeight(id) {
+    const textarea = document.getElementById(id);
+    if (!textarea)
+        return 'auto';
+    const style = window.getComputedStyle(textarea);
+    const value = textarea.value || textarea.placeholder;
+    const sizingStyle = SIZING_PROPS.map((name) => `${name}:${style.getPropertyValue(name)}`).join(';');
+    let hiddenText = document.createElement('textarea');
+    hiddenText.setAttribute('style', `${sizingStyle};${HIDDEN_TEXTAREA_STYLE}`);
+    hiddenText.value = value;
+    document.body.appendChild(hiddenText);
+    const height = hiddenText.scrollHeight;
+    document.body.removeChild(hiddenText);
+    hiddenText = null;
+    return height;
+}

package/dist/web/components/wd-textarea/wd-textarea.js

@@ -7,6 +7,7 @@ import { useFormInputTrait } from '../form-input-hooks';
 import { filterPropsWithOn, getUuid } from '../../utils/tool';
 import { useSize } from '../../utils/hooks/useFormLegacy';
 import { X_RUNTIME_DEFAULT } from '../../../configs/type-utils/x-runtime-default';
+import { getHeight } from './calcTextareaHeight';
 /**
  * 标准化：多行输入组件
  */
@@ -40,16 +41,13 @@ export const WdTextarea = forwardRef(function WdTextarea(props, ref) {
     const autoScroll = function () {
         if (!autoHeight || !textareaRef.current)
             return;
-        textareaRef.current.style.height = 'auto';
-        if (textareaRef.current.scrollHeight >= textareaRef.current.offsetHeight) {
-            textareaRef.current.style.height =
-                textareaRef.current.scrollHeight + 'px';
-        }
+        const height = getHeight(inputId);
+        textareaRef.current.style.height = height + 'px';
     };
     useEffect(() => {
         autoScroll();
         // eslint-disable-next-line react-hooks/exhaustive-deps
-    }, [autoHeight]);
+    }, [autoHeight, inputId]);
     /** 内部事件 */
     const onChange = function (e) {
         var _a;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cloudbase/weda-ui",
-  "version": "3.6.2",
+  "version": "3.6.5",
   "main": "./dist/index.js",
   "module": "./dist/index",
   "miniprogram": "mpdist",