@cloudbase/weda-ui 3.21.0 → 3.21.2

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

@@ -72,6 +72,7 @@ exeditor-toolbar-table-panel {
 .weda-richtext-container {
   z-index: 2 !important;
   height: 100%;
+  background-color: #fff;
 }
 
 .weda-richtext-container.ex-fullscreen {
@@ -108,9 +109,7 @@ exeditor-toolbar-table-panel {
 }
 
 .weda-richText.weda-richText-web-not-vertical > :last-child {
-  width: calc(
-    100% - var(--wd-form-item-label-width) - var(--wd-form-item-label-mr)
-  ) !important;
+  width: calc(100% - var(--wd-form-item-label-width) - var(--wd-form-item-label-mr)) !important;
   max-width: inherit;
 }
 
@@ -137,3 +136,239 @@ exeditor-link-modal {
   background-color: inherit;
   width: 100%;
 }
+
+.exeditor-toolbar[data-theme='basic'] {
+  --exeditor-toolbar-color: var(--exeditor-basic-toolbar-color, #555);
+  display: flex;
+  flex-wrap: wrap;
+  align-items: center;
+  padding: var(--exeditor-toolbar-padding, 15px);
+  color: var(--exeditor-toolbar-color, #555);
+  background: var(--exeditor-toolbar-background, #fcfcfc);
+}
+.exeditor-toolbar[data-theme='basic'][data-in='popover'] {
+  box-sizing: border-box;
+  display: none;
+  position: absolute;
+  left: 0;
+  top: 0;
+  max-width: 100%;
+  padding: 5px;
+  border-radius: 4px;
+  box-shadow: 0 0 10px 5px rgb(0 0 0 / 6%);
+}
+.exeditor-toolbar--multiline[data-theme='basic'] {
+  flex-direction: column;
+  align-items: flex-start;
+}
+.exeditor-toolbar--multiline[data-theme='basic'] > .exeditor-toolbar__row {
+  display: flex;
+  flex-wrap: wrap;
+  align-items: center;
+}
+.exeditor-toolbar[data-theme='basic'] [data-toolbar-item-of] {
+  flex-basis: 0;
+  margin: 0 var(--exeditor-basic-toolbar-button-margin, 5px);
+  white-space: nowrap;
+}
+
+.ExEditor-basic::after {
+  content: '';
+  display: block;
+  clear: both;
+}
+.ExEditor-basic {
+  box-sizing: border-box;
+  min-height: var(--exeditor-editor-min-height, 100px);
+  background: var(--exeditor-editor-background, #fff);
+  padding: var(--exeditor-editor-padding, 20px);
+  outline: none;
+  white-space: pre-wrap;
+  --exeditor-hr-color: var(--exeditor-basic-hr-color, #e7e7e7);
+  --exeditor-link-color: var(--exeditor-basic-link-color, #0052ff);
+  --exeditor-selected-outline: var(--exeditor-basic-selected-outline, 2px solid #68cef8);
+  --exeditor-selected-background: var(--exeditor-basic-selected-background, rgba(24, 144, 255, 0.3));
+  --exeditor-selected-cell-background: var(--exeditor-basic-selected-cell-background, rgba(24, 144, 255, 0.15));
+  --exeditor-formula-vertical-align: var(--exeditor-basic-formula-vertical-align, middle);
+}
+.ExEditor-basic a:any-link {
+  color: var(--exeditor-link-color);
+  text-decoration: underline;
+}
+.ExEditor-basic h1 {
+  font-size: 2em;
+}
+.ExEditor-basic p {
+  line-height: 26px;
+  min-height: 1em;
+}
+.ExEditor-basic blockquote {
+  background: #00000008;
+  border-left: 6px solid #ccc;
+  margin: 1.5em 10px;
+  padding: 0.5em 10px;
+}
+.ExEditor-basic pre {
+  padding: 6px;
+  background: #efefef;
+  overflow: auto;
+}
+.ExEditor-basic p,
+.ExEditor-basic pre {
+  margin-top: 15px;
+  margin-bottom: 15px;
+}
+.ExEditor-basic hr {
+  border-width: 2px 0 0 0;
+  border-style: solid;
+  border-color: var(--exeditor-hr-color);
+  margin-top: 1.5em;
+  margin-bottom: 1.5em;
+}
+.ExEditor-basic img[data-formula] {
+  vertical-align: var(--exeditor-formula-vertical-align);
+}
+.ExEditor-basic video {
+  display: block;
+  margin: 1em auto;
+}
+.ExEditor-basic video[data-inline] {
+  display: inline-block;
+  margin: 0;
+}
+.ExEditor-basic video:not([data-inline]) {
+  width: auto;
+  height: auto;
+  max-width: 100%;
+}
+.ExEditor-basic audio {
+  display: block;
+  margin: 1em auto;
+}
+.ExEditor-basic audio[data-inline] {
+  display: inline-block;
+  margin: 0 2px;
+}
+.ExEditor-basic.ProseMirror-focused .excore-selected-node:not(.no-outline) {
+  outline: var(--exeditor-selected-outline);
+}
+.ExEditor-basic.ProseMirror-focused .excore-in-selection {
+  background: var(--exeditor-selected-background);
+  box-shadow: 0 0 0 2px var(--exeditor-selected-background);
+}
+.ExEditor-basic .tableWrapper {
+  margin: 20px 0;
+  padding: 0;
+  overflow-x: auto;
+}
+.ExEditor-basic table {
+  table-layout: fixed;
+  min-width: fit-content;
+  border-collapse: collapse;
+  margin: 0;
+  overflow: hidden;
+}
+.ExEditor-basic table th,
+.ExEditor-basic table td {
+  box-sizing: border-box;
+  position: relative;
+  min-width: 70px;
+  padding: 0px 5px;
+  border: 2px solid #dcdcdc;
+  vertical-align: top;
+  background-clip: padding-box;
+}
+.ExEditor-basic table th {
+  font-weight: bold;
+  background-color: #f3f3f3;
+}
+.ExEditor-basic table td {
+  background-color: white;
+}
+.ExEditor-basic table th > p,
+.ExEditor-basic table td > p {
+  min-height: 1em;
+}
+.ExEditor-basic table .selectedCell::after {
+  z-index: 2;
+  position: absolute;
+  content: '';
+  left: 0;
+  right: 0;
+  top: 0;
+  bottom: 0;
+  background: var(--exeditor-selected-cell-background);
+  pointer-events: none;
+}
+.ExEditor-basic.resize-cursor {
+  cursor: col-resize;
+}
+.ExEditor-basic.resize-cursor.vert {
+  cursor: nw-resize;
+  cursor: row-resize;
+}
+.ExEditor-basic table .column-resize-handle {
+  position: absolute;
+  right: -2px;
+  top: 0;
+  bottom: -2px;
+  width: 4px;
+  background-color: #adf;
+  pointer-events: none;
+}
+.ExEditor-basic table .row-resize-handle {
+  position: absolute;
+  bottom: -2px;
+  left: 0;
+  right: 0;
+  height: 4px;
+  z-index: 20;
+  background-color: #adf;
+  pointer-events: none;
+}
+
+.ExEditor-basic ol {
+  --ol-start: 1;
+  --ol-list-style-type: decimal;
+  list-style-type: none;
+  counter-reset: olCounter calc(var(--ol-start, 1) - 1);
+  position: relative;
+}
+.ExEditor-basic ol > li > :first-child::before {
+  content: counter(olCounter, var(--ol-list-style-type)) '. ';
+  counter-increment: olCounter;
+  font-variant-numeric: tabular-nums;
+  position: absolute;
+  transform: translate(-100%, 0);
+}
+
+.ExEditor-basic ul {
+  --ul-list-style-type: circle;
+  list-style-type: none;
+  position: relative;
+}
+.ExEditor-basic ul.nonUnicode-list-style-type > li > :first-child::before {
+  content: var(--ul-list-style-type) ' ';
+  font-variant-numeric: tabular-nums;
+  position: absolute;
+  transform: translate(-100%, 0.05em) scale(0.5);
+}
+.ExEditor-basic ul.unicode-list-style-type > li > :first-child::before {
+  content: var(--ul-list-style-type) ' ';
+  font-variant-numeric: tabular-nums;
+  position: absolute;
+  transform: translate(-100%, 0) scale(0.8);
+}
+
+.ExEditor-basic ul[data-type='todo'] {
+  padding-left: calc(2em + 10px);
+}
+.ExEditor-basic ul[data-type='todo'] > li > :first-child::before {
+  content: '';
+}
+.ExEditor-basic ul[data-type='todo'] > li > input[type='checkbox'] {
+  position: absolute;
+  left: 1em;
+  margin-top: 6px;
+  margin-right: 10px;
+}

package/dist/web/components/wd-form/index.js

@@ -20,6 +20,7 @@ import { WdForm as FormUi } from './wd-form';
 import EmptyContent from '../statusContent';
 import { deepClone } from '../../utils/tool';
 import isObjectEqual from '../../utils/isObjectEqual';
+import { convertMethodParam } from '../../utils/hooks/useFormLegacy';
 import '../style';
 import { getErrorObjectFromValidateResult } from './form-utils';
 import { isNil } from '../../utils/lodash';
@@ -392,7 +393,8 @@ const WdForm = React.forwardRef(function WdForm(props, ref) {
                 };
             },
             submitParams,
-            setValue(value, opts = { notMerge: false }) {
+            setValue(val, opts = { notMerge: false }) {
+                const value = convertMethodParam(val);
                 // notMerge 默认false，表示与之前的表单值合并
                 if (opts.notMerge) {
                     setValueDebounce(value);
@@ -520,18 +522,20 @@ const WdForm = React.forwardRef(function WdForm(props, ref) {
         }
     }, [formFieldsValue]);
     const setFieldValue = useCallback(({ namePath, value }) => {
-        const _formData = deepClone(formData);
-        const _value = lodashGet(_formData, namePath, NOT_EXISTED_VALUE);
-        if (isObjectEqual(_value, value)) {
-            return;
-        }
-        lodashSet(_formData, namePath, value);
-        if (typeof _formData !== 'object' || _formData === null) {
-            console.warn('setValue data need expect a object but got null', _formData);
-            return;
-        }
-        setFormData(_formData);
-    }, [formData]);
+        setFormData((formData) => {
+            const _formData = deepClone(formData);
+            const _value = lodashGet(_formData, namePath, NOT_EXISTED_VALUE);
+            if (isObjectEqual(_value, value)) {
+                return _formData;
+            }
+            lodashSet(_formData, namePath, value);
+            if (typeof _formData !== 'object' || _formData === null) {
+                console.warn('setValue data need expect a object but got null', _formData);
+                return formData;
+            }
+            return _formData;
+        });
+    }, []);
     if (initValueLoadingStatus === 'hidden') {
         return null;
     }

package/package.json

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