@cloudbase/weda-ui-mp 3.15.7 → 3.15.8

package/components/form-field-behavior/form-field-behavior.js

@@ -3,11 +3,7 @@ import equal from '../../utils/deepEqual';
 import { errorHandler } from '../../utils/error';
 
 import { autorun, untracked } from 'mobx';
-import {
-  convertStatus,
-  convertRules,
-  convertMethodParam,
-} from '../../utils/getFormLegacy';
+import { convertStatus, convertRules, convertMethodParam } from '../../utils/getFormLegacy';
 
 export default Behavior({
   behaviors: [],
@@ -101,14 +97,7 @@ export default Behavior({
         },
         async handleValidate(throwError = true) {
           let finalValue = that.data.value;
-          const {
-            required,
-            rules,
-            requiredMsg,
-            privateRules,
-            selfDefineRules,
-            label,
-          } = that.data;
+          const { required, rules, requiredMsg, privateRules, selfDefineRules, label } = that.data;
           const _rules = [].concat(rules, privateRules, selfDefineRules);
           if (!required && !_rules.length) return;
           if (finalValue) {
@@ -124,9 +113,7 @@ export default Behavior({
           const validPromise = [];
           if (required) {
             if (!validType.required(finalValue)) {
-              validPromise.push(
-                Promise.resolve({ format: 'required', message: requiredMsg })
-              );
+              validPromise.push(Promise.resolve({ format: 'required', message: requiredMsg }));
             }
           }
 
@@ -153,10 +140,7 @@ export default Behavior({
                     let reg;
                     if (typeof item.pattern === 'string') {
                       const m = item.pattern.match(/(\/?)(.+)\1([a-z]*)/i);
-                      if (
-                        m[3] &&
-                        !/^(?!.*?(.).*?\1)[gmixXsuUAJ]+$/.test(m[3])
-                      ) {
+                      if (m[3] && !/^(?!.*?(.).*?\1)[gmixXsuUAJ]+$/.test(m[3])) {
                         reg = RegExp(item.pattern);
                       } else {
                         reg = new RegExp(m[2], m[3]);
@@ -225,15 +209,10 @@ export default Behavior({
       Promise.resolve().then(() => {
         this._reaction = autorun(() => {
           const form = untracked(() => {
-            return this.$widget?.closest(
-              (w) => w.getConfig?.()?.componentType === 'form'
-            );
+            return this.$widget?.closest((w) => w.getConfig?.()?.componentType === 'form');
           });
 
-          if (
-            form &&
-            (this.data.layout === 'auto' || this.data.layout === '')
-          ) {
+          if (form && (this.data.layout === 'auto' || this.data.layout === '')) {
             if (form.layout !== this.data.actualLayout) {
               // 在 form 里面
               this.setData({ actualLayout: form.layout });
@@ -271,9 +250,7 @@ export default Behavior({
       // 清空嵌套表单
       this._removeFormObjItem?.();
       if (this.$widget) {
-        const form = this.$widget.closest(
-          (w) => w.getConfig?.()?.componentType === 'form'
-        );
+        const form = this.$widget.closest((w) => w.getConfig?.()?.componentType === 'form');
 
         form?.updateFormContext(this.data.name, undefined);
       }
@@ -315,10 +292,7 @@ export default Behavior({
       };
     },
     setReadOnly(val) {
-      const [originalReadOnly, originalDisabled] = [
-        this.data.readOnly,
-        this.data.disabled,
-      ];
+      const [originalReadOnly, originalDisabled] = [this.data.readOnly, this.data.disabled];
       const value = convertMethodParam(val);
       if (value !== originalReadOnly) {
         // 先用disabled属性来做
@@ -345,29 +319,20 @@ export default Behavior({
         // this.$instanceRef.current.name = newName;
         this.data._oldName = newName;
         if (typeof this.$widget !== 'object') return;
-        const form = this.$widget?.closest?.(
-          (w) => w.getConfig?.()?.componentType === 'form'
-        );
+        const form = this.$widget?.closest?.((w) => w.getConfig?.()?.componentType === 'form');
 
-        if (form) {
+        const formObj = this.$widget?.closest?.((w) => w.getConfig?.()?.componentType === 'formObj');
+
+        if (formObj) {
+          // 添加子组件到嵌套表单里面
+          this._removeFormObjItem = formObj.addFormItem(this.data.name, this.$widget);
+        } else if (form) {
           // 在 form 里面
           this._removeFormItem = form.addFormItem(this.data.name, this.$widget);
           if (!Object.prototype.hasOwnProperty.call(form?.value, newName)) {
             form?.updateFormContext(this.data.name, this.data.value);
           }
         }
-
-        const formObj = this.$widget?.closest?.(
-          (w) => w.getConfig?.()?.componentType === 'formObj'
-        );
-
-        if (formObj) {
-          // 添加子组件到嵌套表单里面
-          this._removeFormObjItem = formObj.addFormItem(
-            this.data.name,
-            this.$widget
-          );
-        }
       });
     },
     value: function (value) {
@@ -382,18 +347,12 @@ export default Behavior({
         this.$instanceRef.current.value = value;
 
         if (this.$widget) {
-          const form = this.$widget.closest(
-            (w) => w.getConfig?.()?.componentType === 'form'
-          );
-          const formObj = this.$widget.closest(
-            (w) => w.getConfig?.()?.componentType === 'formObj'
-          );
+          const form = this.$widget.closest((w) => w.getConfig?.()?.componentType === 'form');
+          const formObj = this.$widget.closest((w) => w.getConfig?.()?.componentType === 'formObj');
           // 有父级嵌套表单的不更新form值，父级嵌套表单会去更新
           !formObj && form?.updateFormContext(this.data.name, value);
           formObj?.valueChangeFromChild?.({
-            name: `${formObj?.formObjName ? `${formObj.formObjName}.` : ''}${
-              this.data.name
-            }`,
+            name: `${formObj?.formObjName ? `${formObj.formObjName}.` : ''}${this.data.name}`,
             value,
           });
         }
@@ -407,9 +366,7 @@ export default Behavior({
       Promise.resolve().then(() => {
         this.data._layout = layout;
         if (!layout || layout === 'auto') {
-          const form = this.$widget.closest(
-            (w) => w.getConfig?.()?.componentType === 'form'
-          );
+          const form = this.$widget.closest((w) => w.getConfig?.()?.componentType === 'form');
 
           if (form) {
             // 在 form 里面
@@ -432,9 +389,7 @@ export default Behavior({
       this.data._status = status;
       const { disabled: _disabled, readOnly: _readOnly } = this.data;
       const statusParams = convertStatus(status, _disabled, _readOnly);
-      const form = this?.$widget?.closest(
-        (w) => w.getConfig?.()?.componentType === 'form'
-      );
+      const form = this?.$widget?.closest((w) => w.getConfig?.()?.componentType === 'form');
       let disabled = statusParams.disabled;
       let readOnly = statusParams.readOnly;
       if (form) {
@@ -443,13 +398,7 @@ export default Behavior({
       }
       this.setData({ disabled, readOnly });
     },
-    'required,before,after,requiredMsg,isUnionValue': function (
-      required,
-      before,
-      after,
-      requiredMsg,
-      isUnionValue
-    ) {
+    'required,before,after,requiredMsg,isUnionValue': function (required, before, after, requiredMsg, isUnionValue) {
       const newPrivateRules = {
         required,
         before,
@@ -459,13 +408,7 @@ export default Behavior({
       };
       if (equal(newPrivateRules, this.data._privateRules)) return;
       this.data._privateRules = newPrivateRules;
-      let privateRules = convertRules(
-        required,
-        before,
-        after,
-        requiredMsg,
-        isUnionValue
-      );
+      let privateRules = convertRules(required, before, after, requiredMsg, isUnionValue);
       this.setData({ privateRules });
     },
   },

package/components/qrcode/index.wxss

@@ -2,7 +2,7 @@
   width: 200px;
   height: 200px;
   position: fixed;
-  left: 100%;
+  left: 200%;
 }
 .wd-qrcode--image {
   width: 200px;

package/package.json

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