raise-common-lib 0.0.194 → 0.0.196

package/fesm5/raise-common-lib.js

@@ -22282,19 +22282,21 @@ var DrawerFormComponent = /** @class */ (function () {
      * @return {?}
      */
     function (changes) {
+        if (changes._sections) {
+            this.sections = filterShowSection(changes._sections.currentValue);
+            this.form = this.getFormProxy(this.formatForm(this.sections, __assign({}, this.form)));
+            this.syncFormField();
+        }
         if (changes._form) {
             if (!changes._form.currentValue[FORM_PROXY_TAG]) {
-                this.form = this.getFormProxy(changes._form.currentValue);
+                this.form = this.getFormProxy(this.formatForm(this.sections, changes._form.currentValue));
+                this.syncFormField();
                 this.formChange.emit(this.form);
             }
             if (!changes._form.firstChange) {
                 this.checkFormChange(changes._form.previousValue, changes._form.currentValue);
             }
         }
-        if (changes._sections) {
-            this.sections = filterShowSection(changes._sections.currentValue);
-            this.formatForm(this.sections);
-        }
     };
     /**
      * @return {?}
@@ -22399,6 +22401,29 @@ var DrawerFormComponent = /** @class */ (function () {
             }));
         }
     };
+    /**
+     * @param {?} value
+     * @param {?} compareValue
+     * @return {?}
+     */
+    DrawerFormComponent.prototype.equal = /**
+     * @param {?} value
+     * @param {?} compareValue
+     * @return {?}
+     */
+    function (value, compareValue) {
+        // 只对数组进行特殊判断
+        if (Array.isArray(value) && Array.isArray(compareValue)) {
+            return (value.length === compareValue.length &&
+                value.every((/**
+                 * @param {?} i
+                 * @param {?} index
+                 * @return {?}
+                 */
+                function (i, index) { return i === compareValue[index]; })));
+        }
+        return Object.is(value, compareValue);
+    };
     /**
      * @param {?} previous
      * @param {?} current
@@ -22417,7 +22442,7 @@ var DrawerFormComponent = /** @class */ (function () {
          */
         function (_a) {
             var _b = __read(_a, 2), key = _b[0], currentValue = _b[1];
-            if (previous[key] !== currentValue) {
+            if (!_this.equal(previous[key], currentValue)) {
                 /** @type {?} */
                 var field = _this.getField(key);
                 if (field) {
@@ -22442,17 +22467,47 @@ var DrawerFormComponent = /** @class */ (function () {
             var date = moment(value);
             this.dateForm[field.formKey] = date.isValid() ? date.toDate() : null;
         }
+        else {
+            this.dateForm[field.formKey] = null;
+        }
+    };
+    /**
+     * @return {?}
+     */
+    DrawerFormComponent.prototype.syncFormField = /**
+     * @return {?}
+     */
+    function () {
+        var _this = this;
+        this.sections.forEach((/**
+         * @param {?} section
+         * @return {?}
+         */
+        function (section) {
+            section.fields.forEach((/**
+             * @param {?} field
+             * @return {?}
+             */
+            function (field) {
+                switch (field.fieldFormType) {
+                    case "Datepicker":
+                        _this.syncFormToDateForm(field, _this.form[field.formKey]);
+                        break;
+                }
+            }));
+        }));
     };
     /**
      * @param {?} sections
+     * @param {?} form
      * @return {?}
      */
     DrawerFormComponent.prototype.formatForm = /**
      * @param {?} sections
+     * @param {?} form
      * @return {?}
      */
-    function (sections) {
-        var _this = this;
+    function (sections, form) {
         sections.forEach((/**
          * @param {?} section
          * @return {?}
@@ -22463,30 +22518,32 @@ var DrawerFormComponent = /** @class */ (function () {
              * @return {?}
              */
             function (field) {
-                if (_this.form[field.formKey] === undefined) {
-                    switch (field.fieldFormType) {
-                        case "Text":
-                        case "Email":
-                        case "Textarea":
-                            _this.form[field.formKey] = "";
-                            break;
-                        case "Tags":
-                        case "Checkbox":
-                        case "MultiSelect":
-                            _this.form[field.formKey] = [];
-                            break;
-                        case "Switch":
-                            _this.form[field.formKey] = false;
-                            break;
-                        case "Datepicker":
-                            _this.syncFormToDateForm(field, _this.form[field.formKey]);
-                            break;
-                        default:
-                            _this.form[field.formKey] = null;
-                    }
+                switch (field.fieldFormType) {
+                    case "Text":
+                    case "Email":
+                    case "Textarea":
+                        if (form[field.formKey] === undefined) {
+                            form[field.formKey] = "";
+                        }
+                        break;
+                    case "Tags":
+                    case "Checkbox":
+                    case "MultiSelect":
+                        if (!Array.isArray(form[field.formKey])) {
+                            form[field.formKey] = [];
+                        }
+                        break;
+                    case "Switch":
+                        form[field.formKey] = !!form[field.formKey];
+                        break;
+                    default:
+                        if (form[field.formKey] === undefined) {
+                            form[field.formKey] = null;
+                        }
                 }
             }));
         }));
+        return form;
     };
     /**
      * @param {?} form
@@ -22498,7 +22555,7 @@ var DrawerFormComponent = /** @class */ (function () {
      */
     function (form) {
         var _this = this;
-        // 现在除了 tag 之外不支持嵌套 form 属性，只对浅层进行处理
+        // 现在不支持嵌套 form 属性，只对浅层进行处理
         /** @type {?} */
         var proxyForm = new Proxy(form, {
             set: (/**
@@ -22511,8 +22568,11 @@ var DrawerFormComponent = /** @class */ (function () {
                 target[prop] = value;
                 /** @type {?} */
                 var field = _this.getField(prop);
-                if (field && field.fieldFormType === "Datepicker") {
-                    _this.syncFormToDateForm(field, value);
+                if (field) {
+                    if (field.fieldFormType === "Datepicker") {
+                        _this.syncFormToDateForm(field, value);
+                    }
+                    _this.formItemValidator(field);
                 }
                 return true;
             }),