amis-core 3.4.2 → 3.5.0

package/esm/store/formItem.d.ts

@@ -77,6 +77,7 @@ export declare const FormItemStore: import("mobx-state-tree").IModelType<{
     readonly lastSelectValue: string;
     getSelectedOptions: (value?: any, nodeValueArray?: any[] | undefined) => any;
     splitExtraValue(value: any): any[];
+    getMergedData(data: any): any;
 } & {
     focus: () => void;
     blur: () => void;

package/esm/store/formItem.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.4.2
+ * amis-core v3.5.0
  * Copyright 2018-2023 fex
  */
 
@@ -12,7 +12,7 @@ import { ComboStore } from './combo.js';
 import { evalExpression } from '../utils/tpl.js';
 import { isEffectiveApi, buildApi } from '../utils/api.js';
 import findIndex from 'lodash/findIndex';
-import { findTree, spliceTree, flattenTree, findTreeIndex, isObjectShallowModified, filterTree, isArrayChildrenModified, eachTree } from '../utils/helper.js';
+import { findTree, spliceTree, flattenTree, findTreeIndex, isObjectShallowModified, filterTree, isArrayChildrenModified, eachTree, mapTree } from '../utils/helper.js';
 import find from 'lodash/find';
 import isEqual from 'lodash/isEqual';
 import isPlainObject from 'lodash/isPlainObject';
@@ -22,7 +22,7 @@ import { getStoreById } from './manager.js';
 import { normalizeOptions } from '../utils/normalizeOptions.js';
 import { getOptionValueBindField, getOptionValue, optionValueCompare } from '../utils/optionValueCompare.js';
 import { dataMapping } from '../utils/dataMapping.js';
-import { createObject, isObject } from '../utils/object.js';
+import { cloneObject, setVariable, createObject, isObject } from '../utils/object.js';
 
 var ErrorDetail = types.model('ErrorDetail', {
     msg: '',
@@ -206,6 +206,13 @@ var FormItemStore = StoreNode.named('FormItemStore')
                     ? value.split(delimiter || ',').map(function (v) { return v.trim(); })
                     : [];
             return values;
+        },
+        getMergedData: function (data) {
+            var result = cloneObject(data);
+            setVariable(result, self.name, self.tmpValue);
+            setVariable(result, '__value', self.tmpValue);
+            setVariable(result, '__name', self.name);
+            return result;
         }
     };
 })
@@ -855,8 +862,13 @@ var FormItemStore = StoreNode.named('FormItemStore')
                         options_2.push.apply(options_2, __spreadArray([], __read(item.selectedOptions.map(function (item) { return item && item.value; })), false));
                     }
                 });
-            if (filteredOptions.length) {
-                filteredOptions = filteredOptions.filter(function (option) { return !~options_2.indexOf(option.value); });
+            if (filteredOptions.length && options_2.length) {
+                filteredOptions = mapTree(filteredOptions, function (item) {
+                    if (~options_2.indexOf(item.value)) {
+                        return __assign(__assign({}, item), { disabled: true });
+                    }
+                    return item;
+                });
             }
         }
         isArrayChildrenModified(self.selectedOptions, selectedOptions) &&
@@ -879,7 +891,7 @@ var FormItemStore = StoreNode.named('FormItemStore')
         self.validated = false;
         if (subStore && subStore.storeType === 'ComboStore') {
             var combo = subStore;
-            combo.forms.forEach(function (form) { return form.reset(); });
+            combo.forms.forEach(function (form) { return form.reset(undefined, false); }); // 仅重置校验状态，不要重置数据
         }
         !keepErrors && clearError();
     }

package/esm/store/iRenderer.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.4.2
+ * amis-core v3.5.0
  * Copyright 2018-2023 fex
  */
 
@@ -25,7 +25,6 @@ import 'react-dom';
 import '../utils/errors.js';
 import '../utils/tpl.js';
 import 'lodash/isPlainObject';
-import 'classnames';
 import 'lodash/isObject';
 import 'lodash/isString';
 import 'lodash/isBoolean';
@@ -40,6 +39,7 @@ import 'lodash/mapValues';
 import 'lodash/camelCase';
 import 'lodash/map';
 import 'lodash/isEmpty';
+import 'lodash/kebabCase';
 import 'uncontrollable';
 import 'hoist-non-react-statics';
 import '../utils/validations.js';

package/esm/store/index.js

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

package/esm/store/list.js

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

package/esm/store/manager.js

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

package/esm/store/modal.js

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

package/esm/store/node.js

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

package/esm/store/pagination.js

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

package/esm/store/root.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.4.2
+ * amis-core v3.5.0
  * Copyright 2018-2023 fex
  */
 
@@ -21,7 +21,6 @@ import '../utils/debug.js';
 import 'react-dom';
 import '../utils/errors.js';
 import '../utils/tpl.js';
-import 'classnames';
 import '../utils/filter.js';
 import 'lodash/isObject';
 import 'lodash/isString';
@@ -38,6 +37,7 @@ import 'lodash/mapValues';
 import 'lodash/camelCase';
 import 'lodash/map';
 import 'lodash/isEmpty';
+import 'lodash/kebabCase';
 import 'uncontrollable';
 import 'hoist-non-react-statics';
 import '../utils/validations.js';

package/esm/store/service.js

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

package/esm/store/status.js

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