@cloudbase/weda-ui 3.15.2 → 3.15.6

package/dist/web/components/form/location/common/mapView.d.ts

@@ -1,4 +1,4 @@
-declare function MapView({ APIKEY, drag, zoom, latlng, }: {
+declare function MapView({ APIKEY, drag, zoom, latlng }: {
     APIKEY?: string;
     drag?: boolean;
     zoom?: boolean;

package/dist/web/components/form/location/common/mapView.js

@@ -11,7 +11,7 @@ const defaultLatLng = {
     lat: null,
     lng: null,
 };
-export default function MapView({ APIKEY = '', drag = true, zoom = true, latlng = defaultLatLng, }) {
+export default function MapView({ APIKEY = '', drag = true, zoom = true, latlng = defaultLatLng }) {
     const mapRef = useRef();
     const markerRef = useRef();
     const mapDom = useRef();
@@ -81,7 +81,8 @@ export default function MapView({ APIKEY = '', drag = true, zoom = true, latlng
         function loadScript() {
             // 移除之前的
             if (document.getElementById('tmap-script')) {
-                document.body.removeChild(document.getElementById('tmap-script'));
+                const scriptDom = document.getElementById('tmap-script');
+                scriptDom.parentNode.removeChild(scriptDom);
             }
             const script = document.createElement('script');
             script.type = 'text/javascript';

package/dist/web/components/form/location/common/useLocationInfo.d.ts

@@ -1,4 +1,4 @@
-export default function useLocationInfo({ apiKey: APIKEY, locationType, eventsChange, dataSourceStatus, }: {
+export default function useLocationInfo({ apiKey: APIKEY, locationType, eventsChange, dataSourceStatus }: {
     apiKey: any;
     locationType: any;
     eventsChange: any;

package/dist/web/components/form/location/common/useLocationInfo.js

@@ -5,13 +5,12 @@ const { useEffect, useState, useRef } = React;
 // 改造：detailedAddress 和 type 非必须
 export const checkCustomLocation = (params) => {
     var _a, _b;
-    if (!(params === null || params === void 0 ? void 0 : params.address) ||
-        (((_a = params === null || params === void 0 ? void 0 : params.geopoint) === null || _a === void 0 ? void 0 : _a.type) && ((_b = params === null || params === void 0 ? void 0 : params.geopoint) === null || _b === void 0 ? void 0 : _b.type) !== 'Point')) {
+    if (!(params === null || params === void 0 ? void 0 : params.address) || (((_a = params === null || params === void 0 ? void 0 : params.geopoint) === null || _a === void 0 ? void 0 : _a.type) && ((_b = params === null || params === void 0 ? void 0 : params.geopoint) === null || _b === void 0 ? void 0 : _b.type) !== 'Point')) {
         return false;
     }
     return true;
 };
-export default function useLocationInfo({ apiKey: APIKEY, locationType, eventsChange, dataSourceStatus, }) {
+export default function useLocationInfo({ apiKey: APIKEY, locationType, eventsChange, dataSourceStatus }) {
     const [location, setLocation] = useState({
         poiname: '',
         detailedAddress: '',
@@ -25,14 +24,13 @@ export default function useLocationInfo({ apiKey: APIKEY, locationType, eventsCh
     const currentLocations = useRef();
     const customLocation = useRef();
     useEffect(() => {
-        if (!dataSourceStatus ||
-            !APIKEY ||
-            new RegExp('[\\u4E00-\\u9FFF]+', 'g').test(APIKEY))
+        if (!dataSourceStatus || !APIKEY || new RegExp('[\\u4E00-\\u9FFF]+', 'g').test(APIKEY))
             return;
         function loadScript() {
             // 移除之前的
             if (document.getElementById('form-location-plug')) {
-                document.body.removeChild(document.getElementById('form-location-plug'));
+                const scriptDom = document.getElementById('form-location-plug');
+                scriptDom.parentNode.removeChild(scriptDom);
             }
             const script = document.createElement('script');
             script.type = 'text/javascript';
@@ -65,9 +63,7 @@ export default function useLocationInfo({ apiKey: APIKEY, locationType, eventsCh
                     currentLocations.current = null;
                     setApiKeyStatus({
                         status: false,
-                        message: error.code === 1
-                            ? '请打开定位权限'
-                            : error.message || '定位失败',
+                        message: error.code === 1 ? '请打开定位权限' : error.message || '定位失败',
                     });
                     setCurrentLocStatus(false);
                 });

package/dist/web/components/form/location/components/LocationH5/location.h5.js

@@ -97,14 +97,13 @@ export default function LocationH5(props) {
     }, [value]);
     // 获取定位信息
     useEffect(() => {
-        if (!dataSourceStatus.status ||
-            !APIKEY ||
-            new RegExp('[\\u4E00-\\u9FFF]+', 'g').test(APIKEY))
+        if (!dataSourceStatus.status || !APIKEY || new RegExp('[\\u4E00-\\u9FFF]+', 'g').test(APIKEY))
             return;
         function loadScript() {
             // 移除之前的
             if (document.getElementById('form-location-plug')) {
-                document.body.removeChild(document.getElementById('form-location-plug'));
+                const scriptDom = document.getElementById('form-location-plug');
+                scriptDom.parentNode.removeChild(scriptDom);
             }
             const script = document.createElement('script');
             script.type = 'text/javascript';
@@ -149,9 +148,7 @@ export default function LocationH5(props) {
                     currentLocations.current = null;
                     setApiKeyStatus({
                         status: false,
-                        message: error.code === 1
-                            ? '请打开定位权限'
-                            : error.message || '定位失败',
+                        message: error.code === 1 ? '请打开定位权限' : error.message || '定位失败',
                     });
                     setCurrentLocStatus(false);
                 });
@@ -296,9 +293,7 @@ export default function LocationH5(props) {
                                     'form-location-addr-vertical': layout === 'vertical',
                                     [`${classPrefix}-form-read-color`]: readOnly,
                                     'form-location-addr--disabled': disabled,
-                                }), children: [_jsx("div", { className: "form-location-con__icon" }), _jsxs("div", { className: "form-location-con__text", children: [location.poiname && (_jsx(WdText, { text: location.poiname, className: "form-location-addr-title wd-location__info" })), showLngLat && (_jsx("div", { className: "form-location-addr-lat", children: location.latlng
-                                                    ? `${location.latlng.lat}N,${location.latlng.lng}E`
-                                                    : '' }))] })] }))] })] }), getIsShowMap() && (_jsx("div", { className: "form-map-container", style: { height: '200px' }, children: _jsx(MapView, { APIKEY: APIKEY, drag: drag, zoom: zoom, latlng: location.latlng }) })), _jsx(SelectModal, { isSelectMapVisible: isSelectMapVisible, setIsSelectMapVisible: setIsSelectMapVisible, location: location, currentLocations: currentLocations.current, setLocation: setLocation, chooseLocation: onChangeLocation, APIKEY: APIKEY, locationRange: locationRange, customRange: customRange })] }));
+                                }), children: [_jsx("div", { className: "form-location-con__icon" }), _jsxs("div", { className: "form-location-con__text", children: [location.poiname && (_jsx(WdText, { text: location.poiname, className: "form-location-addr-title wd-location__info" })), showLngLat && (_jsx("div", { className: "form-location-addr-lat", children: location.latlng ? `${location.latlng.lat}N,${location.latlng.lng}E` : '' }))] })] }))] })] }), getIsShowMap() && (_jsx("div", { className: "form-map-container", style: { height: '200px' }, children: _jsx(MapView, { APIKEY: APIKEY, drag: drag, zoom: zoom, latlng: location.latlng }) })), _jsx(SelectModal, { isSelectMapVisible: isSelectMapVisible, setIsSelectMapVisible: setIsSelectMapVisible, location: location, currentLocations: currentLocations.current, setLocation: setLocation, chooseLocation: onChangeLocation, APIKEY: APIKEY, locationRange: locationRange, customRange: customRange })] }));
     return renderDecorator(LocationEl, decorator)({
         id,
         className: cls,

package/dist/web/components/wd-markdown/addClass.d.ts

@@ -0,0 +1 @@
+export function addCustomClassPlugin(md: any): void;

package/dist/web/components/wd-markdown/addClass.js

@@ -0,0 +1,78 @@
+// List of valid html blocks names, according to commonmark spec
+// https://spec.commonmark.org/0.30/#html-blocks
+const htmlTags = [
+    'address',
+    'article',
+    'aside',
+    'base',
+    'basefont',
+    'blockquote',
+    'body',
+    'caption',
+    'center',
+    'col',
+    'colgroup',
+    'dd',
+    'details',
+    'dialog',
+    'dir',
+    'div',
+    'dl',
+    'dt',
+    'fieldset',
+    'figcaption',
+    'figure',
+    'footer',
+    'form',
+    'frame',
+    'frameset',
+    'h1',
+    'h2',
+    'h3',
+    'h4',
+    'h5',
+    'h6',
+    'head',
+    'header',
+    'hr',
+    'html',
+    'iframe',
+    'legend',
+    'li',
+    'link',
+    'main',
+    'menu',
+    'menuitem',
+    'nav',
+    'noframes',
+    'ol',
+    'optgroup',
+    'option',
+    'p',
+    'param',
+    'search',
+    'section',
+    'summary',
+    'table',
+    'tbody',
+    'td',
+    'tfoot',
+    'th',
+    'thead',
+    'title',
+    'tr',
+    'track',
+    'ul',
+];
+export function addCustomClassPlugin(md) {
+    const addCustomClass = (state) => {
+        var _a;
+        (_a = state === null || state === void 0 ? void 0 : state.tokens) === null || _a === void 0 ? void 0 : _a.forEach((token) => {
+            if (htmlTags.includes(token.tag)) {
+                // 添加自定义类
+                token.attrJoin('class', token.tag);
+            }
+        });
+    };
+    md.core.ruler.push('addCustomClass', addCustomClass);
+}

package/dist/web/components/wd-markdown/github-markdown-light.css

@@ -6,8 +6,8 @@
   margin: 0;
   color: #1f2328;
   background-color: #ffffff;
-  font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', 'Noto Sans',
-    Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji';
+  font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', 'Noto Sans', Helvetica, Arial, sans-serif,
+    'Apple Color Emoji', 'Segoe UI Emoji';
   font-size: 16px;
   line-height: 1.5;
   word-wrap: break-word;
@@ -257,8 +257,7 @@
 .markdown-body kbd {
   display: inline-block;
   padding: 3px 5px;
-  font: 11px ui-monospace, SFMono-Regular, SF Mono, Menlo, Consolas,
-    Liberation Mono, monospace;
+  font: 11px ui-monospace, SFMono-Regular, SF Mono, Menlo, Consolas, Liberation Mono, monospace;
   line-height: 10px;
   color: #1f2328;
   vertical-align: middle;
@@ -348,16 +347,14 @@
 .markdown-body tt,
 .markdown-body code,
 .markdown-body samp {
-  font-family: ui-monospace, SFMono-Regular, SF Mono, Menlo, Consolas,
-    Liberation Mono, monospace;
+  font-family: ui-monospace, SFMono-Regular, SF Mono, Menlo, Consolas, Liberation Mono, monospace;
   font-size: 12px;
 }
 
 .markdown-body pre {
   margin-top: 0;
   margin-bottom: 0;
-  font-family: ui-monospace, SFMono-Regular, SF Mono, Menlo, Consolas,
-    Liberation Mono, monospace;
+  font-family: ui-monospace, SFMono-Regular, SF Mono, Menlo, Consolas, Liberation Mono, monospace;
   font-size: 12px;
   word-wrap: normal;
 }
@@ -591,11 +588,14 @@
   background-color: #ffffff;
   border-top: 1px solid #d0d7deb3;
 }
-
-.markdown-body table tr:nth-child(2n) {
+.markdown-body .table .thead .tr {
   background-color: #f6f8fa;
 }
 
+/* .markdown-body table tr:nth-child(2n) {
+  background-color: #f6f8fa;
+} */
+
 .markdown-body table img {
   background-color: transparent;
 }
@@ -1029,9 +1029,7 @@
 }
 
 .markdown-body .contains-task-list:hover .task-list-item-convert-container,
-.markdown-body
-  .contains-task-list:focus-within
-  .task-list-item-convert-container {
+.markdown-body .contains-task-list:focus-within .task-list-item-convert-container {
   display: block;
   width: auto;
   height: 24px;

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

@@ -1,6 +1,6 @@
 import { jsx as _jsx } from "react/jsx-runtime";
 /* eslint-disable @typescript-eslint/no-magic-numbers */
-import { useEffect, useState, useCallback, forwardRef, useRef, } from 'react';
+import { useEffect, useState, useCallback, forwardRef, useRef } from 'react';
 import MarkdownIt from 'markdown-it/dist/markdown-it.js';
 import copy from 'markdown-it-code-copy';
 import hljs from 'highlight.js';
@@ -11,6 +11,7 @@ import classNames from '../../utils/classnames';
 import useDebouncedCallback from '../../utils/hooks/use-debounced-callback';
 import { useImgTransform } from '../richTextView/useImgTransform';
 import { getOnClick } from '../wd-unified-link/utils';
+import { addCustomClassPlugin } from './addClass';
 import './style';
 export const WdMarkdown = forwardRef(function WdMarkdown({ value = '', options, className, style, id, events }, ref) {
     const platform = usePlatform();
@@ -70,6 +71,7 @@ export const WdMarkdown = forwardRef(function WdMarkdown({ value = '', options,
             },
             ...options,
         });
+        md.use(addCustomClassPlugin);
         md.use(copy);
         onMarkdownReady(md);
     }, [mdInstance, onMarkdownReady, destroy]), 500, {
@@ -97,8 +99,7 @@ export const WdMarkdown = forwardRef(function WdMarkdown({ value = '', options,
             markdownRef.current.querySelectorAll('a').forEach((a) => {
                 const url = a.href;
                 // 若非同域 默认新页面打开
-                if (/https?:\/\//.test(url) &&
-                    !url.startsWith(window.location.origin)) {
+                if (/https?:\/\//.test(url) && !url.startsWith(window.location.origin)) {
                     a.target = a.target || '_blank';
                 }
                 a.addEventListener('click', (e) => {
@@ -114,5 +115,5 @@ export const WdMarkdown = forwardRef(function WdMarkdown({ value = '', options,
             updateMarkdownInstance: ({ markdownInstance }) => setMdInstance(markdownInstance),
         };
     }, [value, mdInstance], ref);
-    return (_jsx("div", { ref: markdownRef, className: cls, style: style, id: id, children: displayValue && (_jsx("div", { dangerouslySetInnerHTML: { __html: displayValue } })) }));
+    return (_jsx("div", { ref: markdownRef, className: cls, style: style, id: id, children: displayValue && _jsx("div", { dangerouslySetInnerHTML: { __html: displayValue } }) }));
 });

package/dist/web/components/wd-table/components/ExportFileModalByApi/index.d.ts

@@ -16,7 +16,7 @@ export declare const ExportFileModal: ({ fields, columns, isExportFileModalByApi
 /**
  * 表格导出方法
  */
-export declare const exportHandle: ({ selectedKeys, records, enumOptions, datasourceTitle, columnSets, fields, }: {
+export declare const exportHandle: ({ selectedKeys, records, enumOptions, datasourceTitle, columnSets, fields }: {
     selectedKeys: any;
     records: any;
     enumOptions: any;
@@ -27,7 +27,7 @@ export declare const exportHandle: ({ selectedKeys, records, enumOptions, dataso
 /**
  * 后端表格导出方法
  */
-export declare const exportHandleByApi: ({ isH5, setIsExportFileModalByApiVisible, }: {
+export declare const exportHandleByApi: ({ isH5, setIsExportFileModalByApiVisible }: {
     isH5: any;
     setIsExportFileModalByApiVisible: any;
 }) => void;

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

@@ -15,10 +15,10 @@ export const ExportFileModal = ({ fields, columns, isExportFileModalByApiVisible
         if (field &&
             (i === null || i === void 0 ? void 0 : i.isExport) &&
             !(i === null || i === void 0 ? void 0 : i.isRelated) &&
-            (i === null || i === void 0 ? void 0 : i.format) !== 'many-many' &&
-            (i === null || i === void 0 ? void 0 : i.format) !== 'many-one' &&
-            (i === null || i === void 0 ? void 0 : i.format) !== 'one-many' &&
-            (i === null || i === void 0 ? void 0 : i.format) !== 'one-one') {
+            (field === null || field === void 0 ? void 0 : field.format) !== 'many-many' &&
+            (field === null || field === void 0 ? void 0 : field.format) !== 'many-one' &&
+            (field === null || field === void 0 ? void 0 : field.format) !== 'one-many' &&
+            (field === null || field === void 0 ? void 0 : field.format) !== 'one-one') {
             supportFields.push(field);
         }
     });
@@ -36,10 +36,7 @@ export const ExportFileModal = ({ fields, columns, isExportFileModalByApiVisible
         .filter((el) => {
         const field = fields.find((i) => (i === null || i === void 0 ? void 0 : i.name) === (el === null || el === void 0 ? void 0 : el.key) && el.isRelated);
         const format = field === null || field === void 0 ? void 0 : field.format;
-        return (el.isRelated &&
-            el.isExport &&
-            format !== 'many-many' &&
-            format !== 'one-many');
+        return el.isRelated && el.isExport && format !== 'many-many' && format !== 'one-many';
     })
         .map((item) => {
         return {
@@ -60,7 +57,7 @@ export const ExportFileModal = ({ fields, columns, isExportFileModalByApiVisible
 /**
  * 表格导出方法
  */
-export const exportHandle = ({ selectedKeys, records, enumOptions, datasourceTitle, columnSets, fields, }) => {
+export const exportHandle = ({ selectedKeys, records, enumOptions, datasourceTitle, columnSets, fields }) => {
     if (!selectedKeys.length) {
         return alertErrorMessage({
             message: '请选择需要导出的数据',
@@ -79,7 +76,7 @@ export const exportHandle = ({ selectedKeys, records, enumOptions, datasourceTit
 /**
  * 后端表格导出方法
  */
-export const exportHandleByApi = ({ isH5, setIsExportFileModalByApiVisible, }) => {
+export const exportHandleByApi = ({ isH5, setIsExportFileModalByApiVisible }) => {
     if (isH5) {
         return alertErrorMessage({
             message: '移动端暂不支持进行数据导出',

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

@@ -122,7 +122,7 @@ export const FilterFieldsPanel = forwardRef(function Comp(props, ref) {
                 case 'exclude':
                     searchValues.push({
                         key: i.name,
-                        val: `^((?!${(_a = i.value) === null || _a === void 0 ? void 0 : _a.trim()}).)*$`,
+                        val: `^((?!${i.filterType === 'string' ? (_a = i.value) === null || _a === void 0 ? void 0 : _a.trim() : i.value}).)*$`,
                         rel: 'regex',
                     });
                     break;
@@ -132,7 +132,7 @@ export const FilterFieldsPanel = forwardRef(function Comp(props, ref) {
                 default: {
                     const searchItem = {
                         key: i.name,
-                        val: (_c = i.value) === null || _c === void 0 ? void 0 : _c.trim(),
+                        val: i.filterType === 'string' ? (_c = i.value) === null || _c === void 0 ? void 0 : _c.trim() : i.value,
                         rel: i.fieldCalculation.value,
                     };
                     if (i.filterType === 'number') {

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

@@ -548,7 +548,7 @@ export const WdTable = forwardRef(function TableComp(tableProps, ref) {
             onSelectChange([], {}, true);
         },
         // 当前页数据
-        records: isExpression && !enableTotal
+        records: isExpression && !enableTotal && enablePagination
             ? getCurrentPageData(dataRef.current.tableRecords, query.pageNo, query.pageSize)
             : dataRef.current.tableRecords,
         // 当前总数

package/dist/web/components/wd-upload-file/wd-upload-file.css

@@ -7,15 +7,11 @@
   display: none;
 }
 
-.wd-form-item.wd-h5-upload-file-root
-  .weui-upload-file
-  .weda-upload-file-mobile {
+.wd-form-item.wd-h5-upload-file-root .weui-upload-file .weda-upload-file-mobile {
   width: auto;
 }
 
-.wd-form-item.wd-h5-upload-file-root
-  .weui-upload-file
-  .weda-upload-file-mobile__hd {
+.wd-form-item.wd-h5-upload-file-root .weui-upload-file .weda-upload-file-mobile__hd {
   padding: 0;
 }
 
@@ -27,10 +23,7 @@
   margin: 8px 0;
 }
 
-.wd-form-item.wd-h5-upload-file-root
-  .weui-upload-file
-  .weda-upload-file-mobile
-  .weda-upload-file-mobile__item {
+.wd-form-item.wd-h5-upload-file-root .weui-upload-file .weda-upload-file-mobile .weda-upload-file-mobile__item {
   padding: 0;
 }
 
@@ -47,9 +40,7 @@
 }
 
 /* pc */
-.wd-form-item.wd-pc-upload-file-root
-  ._weda-fn-upload-result
-  ._weda-fn-upload-result__item {
+.wd-form-item.wd-pc-upload-file-root ._weda-fn-upload-result ._weda-fn-upload-result__item {
   margin-top: 0;
   margin-bottom: 8px;
 }
@@ -57,9 +48,7 @@
   width: 100%;
 }
 
-.wd-form-item.wd-pc-upload-file-root
-  .weda-upload-file-pc__readOnly
-  .weda-upload-file-pc__input-box {
+.wd-form-item.wd-pc-upload-file-root .weda-upload-file-pc__readOnly .weda-upload-file-pc__input-box {
   display: none;
 }
 
@@ -69,20 +58,12 @@
   margin-top: 0;
 }
 
-.wd-form-item.wd-pc-upload-file-root
-  > .wd-form-item-wrap
-  > .wd-form-item-wrap__control {
+.wd-form-item.wd-pc-upload-file-root > .wd-form-item-wrap > .wd-form-item-wrap__control {
   overflow-x: hidden;
 }
 
-.wd-form-item.wd-pc-upload-file-root
-  .weda-upload-file-pc
-  .weda-upload-file-pc--item
-  .weda-upload-file-pc--item-label,
-.wd-form-item.wd-pc-upload-file-root
-  .weda-upload-file-pc
-  .weda-upload-file-pc--item
-  .weda-upload-file-pc--item-value {
+.wd-form-item.wd-pc-upload-file-root .weda-upload-file-pc .weda-upload-file-pc--item .weda-upload-file-pc--item-label,
+.wd-form-item.wd-pc-upload-file-root .weda-upload-file-pc .weda-upload-file-pc--item .weda-upload-file-pc--item-value {
   padding: 10px 4px;
   text-align: center;
   width: 80px;
@@ -97,11 +78,7 @@
   margin-right: 4px;
 }
 
-.wd-form-item.wd-pc-upload-file-root
-  .weda-upload-file-pc
-  .weda-upload-file-pc--item
-  .weda-upload-file-pc--item-title {
+.wd-form-item.wd-pc-upload-file-root .weda-upload-file-pc .weda-upload-file-pc--item .weda-upload-file-pc--item-title {
   flex-grow: 2;
-  width: 100%;
   max-width: calc(100% - 240px);
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cloudbase/weda-ui",
-  "version": "3.15.2",
+  "version": "3.15.6",
   "main": "./dist/index.js",
   "module": "./dist/index",
   "miniprogram": "mpdist",
@@ -85,7 +85,7 @@
   "description": "腾讯云微搭低代码组件库模板",
   "dependencies": {
     "@antv/g6": "^4.8.5",
-    "@cloudbase/weda-client": "^1.1.24",
+    "@cloudbase/weda-client": "^1.1.26",
     "@codemirror/autocomplete": "^6.16.0",
     "@codemirror/lang-javascript": "^6.2.2",
     "@codemirror/lang-json": "^6.0.1",
@@ -147,7 +147,7 @@
     "@babel/preset-env": "^7.22.15",
     "@babel/preset-react": "^7.22.15",
     "@babel/preset-typescript": "^7.22.15",
-    "@cloudbase/cals": "^1.2.10",
+    "@cloudbase/cals": "^1.2.11",
     "@cloudbase/lowcode-cli": "^0.22.1",
     "@cloudbase/weda-cloud-sdk": "^1.0.97",
     "@commitlint/cli": "^16.0.2",