@xatlas/rainbow-core 2.3.6 → 2.3.8

package/dist/core.common.js

@@ -3470,6 +3470,7 @@ function list_toPrimitive(t, r) { if ("object" != list_typeof(t) || !t) return t
     }
     if (!this.parentIds && this.mode === 'page') {
       if (external_root_qs_commonjs2_qs_commonjs_qs_amd_qs_default.a.stringify(this.query) !== external_root_qs_commonjs2_qs_commonjs_qs_amd_qs_default.a.stringify(this.$route.query)) {
+        this.query = list_objectSpread(list_objectSpread({}, this.query), this.$route.query);
         this.$router.push({
           query: this.query
         });
@@ -5983,10 +5984,24 @@ function form_base_toPrimitive(t, r) { if ("object" != form_base_typeof(t) || !t
     };
   },
   created: function created() {
+    var _this = this;
     // this.actionModel = { ...this.defaultValues, ...this.actionModel }
     if (this.defaultValues) {
+      var _loop = function _loop(key) {
+        var attr = _this.columns.find(function (c) {
+          return c.name === key;
+        }) || undefined;
+        var required = (attr === null || attr === void 0 ? void 0 : attr.required) || false;
+        if (attr !== null && attr !== void 0 && attr.configs.length) {
+          var configs = Object.fromEntries(attr.configs.map(function (c) {
+            return [c.key, c.value];
+          }));
+          required = configs && configs.required ? configs.required === '1' : attr === null || attr === void 0 ? void 0 : attr.required;
+        }
+        if (_this.actionModel[key] === undefined || _this.actionModel[key] === '' && required) _this.$set(_this.actionModel, key, _this.defaultValues[key]);
+      };
       for (var key in this.defaultValues) {
-        this.actionModel[key] === undefined && this.$set(this.actionModel, key, this.defaultValues[key]);
+        _loop(key);
       }
     }
   },
@@ -6056,26 +6071,26 @@ function form_base_toPrimitive(t, r) { if ("object" != form_base_typeof(t) || !t
       // this.$emit('change', this.actionModel)
     },
     handleItemFill: function handleItemFill(fills) {
-      var _this = this;
+      var _this2 = this;
       fills.forEach(function (item) {
-        return _this.setModel(item.name, item.value);
+        return _this2.setModel(item.name, item.value);
       });
       // this.$emit('change', this.actionModel)
     },
     handleSubmit: function handleSubmit() {
-      var _this2 = this;
+      var _this3 = this;
       return form_base_asyncToGenerator( /*#__PURE__*/form_base_regeneratorRuntime().mark(function _callee() {
         return form_base_regeneratorRuntime().wrap(function _callee$(_context) {
           while (1) switch (_context.prev = _context.next) {
             case 0:
-              if (!_this2.$refs.form) {
+              if (!_this3.$refs.form) {
                 _context.next = 3;
                 break;
               }
               _context.next = 3;
-              return _this2.$refs.form.validate();
+              return _this3.$refs.form.validate();
             case 3:
-              _this2.handleCommit();
+              _this3.handleCommit();
             case 4:
             case "end":
               return _context.stop();
@@ -6084,25 +6099,25 @@ function form_base_toPrimitive(t, r) { if ("object" != form_base_typeof(t) || !t
       }))();
     },
     handleCommit: function handleCommit() {
-      var _this3 = this;
+      var _this4 = this;
       return form_base_asyncToGenerator( /*#__PURE__*/form_base_regeneratorRuntime().mark(function _callee2() {
-        var data, _this3$params, _this3$params2, valuesName, columns;
+        var data, _this4$params, _this4$params2, valuesName, columns;
         return form_base_regeneratorRuntime().wrap(function _callee2$(_context2) {
           while (1) switch (_context2.prev = _context2.next) {
             case 0:
-              if (Array.isArray(_this3.actionModel)) {
-                data = _this3.actionModel;
+              if (Array.isArray(_this4.actionModel)) {
+                data = _this4.actionModel;
               } else {
-                _this3$params = _this3.params, _this3$params2 = _this3$params === void 0 ? {} : _this3$params, valuesName = _this3$params2.valuesName;
-                columns = valuesName ? [].concat(base_toConsumableArray(_this3.columns), [{
+                _this4$params = _this4.params, _this4$params2 = _this4$params === void 0 ? {} : _this4$params, valuesName = _this4$params2.valuesName;
+                columns = valuesName ? [].concat(base_toConsumableArray(_this4.columns), [{
                   name: valuesName
-                }]) : _this3.columns;
+                }]) : _this4.columns;
                 data = Object.fromEntries(columns.map(function (c) {
-                  var value = _this3.actionModel[c.name] === undefined ? null : _this3.actionModel[c.name];
+                  var value = _this4.actionModel[c.name] === undefined ? null : _this4.actionModel[c.name];
                   return [c.name, value];
                 }));
               }
-              _this3.$emit('commit', data);
+              _this4.$emit('commit', data);
             case 2:
             case "end":
               return _context2.stop();