@cloudbase/weda-ui 3.13.6 → 3.14.0

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

@@ -1,7 +1,7 @@
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 /* eslint-disable max-lines */
 /* eslint-disable complexity */
-import { forwardRef, useRef, useCallback, useMemo, useState, useEffect, } from 'react';
+import { forwardRef, useRef, useCallback, useMemo, useState, useEffect } from 'react';
 import { useConfig } from '../../utils/config-context';
 import { WdIcon, WdButton } from '../index';
 import { WdFormItem } from '../wd-form-item';
@@ -13,11 +13,12 @@ import { filterPropsWithOn, getUuid } from '../../utils/tool';
 import { useSyncValue } from '../../utils/hooks/useSyncValue';
 import { usePlatform } from '../../utils/platform';
 import classNames from '../../utils/classnames';
-import { dealDecimals, strNumAddCalc, isNumber, dealPercent, getPercentUnit, filterDigit, } from './number';
+import { dealDecimals, strNumAddCalc, isNumber, dealPercent, getPercentUnit, filterDigit } from './number';
 import { useSetWidgetApi } from '../../utils/widget-api/use-set-widget-api';
+import { X_RUNTIME_DEFAULT } from '../../../configs/type-utils/x-runtime-default';
 const classRoot = 'input-number';
 const getHasClearIcon = (clearable, focus, disabled, readOnly, realValue) => clearable && focus && !disabled && !readOnly && isNumber(realValue);
-const judgeRule = ({ value = undefined, max = undefined, min = undefined, resultType = 'boolean', } = {}) => {
+const judgeRule = ({ value = undefined, max = undefined, min = undefined, resultType = 'boolean' } = {}) => {
     let maxFit = true;
     let minFit = true;
     if (isNumber(max)) {
@@ -28,7 +29,7 @@ const judgeRule = ({ value = undefined, max = undefined, min = undefined, result
     }
     return resultType === 'boolean' ? maxFit && minFit : { maxFit, minFit };
 };
-const getRuleMessage = ({ value = undefined, max = undefined, min = undefined, validMsgObj = {}, } = {}) => {
+const getRuleMessage = ({ value = undefined, max = undefined, min = undefined, validMsgObj = {} } = {}) => {
     const { maxFit, minFit } = judgeRule({
         value,
         max,
@@ -38,19 +39,16 @@ const getRuleMessage = ({ value = undefined, max = undefined, min = undefined, v
     return !maxFit ? validMsgObj.max : !minFit ? validMsgObj.min : '';
 };
 export const WdInputNumber = forwardRef(function WdInputNumber(props, ref) {
+    const { clearable = X_RUNTIME_DEFAULT.clearable } = props;
     const [realValue, setRealValue] = useState(null); // 真实值
     const [showValue, setShowValue] = useState(''); // 显示值
     // 最大值，用于输入值比较
     const max = useMemo(() => {
-        return Number(props.format === 'percent'
-            ? dealPercent(`${props.max}`, 'add')
-            : props.max);
+        return Number(props.format === 'percent' ? dealPercent(`${props.max}`, 'add') : props.max);
     }, [props.format, props.max]);
     // 最小值，用于输入值比较
     const min = useMemo(() => {
-        return Number(props.format === 'percent'
-            ? dealPercent(`${props.min}`, 'add')
-            : props.min);
+        return Number(props.format === 'percent' ? dealPercent(`${props.min}`, 'add') : props.min);
     }, [props.format, props.min]);
     // 校验提示
     const validMsgObj = useMemo(() => {
@@ -116,9 +114,7 @@ export const WdInputNumber = forwardRef(function WdInputNumber(props, ref) {
         let validMsg = '';
         let res = `${value}`;
         if (isNumber(value) && res.includes('e')) {
-            res = `${res.startsWith('-') ? '-' : ''}${res
-                .replace(/^-/, '')
-                .toLocaleString()}`;
+            res = `${res.startsWith('-') ? '-' : ''}${res.replace(/^-/, '').toLocaleString()}`;
         }
         res = res.replace(/,/g, '');
         if (res !== 'Infinity' && res !== '-Infinity') {
@@ -209,19 +205,10 @@ export const WdInputNumber = forwardRef(function WdInputNumber(props, ref) {
             validMsg = validMsgObj.min;
         }
         initValidate(validState, validMsg);
-    }, [
-        showValue,
-        props.min,
-        props.max,
-        max,
-        min,
-        initValidate,
-        validMsgObj.max,
-        validMsgObj.min,
-    ]);
+    }, [showValue, props.min, props.max, max, min, initValidate, validMsgObj.max, validMsgObj.min]);
     const valueRef = useRef(value);
     const [focus, setFocus] = useSyncValue(props.focus);
-    const hasClearIcon = getHasClearIcon(props.clearable, focus, disabled, readOnly, realValue);
+    const hasClearIcon = getHasClearIcon(clearable, focus, disabled, readOnly, realValue);
     const isRow = props.stepOption === 'both'; // 右侧调整只在pc端生效
     const root = `${classPrefix}-${classRoot}`;
     const inputWrap = `${classPrefix}-form-input-wrap`;
@@ -322,7 +309,7 @@ export const WdInputNumber = forwardRef(function WdInputNumber(props, ref) {
     const onChange = (e) => {
         const value = typeof e === 'string' ? e : e.target.value;
         setShowValue(value);
-        onRealChange(e, '', { needSetData: false, value });
+        onRealChange(e, '', { needSetData: false, value, _showValue: value });
     };
     /**
      * 真实值变化
@@ -330,18 +317,16 @@ export const WdInputNumber = forwardRef(function WdInputNumber(props, ref) {
      * @param type
      * @returns
      */
-    const onRealChange = (e, type = '', { needSetData = true, value = '' } = {}) => {
+    const onRealChange = (e, type = '', { needSetData = true, value = '', _showValue = showValue } = {}) => {
         var _a, _b, _c, _d;
         if (editDisabled)
             return realValue;
         if (['plus', 'minus'].includes(type)) {
-            if (!isNumber(props.step) ||
-                (type === 'plus' && stepPlusDisabled) ||
-                (type === 'minus' && stepMinusDisabled)) {
-                return Number(value || showValue);
+            if (!isNumber(props.step) || (type === 'plus' && stepPlusDisabled) || (type === 'minus' && stepMinusDisabled)) {
+                return Number(value || _showValue);
             }
         }
-        const toShow = getShowValue(filterDigit(value || showValue), type);
+        const toShow = getShowValue(filterDigit(value || _showValue), type);
         const toReal = getRealValue(toShow);
         if (needSetData) {
             setShowValue(toShow);
@@ -426,9 +411,7 @@ export const WdInputNumber = forwardRef(function WdInputNumber(props, ref) {
     const getAfterShow = (text) => {
         if (!text)
             return null;
-        return (_jsx("div", { className: `${text === '%'
-                ? `${classPrefix}-input-number__text-right-percent`
-                : ''}`, children: text }));
+        return _jsx("div", { className: `${text === '%' ? `${classPrefix}-input-number__text-right-percent` : ''}`, children: text });
     };
     if (!visible)
         return null;

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

@@ -21,8 +21,8 @@ export declare const WdInputPhone: React.ForwardRefExoticComponent<CommonPropsTy
         }, ...args: unknown[]) => unknown);
     };
 } & {
-    type?: string;
     name?: string;
+    type?: string;
     label?: string;
     template?: string;
     focus?: boolean;
@@ -56,9 +56,9 @@ export declare const WdInputPhone: React.ForwardRefExoticComponent<CommonPropsTy
     borderedH5?: boolean;
     borderedPc?: boolean;
     rules?: {
-        format: string;
         message: string;
         pattern: string;
+        format: string;
     }[];
     requiredFlag?: boolean;
     requiredMsg?: string;

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

@@ -9,7 +9,7 @@ import { filterFieldsGenerate } from './filterFieldsGenerate';
 import { WdButton } from '../../../wd-button';
 import { usePlatform } from '../../../../utils/platform';
 import { useSetWidgetApi } from '../../../../utils/widget-api/use-set-widget-api';
-const getFilterConfig = (data) => data.map(({ name, label, value, fieldCalculationOption = [], fieldCalculation, }) => ({
+const getFilterConfig = (data) => data.map(({ name, label, value, fieldCalculationOption = [], fieldCalculation }) => ({
     name,
     label,
     value,
@@ -18,7 +18,7 @@ const getFilterConfig = (data) => data.map(({ name, label, value, fieldCalculati
 }));
 // 筛选表单
 export const FilterFieldsPanel = forwardRef(function Comp(props, ref) {
-    const { filterFields, fetchData, openMobileFilter, setOpenMobileFilter, setFilterConfig, } = props;
+    const { filterFields, fetchData, openMobileFilter, setOpenMobileFilter, setFilterConfig } = props;
     const num = 2;
     const maxlength = 3;
     const { classPrefix } = useConfig();
@@ -27,7 +27,7 @@ export const FilterFieldsPanel = forwardRef(function Comp(props, ref) {
     const [initFilterData, setInitFilterData] = useState([]);
     const [filterData, setFilterData] = useState([]);
     const updateFilterData = (filterFieldItemConfig) => {
-        const newData = filterData.map((i) => i.id === filterFieldItemConfig.id ? filterFieldItemConfig : i);
+        const newData = filterData.map((i) => (i.id === filterFieldItemConfig.id ? filterFieldItemConfig : i));
         setFilterData(newData);
         setFilterConfig(getFilterConfig(newData));
     };
@@ -54,9 +54,7 @@ export const FilterFieldsPanel = forwardRef(function Comp(props, ref) {
     const searchHandle = (searchData = filterData) => {
         let searchValues = [];
         const filterValues = searchData.filter((i) => {
-            if (Array.isArray(i.value) &&
-                i.filterType === 'number' &&
-                i.fieldCalculation.value === 'scope') {
+            if (Array.isArray(i.value) && i.filterType === 'number' && i.fieldCalculation.value === 'scope') {
                 // 若筛选字段为number类型，且为范围选择时，只要有一个值则返回
                 return i.value[0] || i.value[1];
             }
@@ -72,10 +70,7 @@ export const FilterFieldsPanel = forwardRef(function Comp(props, ref) {
                         var _a;
                         if (n.$and) {
                             return {
-                                $and: [
-                                    ...n.$and,
-                                    { [i.name]: { [(_a = i === null || i === void 0 ? void 0 : i.fieldCalculation) === null || _a === void 0 ? void 0 : _a.value]: '1' } },
-                                ],
+                                $and: [...n.$and, { [i.name]: { [(_a = i === null || i === void 0 ? void 0 : i.fieldCalculation) === null || _a === void 0 ? void 0 : _a.value]: '1' } }],
                             };
                         }
                         return n;
@@ -90,6 +85,7 @@ export const FilterFieldsPanel = forwardRef(function Comp(props, ref) {
         });
         // 值筛选条件
         filterValues.forEach((i) => {
+            var _a, _b, _c;
             switch (i.fieldCalculation.value) {
                 case 'scope':
                     if (i.filterType === 'number') {
@@ -126,17 +122,17 @@ export const FilterFieldsPanel = forwardRef(function Comp(props, ref) {
                 case 'exclude':
                     searchValues.push({
                         key: i.name,
-                        val: `^((?!${i.value}).)*$`,
+                        val: `^((?!${(_a = i.value) === null || _a === void 0 ? void 0 : _a.trim()}).)*$`,
                         rel: 'regex',
                     });
                     break;
                 case 'startWith':
-                    searchValues.push({ key: i.name, val: `^${i.value}`, rel: 'regex' });
+                    searchValues.push({ key: i.name, val: `^${(_b = i.value) === null || _b === void 0 ? void 0 : _b.trim()}`, rel: 'regex' });
                     break;
                 default: {
                     const searchItem = {
                         key: i.name,
-                        val: i.value,
+                        val: (_c = i.value) === null || _c === void 0 ? void 0 : _c.trim(),
                         rel: i.fieldCalculation.value,
                     };
                     if (i.filterType === 'number') {

package/dist/web/components/wd-tree/utils.d.ts

@@ -127,9 +127,9 @@ declare const getTreeInfo: (params: IFindNodeParams, checkable: boolean) => {
     selected: string[];
     currentNode: {
         data?: {
-            value: string;
             label: string;
             children: any[];
+            value: string;
             disabled: boolean;
             foldIcon: string;
             expendIcon: string;
@@ -138,9 +138,9 @@ declare const getTreeInfo: (params: IFindNodeParams, checkable: boolean) => {
     };
     selectedPositions: string[];
     selectedNodes: {
-        value: string;
         label: string;
         children: any[];
+        value: string;
         disabled: boolean;
         foldIcon: string;
         expendIcon: string;
@@ -148,9 +148,9 @@ declare const getTreeInfo: (params: IFindNodeParams, checkable: boolean) => {
     }[];
     expandedPositions: string[];
     expandedNodes: {
-        value: string;
         label: string;
         children: any[];
+        value: string;
         disabled: boolean;
         foldIcon: string;
         expendIcon: string;
@@ -159,9 +159,9 @@ declare const getTreeInfo: (params: IFindNodeParams, checkable: boolean) => {
     searched: string[];
     searchedPositions: string[];
     searchedNodes: {
-        value: string;
         label: string;
         children: any[];
+        value: string;
         disabled: boolean;
         foldIcon: string;
         expendIcon: string;
@@ -169,9 +169,9 @@ declare const getTreeInfo: (params: IFindNodeParams, checkable: boolean) => {
     }[];
     checkedPositions: string[];
     checkedNodes: {
-        value: string;
         label: string;
         children: any[];
+        value: string;
         disabled: boolean;
         foldIcon: string;
         expendIcon: string;
@@ -180,9 +180,9 @@ declare const getTreeInfo: (params: IFindNodeParams, checkable: boolean) => {
     childChecked: string[];
     childCheckedPositions: string[];
     childCheckedNodes: {
-        value: string;
         label: string;
         children: any[];
+        value: string;
         disabled: boolean;
         foldIcon: string;
         expendIcon: string;

package/dist/web/utils/loadIconCss.js

@@ -1,7 +1,6 @@
 import onlineConfig from '../../onlineConfig.json';
-import { getUrlPath } from './tool';
-import { isPrivate } from './isPrivate';
 import { errorHandler } from './error';
+import { isPrivate } from './isPrivate';
 let shadowRootCache = null;
 const WEDA_PORTAL_ID = 'weda-module-portal';
 export function getShadowRoot() {
@@ -58,11 +57,15 @@ function loadLink(url, className) {
 // 组件库加载后默认挂载图标库
 (function () {
     try {
-        const iconConfig = onlineConfig.icon;
-        const cfg = isPrivate()
-            ? { ...iconConfig, ...iconConfig.private }
-            : iconConfig;
-        loadLink(cfg.css, 'wd-load-remote-icon');
+        const cfg = onlineConfig.icon;
+        if (isPrivate()) {
+            loadLink(cfg.private.css, 'wd-load-remote-icon').catch((e) => {
+                loadLink(cfg.css, 'wd-load-remote-icon');
+            });
+        }
+        else {
+            loadLink(cfg.css, 'wd-load-remote-icon');
+        }
     }
     catch (e) {
         errorHandler({ code: 'LoadIconResourceError', error: e });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cloudbase/weda-ui",
-  "version": "3.13.6",
+  "version": "3.14.0",
   "main": "./dist/index.js",
   "module": "./dist/index",
   "miniprogram": "mpdist",
@@ -43,7 +43,7 @@
     "prestart:e2e-server": "node ./tools/e2e-prepare.mjs",
     "start:e2e-server": "node ./lowcode-comps/e2e-server.js",
     "test:e2e-component": "npm run build-mp && npx cypress run --component",
-    "test:e2e-cals": "start-server-and-test start:e2e-server 2333 'npx cypress run -b chrome --headless'",
+    "test:e2e-cals": "WAIT_ON_TIMEOUT=900000 start-server-and-test start:e2e-server 2333 'npx cypress run -b chrome --headless'",
     "test:manual-e2e-cals": "start-server-and-test start:e2e-server 2333 'npx cypress open -b chrome'",
     "test:e2e": "npm run test:e2e-component && npm run test:e2e-cals",
     "posttest:e2e-cals": "npm run e2e:report",
@@ -85,7 +85,7 @@
   "description": "腾讯云微搭低代码组件库模板",
   "dependencies": {
     "@antv/g6": "^4.8.5",
-    "@cloudbase/weda-client": "^1.1.16",
+    "@cloudbase/weda-client": "^1.1.21",
     "@codemirror/autocomplete": "^6.16.0",
     "@codemirror/lang-javascript": "^6.2.2",
     "@codemirror/lang-json": "^6.0.1",
@@ -148,7 +148,7 @@
     "@babel/preset-react": "^7.22.15",
     "@babel/preset-typescript": "^7.22.15",
     "@cloudbase/cals": "^1.2.8",
-    "@cloudbase/lowcode-cli": "^0.22.0",
+    "@cloudbase/lowcode-cli": "^0.22.1",
     "@cloudbase/weda-cloud-sdk": "^1.0.96",
     "@commitlint/cli": "^16.0.2",
     "@commitlint/config-conventional": "^17.7.0",