amis-core 3.4.0 → 3.4.1

package/lib/store/form.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.4.0
+ * amis-core v3.4.1
  * Copyright 2018-2023 fex
  */
 
@@ -59,7 +59,7 @@ var FormStore = service.ServiceStore.named('FormStore')
         var pool = self.children.concat();
         while (pool.length) {
             var current = pool.shift();
-            if (current.storeType === 'FormItemStore') {
+            if (current.storeType === 'FormItemStore' && !current.isControlled) {
                 formItems.push(current);
             }
             else if (!['ComboStore', 'TableStore', 'FormStore'].includes(current.storeType)) {
@@ -372,17 +372,19 @@ var FormStore = service.ServiceStore.named('FormStore')
                     if ((_q = ret === null || ret === void 0 ? void 0 : ret.dispatcher) === null || _q === void 0 ? void 0 : _q.prevented) {
                         return [2 /*return*/];
                     }
-                    if (e_1.type === 'ServerError') {
-                        result = e_1.response;
-                        mobxStateTree.getEnv(self).notify('error', e_1.message, result.msgTimeout !== undefined
-                            ? {
-                                closeButton: true,
-                                timeout: result.msgTimeout
-                            }
-                            : undefined);
-                    }
-                    else {
-                        mobxStateTree.getEnv(self).notify('error', e_1.message);
+                    if (!(api$1 === null || api$1 === void 0 ? void 0 : api$1.silent)) {
+                        if (e_1.type === 'ServerError') {
+                            result = e_1.response;
+                            mobxStateTree.getEnv(self).notify('error', e_1.message, result.msgTimeout !== undefined
+                                ? {
+                                    closeButton: true,
+                                    timeout: result.msgTimeout
+                                }
+                                : undefined);
+                        }
+                        else {
+                            mobxStateTree.getEnv(self).notify('error', e_1.message);
+                        }
                     }
                     throw e_1;
                 case 15: return [2 /*return*/];

package/lib/store/formItem.d.ts

@@ -9,6 +9,7 @@ export declare const FormItemStore: import("mobx-state-tree").IModelType<{
     childrenIds: import("mobx-state-tree").IOptionalIType<import("mobx-state-tree").IArrayType<import("mobx-state-tree").ISimpleType<string>>, [undefined]>;
 } & {
     isFocused: import("mobx-state-tree").IType<boolean | undefined, boolean, boolean>;
+    isControlled: import("mobx-state-tree").IType<boolean | undefined, boolean, boolean>;
     type: import("mobx-state-tree").IType<string | undefined, string, string>;
     label: import("mobx-state-tree").IType<string | undefined, string, string>;
     unique: import("mobx-state-tree").IType<boolean | undefined, boolean, boolean>;
@@ -52,6 +53,8 @@ export declare const FormItemStore: import("mobx-state-tree").IModelType<{
     resetValue: import("mobx-state-tree").IOptionalIType<import("mobx-state-tree").IType<any, any, any>, [undefined]>;
     validateOnChange: import("mobx-state-tree").IType<boolean | undefined, boolean, boolean>;
     inputGroupControl: import("mobx-state-tree").IOptionalIType<import("mobx-state-tree").IType<any, any, any>, [undefined]>;
+    colIndex: import("mobx-state-tree").IType<any, any, any>;
+    rowIndex: import("mobx-state-tree").IType<any, any, any>;
 }, {
     readonly parentStore: any;
     readonly __: any;
@@ -140,6 +143,7 @@ export declare const FormItemStore: import("mobx-state-tree").IModelType<{
     addSubFormItem: (item: IFormItemStore) => void;
     removeSubFormItem: (item: IFormItemStore) => void;
     loadAutoUpdateData: (api: Api, data?: object, silent?: boolean) => Promise<Payload>;
+    setIsControlled: (value: any) => void;
 }, import("mobx-state-tree")._NotCustomized, import("mobx-state-tree")._NotCustomized>;
 export type IFormItemStore = Instance<typeof FormItemStore>;
 export type SFormItemStore = SnapshotIn<typeof FormItemStore>;

package/lib/store/formItem.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.4.0
+ * amis-core v3.4.1
  * Copyright 2018-2023 fex
  */
 
@@ -52,6 +52,7 @@ var getSelectedOptionsCache = {
 var FormItemStore = node.StoreNode.named('FormItemStore')
     .props({
     isFocused: false,
+    isControlled: false,
     type: '',
     label: '',
     unique: false,
@@ -92,7 +93,9 @@ var FormItemStore = node.StoreNode.named('FormItemStore')
     resetValue: mobxStateTree.types.optional(mobxStateTree.types.frozen(), ''),
     validateOnChange: false,
     /** 当前表单项所属的InputGroup父元素, 用于收集InputGroup的子元素 */
-    inputGroupControl: mobxStateTree.types.optional(mobxStateTree.types.frozen(), {})
+    inputGroupControl: mobxStateTree.types.optional(mobxStateTree.types.frozen(), {}),
+    colIndex: mobxStateTree.types.frozen(),
+    rowIndex: mobxStateTree.types.frozen()
 })
     .views(function (self) {
     function getForm() {
@@ -255,22 +258,27 @@ var FormItemStore = node.StoreNode.named('FormItemStore')
         object.isObject(inputGroupControl) &&
             (inputGroupControl === null || inputGroupControl === void 0 ? void 0 : inputGroupControl.name) != null &&
             (self.inputGroupControl = inputGroupControl);
-        rules = tslib.__assign(tslib.__assign({}, rules), { isRequired: self.required || (rules === null || rules === void 0 ? void 0 : rules.isRequired) });
-        // todo 这个弄个配置由渲染器自己来决定
-        // 暂时先这样
-        if (~['input-text', 'textarea'].indexOf(self.type)) {
-            if (typeof minLength === 'number') {
-                rules.minLength = minLength;
+        if (typeof rules !== 'undefined' ||
+            typeof required !== 'undefined' ||
+            typeof minLength === 'number' ||
+            typeof maxLength === 'number') {
+            rules = tslib.__assign(tslib.__assign({}, (rules !== null && rules !== void 0 ? rules : self.rules)), { isRequired: self.required || (rules === null || rules === void 0 ? void 0 : rules.isRequired) });
+            // todo 这个弄个配置由渲染器自己来决定
+            // 暂时先这样
+            if (~['input-text', 'textarea'].indexOf(self.type)) {
+                if (typeof minLength === 'number') {
+                    rules.minLength = minLength;
+                }
+                if (typeof maxLength === 'number') {
+                    rules.maxLength = maxLength;
+                }
             }
-            if (typeof maxLength === 'number') {
-                rules.maxLength = maxLength;
+            if (helper.isObjectShallowModified(rules, self.rules)) {
+                self.rules = rules;
+                clearError('builtin');
+                self.validated = false;
             }
         }
-        if (helper.isObjectShallowModified(rules, self.rules)) {
-            self.rules = rules;
-            clearError('builtin');
-            self.validated = false;
-        }
     }
     function focus() {
         self.isFocused = true;
@@ -451,12 +459,13 @@ var FormItemStore = node.StoreNode.named('FormItemStore')
                         if (!msg) {
                             msg = "status: ".concat(json.status);
                         }
-                        mobxStateTree.getEnv(self).notify('error', (_e = (_d = apiObject.messages) === null || _d === void 0 ? void 0 : _d.failed) !== null && _e !== void 0 ? _e : (self.errors.join('') || "".concat(apiObject.url, ": ").concat(msg)), json.msgTimeout !== undefined
-                            ? {
-                                closeButton: true,
-                                timeout: json.msgTimeout
-                            }
-                            : undefined);
+                        !(api$1 === null || api$1 === void 0 ? void 0 : api$1.silent) &&
+                            mobxStateTree.getEnv(self).notify('error', (_e = (_d = apiObject.messages) === null || _d === void 0 ? void 0 : _d.failed) !== null && _e !== void 0 ? _e : (self.errors.join('') || "".concat(apiObject.url, ": ").concat(msg)), json.msgTimeout !== undefined
+                                ? {
+                                    closeButton: true,
+                                    timeout: json.msgTimeout
+                                }
+                                : undefined);
                     }
                     else {
                         result = json;
@@ -474,7 +483,7 @@ var FormItemStore = node.StoreNode.named('FormItemStore')
                         return [2 /*return*/];
                     }
                     console.error(e_2);
-                    env.notify('error', e_2.message);
+                    !(api$1 === null || api$1 === void 0 ? void 0 : api$1.silent) && env.notify('error', e_2.message);
                     return [2 /*return*/];
                 case 3: return [2 /*return*/];
             }
@@ -554,6 +563,7 @@ var FormItemStore = node.StoreNode.named('FormItemStore')
                         return [2 /*return*/, json.data];
                     }
                     !silent &&
+                        !(api === null || api === void 0 ? void 0 : api.silent) &&
                         mobxStateTree.getEnv(self).notify('info', self.__('FormItem.autoFillLoadFailed'));
                     return [2 /*return*/];
             }
@@ -748,8 +758,10 @@ var FormItemStore = node.StoreNode.named('FormItemStore')
     function syncOptions(originOptions, data) {
         var _a;
         if (!self.options.length && typeof self.value === 'undefined') {
-            self.selectedOptions = [];
-            self.filteredOptions = [];
+            helper.isArrayChildrenModified(self.filteredOptions, []) &&
+                (self.filteredOptions = []);
+            helper.isArrayChildrenModified(self.selectedOptions, []) &&
+                (self.selectedOptions = []);
             return;
         }
         var value = self.tmpValue;
@@ -925,6 +937,9 @@ var FormItemStore = node.StoreNode.named('FormItemStore')
             self.itemsRef.splice(idx, 1);
         }
     }
+    function setIsControlled(value) {
+        self.isControlled = !!value;
+    }
     return {
         focus: focus,
         blur: blur,
@@ -950,7 +965,8 @@ var FormItemStore = node.StoreNode.named('FormItemStore')
         changeEmitedValue: changeEmitedValue,
         addSubFormItem: addSubFormItem,
         removeSubFormItem: removeSubFormItem,
-        loadAutoUpdateData: loadAutoUpdateData
+        loadAutoUpdateData: loadAutoUpdateData,
+        setIsControlled: setIsControlled
     };
 });
 

package/lib/store/iRenderer.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.4.0
+ * amis-core v3.4.1
  * Copyright 2018-2023 fex
  */
 
@@ -45,6 +45,8 @@ require('react-overlays/useRootClose');
 require('react-dom');
 require('lodash/mapValues');
 require('lodash/camelCase');
+require('lodash/map');
+require('lodash/isEmpty');
 require('uncontrollable');
 require('hoist-non-react-statics');
 require('../utils/validations.js');

package/lib/store/index.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.4.0
+ * amis-core v3.4.1
  * Copyright 2018-2023 fex
  */
 

package/lib/store/list.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.4.0
+ * amis-core v3.4.1
  * Copyright 2018-2023 fex
  */
 

package/lib/store/manager.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.4.0
+ * amis-core v3.4.1
  * Copyright 2018-2023 fex
  */
 

package/lib/store/modal.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.4.0
+ * amis-core v3.4.1
  * Copyright 2018-2023 fex
  */
 

package/lib/store/node.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.4.0
+ * amis-core v3.4.1
  * Copyright 2018-2023 fex
  */
 

package/lib/store/pagination.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.4.0
+ * amis-core v3.4.1
  * Copyright 2018-2023 fex
  */
 

package/lib/store/root.d.ts

@@ -78,7 +78,7 @@ export declare const RootStore: import("mobx-state-tree").IModelType<{
 } & {
     readonly downStream: any;
 } & {
-    setContext(context: any): void;
+    updateContext(context: any): void;
     setRuntimeError(error: any, errorStack: any): void;
     updateLocation(location?: any, parseFn?: Function): void;
 }, import("mobx-state-tree")._NotCustomized, import("mobx-state-tree")._NotCustomized>;

package/lib/store/root.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.4.0
+ * amis-core v3.4.1
  * Copyright 2018-2023 fex
  */
 
@@ -43,6 +43,8 @@ require('react-dom');
 require('../utils/SimpleMap.js');
 require('lodash/mapValues');
 require('lodash/camelCase');
+require('lodash/map');
+require('lodash/isEmpty');
 require('uncontrollable');
 require('hoist-non-react-statics');
 require('../utils/validations.js');
@@ -75,15 +77,20 @@ var RootStore = service.ServiceStore.named('RootStore')
     }
 }); })
     .actions(function (self) { return ({
-    setContext: function (context) {
-        self.context = context;
+    updateContext: function (context) {
+        // 因为 context 不是受控属性，直接共用引用好了
+        // 否则还会触发孩子节点的重新渲染
+        Object.assign(self.context, context);
     },
     setRuntimeError: function (error, errorStack) {
         self.runtimeError = error;
         self.runtimeErrorStack = errorStack;
     },
     updateLocation: function (location, parseFn) {
-        self.query = parseFn ? parseFn(location) : helper.parseQuery(location);
+        var query = parseFn ? parseFn(location) : helper.parseQuery(location);
+        if (helper.isObjectShallowModified(query, self.query, false)) {
+            self.query = query;
+        }
     }
 }); });
 

package/lib/store/service.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.4.0
+ * amis-core v3.4.1
  * Copyright 2018-2023 fex
  */
 
@@ -84,12 +84,13 @@ var ServiceStore = iRenderer.iRendererStore
                     fetchCancel = null;
                     if (!!json.ok) return [3 /*break*/, 2];
                     updateMessage((_c = (_b = (_a = api$1 === null || api$1 === void 0 ? void 0 : api$1.messages) === null || _a === void 0 ? void 0 : _a.failed) !== null && _b !== void 0 ? _b : json.msg) !== null && _c !== void 0 ? _c : (options && options.errorMessage), true);
-                    mobxStateTree.getEnv(self).notify('error', self.msg, json.msgTimeout !== undefined
-                        ? {
-                            closeButton: true,
-                            timeout: json.msgTimeout
-                        }
-                        : undefined);
+                    !api$1.silent &&
+                        mobxStateTree.getEnv(self).notify('error', self.msg, json.msgTimeout !== undefined
+                            ? {
+                                closeButton: true,
+                                timeout: json.msgTimeout
+                            }
+                            : undefined);
                     return [3 /*break*/, 5];
                 case 2:
                     self.updatedAt = Date.now();
@@ -129,7 +130,7 @@ var ServiceStore = iRenderer.iRendererStore
                     if (e_1 && e_1.message === 'Network Error') {
                         message = self.__('networkError');
                     }
-                    env.notify('error', message);
+                    !api$1.silent && env.notify('error', message);
                     return [2 /*return*/];
                 case 7: return [2 /*return*/];
             }
@@ -166,12 +167,13 @@ var ServiceStore = iRenderer.iRendererStore
                     }
                     if (!!json.ok) return [3 /*break*/, 2];
                     updateMessage((_c = (_b = (_a = api$1 === null || api$1 === void 0 ? void 0 : api$1.messages) === null || _a === void 0 ? void 0 : _a.failed) !== null && _b !== void 0 ? _b : json.msg) !== null && _c !== void 0 ? _c : (options && options.errorMessage), true);
-                    mobxStateTree.getEnv(self).notify('error', self.msg, json.msgTimeout !== undefined
-                        ? {
-                            closeButton: true,
-                            timeout: json.msgTimeout
-                        }
-                        : undefined);
+                    !api$1.silent &&
+                        mobxStateTree.getEnv(self).notify('error', self.msg, json.msgTimeout !== undefined
+                            ? {
+                                closeButton: true,
+                                timeout: json.msgTimeout
+                            }
+                            : undefined);
                     return [3 /*break*/, 5];
                 case 2:
                     if (!(options && options.onSuccess)) return [3 /*break*/, 4];
@@ -206,7 +208,7 @@ var ServiceStore = iRenderer.iRendererStore
                     if (e_2 && e_2.message === 'Network Error') {
                         message = self.__('networkError');
                     }
-                    env.notify('error', message);
+                    !api$1.silent && env.notify('error', message);
                     return [2 /*return*/];
                 case 7: return [2 /*return*/];
             }
@@ -272,17 +274,19 @@ var ServiceStore = iRenderer.iRendererStore
                         return [2 /*return*/];
                     }
                     console.error(e_3);
-                    if (e_3.type === 'ServerError') {
-                        result = e_3.response;
-                        mobxStateTree.getEnv(self).notify('error', e_3.message, result.msgTimeout !== undefined
-                            ? {
-                                closeButton: true,
-                                timeout: result.msgTimeout
-                            }
-                            : undefined);
-                    }
-                    else {
-                        mobxStateTree.getEnv(self).notify('error', e_3.message);
+                    if (!api$1.silent) {
+                        if (e_3.type === 'ServerError') {
+                            result = e_3.response;
+                            mobxStateTree.getEnv(self).notify('error', e_3.message, result.msgTimeout !== undefined
+                                ? {
+                                    closeButton: true,
+                                    timeout: result.msgTimeout
+                                }
+                                : undefined);
+                        }
+                        else {
+                            mobxStateTree.getEnv(self).notify('error', e_3.message);
+                        }
                     }
                     throw e_3;
                 case 9: return [2 /*return*/];
@@ -321,12 +325,13 @@ var ServiceStore = iRenderer.iRendererStore
                     fetchSchemaCancel = null;
                     if (!json.ok) {
                         updateMessage((_d = (_c = (_b = (_a = api$1 === null || api$1 === void 0 ? void 0 : api$1.messages) === null || _a === void 0 ? void 0 : _a.failed) !== null && _b !== void 0 ? _b : json.msg) !== null && _c !== void 0 ? _c : (options && options.errorMessage)) !== null && _d !== void 0 ? _d : self.__('fetchFailed'), true);
-                        mobxStateTree.getEnv(self).notify('error', self.msg, json.msgTimeout !== undefined
-                            ? {
-                                closeButton: true,
-                                timeout: json.msgTimeout
-                            }
-                            : undefined);
+                        !(api$1 === null || api$1 === void 0 ? void 0 : api$1.silent) &&
+                            mobxStateTree.getEnv(self).notify('error', self.msg, json.msgTimeout !== undefined
+                                ? {
+                                    closeButton: true,
+                                    timeout: json.msgTimeout
+                                }
+                                : undefined);
                     }
                     else {
                         if (json.data) {
@@ -367,7 +372,7 @@ var ServiceStore = iRenderer.iRendererStore
                     if (e_4 && e_4.message === 'Network Error') {
                         message = self.__('networkError');
                     }
-                    env.notify('error', message);
+                    !(api$1 === null || api$1 === void 0 ? void 0 : api$1.silent) && env.notify('error', message);
                     return [3 /*break*/, 3];
                 case 3: return [2 /*return*/];
             }

package/lib/store/status.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.4.0
+ * amis-core v3.4.1
  * Copyright 2018-2023 fex
  */