amis-core 6.9.0 → 6.10.0-beta.0

package/lib/renderers/Placeholder.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.9.0
+ * amis-core v6.10.0-beta.0
  * Copyright 2018-2024 fex
  */
 

package/lib/renderers/builtin.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.9.0
+ * amis-core v6.10.0-beta.0
  * Copyright 2018-2024 fex
  */
 

package/lib/renderers/register.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.9.0
+ * amis-core v6.10.0-beta.0
  * Copyright 2018-2024 fex
  */
 

package/lib/renderers/wrapControl.d.ts

@@ -3,6 +3,7 @@ import { IFormStore, IFormItemStore } from '../store/form';
 import { RendererProps } from '../factory';
 import { IIRendererStore } from '../store';
 import hoistNonReactStatic from 'hoist-non-react-statics';
+import { FormItemConfig } from './Item';
 import { Api, DataChangeReason } from '../types';
 export interface ControlOutterProps extends RendererProps {
     formStore?: IFormStore;
@@ -49,7 +50,7 @@ export interface ControlProps {
     onChange?: (value: any, name: string, submit: boolean) => void;
     store: IIRendererStore;
 }
-export declare function wrapControl<T extends React.ComponentType<React.ComponentProps<T> & ControlProps>>(ComposedComponent: T): {
+export declare function wrapControl<T extends React.ComponentType<React.ComponentProps<T> & ControlProps>>(config: Omit<FormItemConfig, 'component'>, ComposedComponent: T): {
     new (props: Omit<any, "rootStore">): {
         ref: any;
         getWrappedInstance(): any;

package/lib/renderers/wrapControl.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.9.0
+ * amis-core v6.10.0-beta.0
  * Copyright 2018-2024 fex
  */
 
@@ -72,7 +72,7 @@ var pick__default = /*#__PURE__*/_interopDefaultLegacy(pick);
 var __react_jsx__ = require('react');
 var _J$X_ = (__react_jsx__["default"] || __react_jsx__).createElement;
 (__react_jsx__["default"] || __react_jsx__).Fragment;
-function wrapControl(ComposedComponent) {
+function wrapControl(config, ComposedComponent) {
     var _a;
     var result = hoistNonReactStatic__default["default"](WithRootStore.withRootStore(mobxReact.observer((_a = /** @class */ (function (_super) {
             tslib.__extends(class_1, _super);
@@ -109,7 +109,7 @@ function wrapControl(ComposedComponent) {
                 var model = rootStore.addStore({
                     id: helper.guid(),
                     path: _this.props.$path,
-                    storeType: formItem.FormItemStore.name,
+                    storeType: config.formItemStoreType || formItem.FormItemStore.name,
                     parentId: store === null || store === void 0 ? void 0 : store.id,
                     name: name,
                     colIndex: colIndex !== undefined ? colIndex : undefined,

package/lib/store/app.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.9.0
+ * amis-core v6.10.0-beta.0
  * Copyright 2018-2024 fex
  */
 

package/lib/store/combo.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="lodash" />
 import { SnapshotIn, Instance } from 'mobx-state-tree';
 import type { IFormStore, IFormItemStore } from './form';
 export declare const UniqueGroup: import("mobx-state-tree").IModelType<{
@@ -171,7 +172,7 @@ export declare const UniqueGroup: import("mobx-state-tree").IModelType<{
         closeDialog: (confirmed?: any, result?: any) => void;
         openPopOver: (schema: any, ctx: any, callback?: ((confirmed?: any, value?: any) => void) | undefined) => void;
         closePopOver: (confirmed?: any, result?: any) => void;
-        changeTmpValue: (value: any, changeReason?: "input" | "defaultValue" | "formInited" | "initialValue" | "dataChanged" | "formulaChanged" | "controlled" | undefined) => void;
+        changeTmpValue: (value: any, changeReason?: "input" | "initialValue" | "formInited" | "dataChanged" | "formulaChanged" | "controlled" | "defaultValue" | undefined) => void;
         changeEmitedValue: (value: any) => void;
         addSubFormItem: (item: {
             id: string;
@@ -706,7 +707,7 @@ export declare const UniqueGroup: import("mobx-state-tree").IModelType<{
         closeDialog: (confirmed?: any, result?: any) => void;
         openPopOver: (schema: any, ctx: any, callback?: ((confirmed?: any, value?: any) => void) | undefined) => void;
         closePopOver: (confirmed?: any, result?: any) => void;
-        changeTmpValue: (value: any, changeReason?: "input" | "defaultValue" | "formInited" | "initialValue" | "dataChanged" | "formulaChanged" | "controlled" | undefined) => void;
+        changeTmpValue: (value: any, changeReason?: "input" | "initialValue" | "formInited" | "dataChanged" | "formulaChanged" | "controlled" | "defaultValue" | undefined) => void;
         changeEmitedValue: (value: any) => void;
         addSubFormItem: (item: {
             id: string;
@@ -1275,7 +1276,7 @@ export declare const ComboStore: import("mobx-state-tree").IModelType<{
             closeDialog: (confirmed?: any, result?: any) => void;
             openPopOver: (schema: any, ctx: any, callback?: ((confirmed?: any, value?: any) => void) | undefined) => void;
             closePopOver: (confirmed?: any, result?: any) => void;
-            changeTmpValue: (value: any, changeReason?: "input" | "defaultValue" | "formInited" | "initialValue" | "dataChanged" | "formulaChanged" | "controlled" | undefined) => void;
+            changeTmpValue: (value: any, changeReason?: "input" | "initialValue" | "formInited" | "dataChanged" | "formulaChanged" | "controlled" | "defaultValue" | undefined) => void;
             changeEmitedValue: (value: any) => void;
             addSubFormItem: (item: {
                 id: string;
@@ -1810,7 +1811,7 @@ export declare const ComboStore: import("mobx-state-tree").IModelType<{
             closeDialog: (confirmed?: any, result?: any) => void;
             openPopOver: (schema: any, ctx: any, callback?: ((confirmed?: any, value?: any) => void) | undefined) => void;
             closePopOver: (confirmed?: any, result?: any) => void;
-            changeTmpValue: (value: any, changeReason?: "input" | "defaultValue" | "formInited" | "initialValue" | "dataChanged" | "formulaChanged" | "controlled" | undefined) => void;
+            changeTmpValue: (value: any, changeReason?: "input" | "initialValue" | "formInited" | "dataChanged" | "formulaChanged" | "controlled" | "defaultValue" | undefined) => void;
             changeEmitedValue: (value: any) => void;
             addSubFormItem: (item: {
                 id: string;
@@ -2470,7 +2471,7 @@ export declare const ComboStore: import("mobx-state-tree").IModelType<{
             closeDialog: (confirmed?: any, result?: any) => void;
             openPopOver: (schema: any, ctx: any, callback?: ((confirmed?: any, value?: any) => void) | undefined) => void;
             closePopOver: (confirmed?: any, result?: any) => void;
-            changeTmpValue: (value: any, changeReason?: "input" | "defaultValue" | "formInited" | "initialValue" | "dataChanged" | "formulaChanged" | "controlled" | undefined) => void;
+            changeTmpValue: (value: any, changeReason?: "input" | "initialValue" | "formInited" | "dataChanged" | "formulaChanged" | "controlled" | "defaultValue" | undefined) => void;
             changeEmitedValue: (value: any) => void;
             addSubFormItem: (item: {
                 id: string;
@@ -3005,7 +3006,7 @@ export declare const ComboStore: import("mobx-state-tree").IModelType<{
             closeDialog: (confirmed?: any, result?: any) => void;
             openPopOver: (schema: any, ctx: any, callback?: ((confirmed?: any, value?: any) => void) | undefined) => void;
             closePopOver: (confirmed?: any, result?: any) => void;
-            changeTmpValue: (value: any, changeReason?: "input" | "defaultValue" | "formInited" | "initialValue" | "dataChanged" | "formulaChanged" | "controlled" | undefined) => void;
+            changeTmpValue: (value: any, changeReason?: "input" | "initialValue" | "formInited" | "dataChanged" | "formulaChanged" | "controlled" | "defaultValue" | undefined) => void;
             changeEmitedValue: (value: any) => void;
             addSubFormItem: (item: {
                 id: string;
@@ -3544,7 +3545,7 @@ export declare const ComboStore: import("mobx-state-tree").IModelType<{
             closeDialog: (confirmed?: any, result?: any) => void;
             openPopOver: (schema: any, ctx: any, callback?: ((confirmed?: any, value?: any) => void) | undefined) => void;
             closePopOver: (confirmed?: any, result?: any) => void;
-            changeTmpValue: (value: any, changeReason?: "input" | "defaultValue" | "formInited" | "initialValue" | "dataChanged" | "formulaChanged" | "controlled" | undefined) => void;
+            changeTmpValue: (value: any, changeReason?: "input" | "initialValue" | "formInited" | "dataChanged" | "formulaChanged" | "controlled" | "defaultValue" | undefined) => void;
             changeEmitedValue: (value: any) => void;
             addSubFormItem: (item: {
                 id: string;
@@ -4079,7 +4080,7 @@ export declare const ComboStore: import("mobx-state-tree").IModelType<{
             closeDialog: (confirmed?: any, result?: any) => void;
             openPopOver: (schema: any, ctx: any, callback?: ((confirmed?: any, value?: any) => void) | undefined) => void;
             closePopOver: (confirmed?: any, result?: any) => void;
-            changeTmpValue: (value: any, changeReason?: "input" | "defaultValue" | "formInited" | "initialValue" | "dataChanged" | "formulaChanged" | "controlled" | undefined) => void;
+            changeTmpValue: (value: any, changeReason?: "input" | "initialValue" | "formInited" | "dataChanged" | "formulaChanged" | "controlled" | "defaultValue" | undefined) => void;
             changeEmitedValue: (value: any) => void;
             addSubFormItem: (item: {
                 id: string;
@@ -4623,7 +4624,7 @@ export declare const ComboStore: import("mobx-state-tree").IModelType<{
             closeDialog: (confirmed?: any, result?: any) => void;
             openPopOver: (schema: any, ctx: any, callback?: ((confirmed?: any, value?: any) => void) | undefined) => void;
             closePopOver: (confirmed?: any, result?: any) => void;
-            changeTmpValue: (value: any, changeReason?: "input" | "defaultValue" | "formInited" | "initialValue" | "dataChanged" | "formulaChanged" | "controlled" | undefined) => void;
+            changeTmpValue: (value: any, changeReason?: "input" | "initialValue" | "formInited" | "dataChanged" | "formulaChanged" | "controlled" | "defaultValue" | undefined) => void;
             changeEmitedValue: (value: any) => void;
             addSubFormItem: (item: {
                 id: string;
@@ -5158,7 +5159,7 @@ export declare const ComboStore: import("mobx-state-tree").IModelType<{
             closeDialog: (confirmed?: any, result?: any) => void;
             openPopOver: (schema: any, ctx: any, callback?: ((confirmed?: any, value?: any) => void) | undefined) => void;
             closePopOver: (confirmed?: any, result?: any) => void;
-            changeTmpValue: (value: any, changeReason?: "input" | "defaultValue" | "formInited" | "initialValue" | "dataChanged" | "formulaChanged" | "controlled" | undefined) => void;
+            changeTmpValue: (value: any, changeReason?: "input" | "initialValue" | "formInited" | "dataChanged" | "formulaChanged" | "controlled" | "defaultValue" | undefined) => void;
             changeEmitedValue: (value: any) => void;
             addSubFormItem: (item: {
                 id: string;
@@ -5697,7 +5698,7 @@ export declare const ComboStore: import("mobx-state-tree").IModelType<{
             closeDialog: (confirmed?: any, result?: any) => void;
             openPopOver: (schema: any, ctx: any, callback?: ((confirmed?: any, value?: any) => void) | undefined) => void;
             closePopOver: (confirmed?: any, result?: any) => void;
-            changeTmpValue: (value: any, changeReason?: "input" | "defaultValue" | "formInited" | "initialValue" | "dataChanged" | "formulaChanged" | "controlled" | undefined) => void;
+            changeTmpValue: (value: any, changeReason?: "input" | "initialValue" | "formInited" | "dataChanged" | "formulaChanged" | "controlled" | "defaultValue" | undefined) => void;
             changeEmitedValue: (value: any) => void;
             addSubFormItem: (item: {
                 id: string;
@@ -6232,7 +6233,7 @@ export declare const ComboStore: import("mobx-state-tree").IModelType<{
             closeDialog: (confirmed?: any, result?: any) => void;
             openPopOver: (schema: any, ctx: any, callback?: ((confirmed?: any, value?: any) => void) | undefined) => void;
             closePopOver: (confirmed?: any, result?: any) => void;
-            changeTmpValue: (value: any, changeReason?: "input" | "defaultValue" | "formInited" | "initialValue" | "dataChanged" | "formulaChanged" | "controlled" | undefined) => void;
+            changeTmpValue: (value: any, changeReason?: "input" | "initialValue" | "formInited" | "dataChanged" | "formulaChanged" | "controlled" | "defaultValue" | undefined) => void;
             changeEmitedValue: (value: any) => void;
             addSubFormItem: (item: {
                 id: string;
@@ -6771,7 +6772,7 @@ export declare const ComboStore: import("mobx-state-tree").IModelType<{
             closeDialog: (confirmed?: any, result?: any) => void;
             openPopOver: (schema: any, ctx: any, callback?: ((confirmed?: any, value?: any) => void) | undefined) => void;
             closePopOver: (confirmed?: any, result?: any) => void;
-            changeTmpValue: (value: any, changeReason?: "input" | "defaultValue" | "formInited" | "initialValue" | "dataChanged" | "formulaChanged" | "controlled" | undefined) => void;
+            changeTmpValue: (value: any, changeReason?: "input" | "initialValue" | "formInited" | "dataChanged" | "formulaChanged" | "controlled" | "defaultValue" | undefined) => void;
             changeEmitedValue: (value: any) => void;
             addSubFormItem: (item: {
                 id: string;
@@ -7306,7 +7307,7 @@ export declare const ComboStore: import("mobx-state-tree").IModelType<{
             closeDialog: (confirmed?: any, result?: any) => void;
             openPopOver: (schema: any, ctx: any, callback?: ((confirmed?: any, value?: any) => void) | undefined) => void;
             closePopOver: (confirmed?: any, result?: any) => void;
-            changeTmpValue: (value: any, changeReason?: "input" | "defaultValue" | "formInited" | "initialValue" | "dataChanged" | "formulaChanged" | "controlled" | undefined) => void;
+            changeTmpValue: (value: any, changeReason?: "input" | "initialValue" | "formInited" | "dataChanged" | "formulaChanged" | "controlled" | "defaultValue" | undefined) => void;
             changeEmitedValue: (value: any) => void;
             addSubFormItem: (item: {
                 id: string;
@@ -7968,7 +7969,7 @@ export declare const ComboStore: import("mobx-state-tree").IModelType<{
             closeDialog: (confirmed?: any, result?: any) => void;
             openPopOver: (schema: any, ctx: any, callback?: ((confirmed?: any, value?: any) => void) | undefined) => void;
             closePopOver: (confirmed?: any, result?: any) => void;
-            changeTmpValue: (value: any, changeReason?: "input" | "defaultValue" | "formInited" | "initialValue" | "dataChanged" | "formulaChanged" | "controlled" | undefined) => void;
+            changeTmpValue: (value: any, changeReason?: "input" | "initialValue" | "formInited" | "dataChanged" | "formulaChanged" | "controlled" | "defaultValue" | undefined) => void;
             changeEmitedValue: (value: any) => void;
             addSubFormItem: (item: {
                 id: string;
@@ -8503,7 +8504,7 @@ export declare const ComboStore: import("mobx-state-tree").IModelType<{
             closeDialog: (confirmed?: any, result?: any) => void;
             openPopOver: (schema: any, ctx: any, callback?: ((confirmed?: any, value?: any) => void) | undefined) => void;
             closePopOver: (confirmed?: any, result?: any) => void;
-            changeTmpValue: (value: any, changeReason?: "input" | "defaultValue" | "formInited" | "initialValue" | "dataChanged" | "formulaChanged" | "controlled" | undefined) => void;
+            changeTmpValue: (value: any, changeReason?: "input" | "initialValue" | "formInited" | "dataChanged" | "formulaChanged" | "controlled" | "defaultValue" | undefined) => void;
             changeEmitedValue: (value: any) => void;
             addSubFormItem: (item: {
                 id: string;
@@ -9042,7 +9043,7 @@ export declare const ComboStore: import("mobx-state-tree").IModelType<{
             closeDialog: (confirmed?: any, result?: any) => void;
             openPopOver: (schema: any, ctx: any, callback?: ((confirmed?: any, value?: any) => void) | undefined) => void;
             closePopOver: (confirmed?: any, result?: any) => void;
-            changeTmpValue: (value: any, changeReason?: "input" | "defaultValue" | "formInited" | "initialValue" | "dataChanged" | "formulaChanged" | "controlled" | undefined) => void;
+            changeTmpValue: (value: any, changeReason?: "input" | "initialValue" | "formInited" | "dataChanged" | "formulaChanged" | "controlled" | "defaultValue" | undefined) => void;
             changeEmitedValue: (value: any) => void;
             addSubFormItem: (item: {
                 id: string;
@@ -9577,7 +9578,7 @@ export declare const ComboStore: import("mobx-state-tree").IModelType<{
             closeDialog: (confirmed?: any, result?: any) => void;
             openPopOver: (schema: any, ctx: any, callback?: ((confirmed?: any, value?: any) => void) | undefined) => void;
             closePopOver: (confirmed?: any, result?: any) => void;
-            changeTmpValue: (value: any, changeReason?: "input" | "defaultValue" | "formInited" | "initialValue" | "dataChanged" | "formulaChanged" | "controlled" | undefined) => void;
+            changeTmpValue: (value: any, changeReason?: "input" | "initialValue" | "formInited" | "dataChanged" | "formulaChanged" | "controlled" | "defaultValue" | undefined) => void;
             changeEmitedValue: (value: any) => void;
             addSubFormItem: (item: {
                 id: string;
@@ -10121,7 +10122,7 @@ export declare const ComboStore: import("mobx-state-tree").IModelType<{
             closeDialog: (confirmed?: any, result?: any) => void;
             openPopOver: (schema: any, ctx: any, callback?: ((confirmed?: any, value?: any) => void) | undefined) => void;
             closePopOver: (confirmed?: any, result?: any) => void;
-            changeTmpValue: (value: any, changeReason?: "input" | "defaultValue" | "formInited" | "initialValue" | "dataChanged" | "formulaChanged" | "controlled" | undefined) => void;
+            changeTmpValue: (value: any, changeReason?: "input" | "initialValue" | "formInited" | "dataChanged" | "formulaChanged" | "controlled" | "defaultValue" | undefined) => void;
             changeEmitedValue: (value: any) => void;
             addSubFormItem: (item: {
                 id: string;
@@ -10656,7 +10657,7 @@ export declare const ComboStore: import("mobx-state-tree").IModelType<{
             closeDialog: (confirmed?: any, result?: any) => void;
             openPopOver: (schema: any, ctx: any, callback?: ((confirmed?: any, value?: any) => void) | undefined) => void;
             closePopOver: (confirmed?: any, result?: any) => void;
-            changeTmpValue: (value: any, changeReason?: "input" | "defaultValue" | "formInited" | "initialValue" | "dataChanged" | "formulaChanged" | "controlled" | undefined) => void;
+            changeTmpValue: (value: any, changeReason?: "input" | "initialValue" | "formInited" | "dataChanged" | "formulaChanged" | "controlled" | "defaultValue" | undefined) => void;
             changeEmitedValue: (value: any) => void;
             addSubFormItem: (item: {
                 id: string;
@@ -11195,7 +11196,7 @@ export declare const ComboStore: import("mobx-state-tree").IModelType<{
             closeDialog: (confirmed?: any, result?: any) => void;
             openPopOver: (schema: any, ctx: any, callback?: ((confirmed?: any, value?: any) => void) | undefined) => void;
             closePopOver: (confirmed?: any, result?: any) => void;
-            changeTmpValue: (value: any, changeReason?: "input" | "defaultValue" | "formInited" | "initialValue" | "dataChanged" | "formulaChanged" | "controlled" | undefined) => void;
+            changeTmpValue: (value: any, changeReason?: "input" | "initialValue" | "formInited" | "dataChanged" | "formulaChanged" | "controlled" | "defaultValue" | undefined) => void;
             changeEmitedValue: (value: any) => void;
             addSubFormItem: (item: {
                 id: string;
@@ -11730,7 +11731,7 @@ export declare const ComboStore: import("mobx-state-tree").IModelType<{
             closeDialog: (confirmed?: any, result?: any) => void;
             openPopOver: (schema: any, ctx: any, callback?: ((confirmed?: any, value?: any) => void) | undefined) => void;
             closePopOver: (confirmed?: any, result?: any) => void;
-            changeTmpValue: (value: any, changeReason?: "input" | "defaultValue" | "formInited" | "initialValue" | "dataChanged" | "formulaChanged" | "controlled" | undefined) => void;
+            changeTmpValue: (value: any, changeReason?: "input" | "initialValue" | "formInited" | "dataChanged" | "formulaChanged" | "controlled" | "defaultValue" | undefined) => void;
             changeEmitedValue: (value: any) => void;
             addSubFormItem: (item: {
                 id: string;
@@ -12269,7 +12270,7 @@ export declare const ComboStore: import("mobx-state-tree").IModelType<{
             closeDialog: (confirmed?: any, result?: any) => void;
             openPopOver: (schema: any, ctx: any, callback?: ((confirmed?: any, value?: any) => void) | undefined) => void;
             closePopOver: (confirmed?: any, result?: any) => void;
-            changeTmpValue: (value: any, changeReason?: "input" | "defaultValue" | "formInited" | "initialValue" | "dataChanged" | "formulaChanged" | "controlled" | undefined) => void;
+            changeTmpValue: (value: any, changeReason?: "input" | "initialValue" | "formInited" | "dataChanged" | "formulaChanged" | "controlled" | "defaultValue" | undefined) => void;
             changeEmitedValue: (value: any) => void;
             addSubFormItem: (item: {
                 id: string;
@@ -12804,7 +12805,7 @@ export declare const ComboStore: import("mobx-state-tree").IModelType<{
             closeDialog: (confirmed?: any, result?: any) => void;
             openPopOver: (schema: any, ctx: any, callback?: ((confirmed?: any, value?: any) => void) | undefined) => void;
             closePopOver: (confirmed?: any, result?: any) => void;
-            changeTmpValue: (value: any, changeReason?: "input" | "defaultValue" | "formInited" | "initialValue" | "dataChanged" | "formulaChanged" | "controlled" | undefined) => void;
+            changeTmpValue: (value: any, changeReason?: "input" | "initialValue" | "formInited" | "dataChanged" | "formulaChanged" | "controlled" | "defaultValue" | undefined) => void;
             changeEmitedValue: (value: any) => void;
             addSubFormItem: (item: {
                 id: string;

package/lib/store/combo.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.9.0
+ * amis-core v6.10.0-beta.0
  * Copyright 2018-2024 fex
  */
 

package/lib/store/crud.d.ts

@@ -127,6 +127,8 @@ export declare const CRUDStore: import("mobx-state-tree").IModelType<{
         loadDataMode?: boolean;
         syncResponse2Query?: boolean;
         columns?: Array<any>;
+        matchFunc?: MatchFunc;
+        filterOnAllColumns?: boolean;
         isTable2?: Boolean;
     }) => Promise<any>;
     changePage: (page: number | string, perPage?: number | string) => void;
@@ -139,8 +141,8 @@ export declare const CRUDStore: import("mobx-state-tree").IModelType<{
     setUnSelectedItems: (items: Array<any>) => void;
     setInnerModalOpened: (value: boolean) => void;
     initFromScope: (scope: any, source: string, options: {
-        columns?: any[] | undefined;
-        matchFunc?: MatchFunc | null | undefined;
+        columns?: Array<any>;
+        matchFunc?: MatchFunc | null;
     }) => void;
     exportAsCSV: (options?: {
         loadDataOnce?: boolean | undefined;

package/lib/store/crud.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.9.0
+ * amis-core v6.10.0-beta.0
  * Copyright 2018-2024 fex
  */
 
@@ -18,12 +18,10 @@ require('moment');
 var object = require('../utils/object.js');
 require('../utils/memoryParse.js');
 require('@rc-component/mini-decimal');
-var getVariable = require('../utils/getVariable.js');
 var resolveVariableAndFilter = require('../utils/resolveVariableAndFilter.js');
 require('lodash/isPlainObject');
 require('../utils/filter.js');
 var api = require('../utils/api.js');
-var matchSorter = require('match-sorter');
 var tpl = require('../utils/tpl.js');
 var table = require('./table.js');
 
@@ -132,7 +130,7 @@ var CRUDStore = service.ServiceStore.named('CRUDStore')
         }
     }
     var fetchInitData = mobxStateTree.flow(function getInitData(api$1, data, options) {
-        var matchFunc, items_1, dir, data_1, ctx, json, result, total, count, page, hasNext, oItems, oRows, columns, rest, items, _a, _b, key, rowsData, data_2, filteredItems_1, dir, e_1, env;
+        var rawItems, matchFunc, items, dir, data_1, ctx, json, result, total, count, page, hasNext, oItems, oRows, columns, rest, items, _a, _b, key, rowsData, data_2, filteredItems, dir, e_1, env;
         var _c, e_2, _d;
         var _e, _f, _g, _h, _j, _k, _l, _m, _o, _p;
         if (options === void 0) { options = {}; }
@@ -140,61 +138,26 @@ var CRUDStore = service.ServiceStore.named('CRUDStore')
             switch (_q.label) {
                 case 0:
                     _q.trys.push([0, 2, , 3]);
-                    if (!options.forceReload && options.loadDataOnce && self.total) {
+                    rawItems = options.source
+                        ? resolveVariableAndFilter.resolveVariableAndFilter(options.source, object.createObject(self.mergedData, {
+                            items: self.data.itemsRaw,
+                            rows: self.data.itemsRaw
+                        }), '| raw')
+                        : self.items.concat();
+                    if (!options.forceReload && options.loadDataOnce && (rawItems === null || rawItems === void 0 ? void 0 : rawItems.length)) {
                         matchFunc = options.matchFunc;
-                        items_1 = options.source
-                            ? resolveVariableAndFilter.resolveVariableAndFilter(options.source, object.createObject(self.mergedData, {
-                                items: self.data.itemsRaw,
-                                rows: self.data.itemsRaw
-                            }), '| raw')
-                            : self.items.concat();
-                        /** 字段的格式类型无法穷举，所以支持使用函数过滤 */
-                        if (matchFunc && typeof matchFunc === 'function') {
-                            items_1 = matchFunc(items_1, self.data.itemsRaw, {
-                                query: self.query,
-                                columns: options.columns,
-                                matchSorter: matchSorter.matchSorter
-                            });
-                        }
-                        else {
-                            if (Array.isArray(options.columns)) {
-                                options.columns.forEach(function (column) {
-                                    var value = typeof column.name === 'string'
-                                        ? getVariable.getVariable(self.query, column.name)
-                                        : undefined;
-                                    var key = column.name;
-                                    if (value != null && key) {
-                                        // value可能为null、undefined、''、0
-                                        if (Array.isArray(value)) {
-                                            if (value.length > 0) {
-                                                var arr_1 = tslib.__spreadArray([], tslib.__read(items_1), false);
-                                                var arrItems_1 = [];
-                                                value.forEach(function (item) {
-                                                    arrItems_1 = tslib.__spreadArray(tslib.__spreadArray([], tslib.__read(arrItems_1), false), tslib.__read(matchSorter.matchSorter(arr_1, item, {
-                                                        keys: [key],
-                                                        threshold: matchSorter.matchSorter.rankings.CONTAINS
-                                                    })), false);
-                                                });
-                                                items_1 = items_1.filter(function (item) {
-                                                    return arrItems_1.find(function (a) { return a === item; });
-                                                });
-                                            }
-                                        }
-                                        else {
-                                            items_1 = matchSorter.matchSorter(items_1, value, {
-                                                keys: [key],
-                                                threshold: matchSorter.matchSorter.rankings.CONTAINS
-                                            });
-                                        }
-                                    }
-                                });
-                            }
-                        }
+                        items = rawItems;
+                        items = helper.applyFilters(items, {
+                            query: self.query,
+                            columns: options.columns,
+                            matchFunc: matchFunc,
+                            filterOnAllColumns: options.filterOnAllColumns
+                        });
                         if (self.query.orderBy) {
                             dir = /desc/i.test(self.query.orderDir) ? -1 : 1;
-                            items_1 = helper.sortArray(items_1, self.query.orderBy, dir);
+                            items = helper.sortArray(items, self.query.orderBy, dir);
                         }
-                        data_1 = tslib.__assign(tslib.__assign({}, self.data), { total: items_1.length, items: items_1.slice((self.page - 1) * self.perPage, self.page * self.perPage) });
+                        data_1 = tslib.__assign(tslib.__assign({}, self.data), { total: items.length, items: items.slice((self.page - 1) * self.perPage, self.page * self.perPage) });
                         self.total = parseInt((_e = data_1.total) !== null && _e !== void 0 ? _e : data_1.count, 10) || 0;
                         self.reInitData(data_1);
                         return [2 /*return*/];
@@ -284,44 +247,18 @@ var CRUDStore = service.ServiceStore.named('CRUDStore')
                              * 2. 接口返回中没有 items 和 rows 字段，则直接用查到的数据。
                              */
                             data_2.itemsRaw = oItems || oRows || rowsData.concat();
-                            filteredItems_1 = rowsData.concat();
-                            if (Array.isArray(options.columns)) {
-                                options.columns.forEach(function (column) {
-                                    var value;
-                                    var key = column.name;
-                                    if (column.searchable &&
-                                        key &&
-                                        (value = getVariable.getVariable(self.query, key))) {
-                                        if (Array.isArray(value)) {
-                                            if (value.length > 0) {
-                                                var arr_2 = tslib.__spreadArray([], tslib.__read(filteredItems_1), false);
-                                                var arrItems_2 = [];
-                                                value.forEach(function (item) {
-                                                    arrItems_2 = tslib.__spreadArray(tslib.__spreadArray([], tslib.__read(arrItems_2), false), tslib.__read(matchSorter.matchSorter(arr_2, item, {
-                                                        keys: [key],
-                                                        threshold: matchSorter.matchSorter.rankings.CONTAINS
-                                                    })), false);
-                                                });
-                                                filteredItems_1 = filteredItems_1.filter(function (item) {
-                                                    return arrItems_2.find(function (a) { return a === item; });
-                                                });
-                                            }
-                                        }
-                                        else {
-                                            filteredItems_1 = matchSorter.matchSorter(filteredItems_1, value, {
-                                                keys: [key],
-                                                threshold: matchSorter.matchSorter.rankings.CONTAINS
-                                            });
-                                        }
-                                    }
-                                });
-                            }
+                            filteredItems = helper.applyFilters(rowsData, {
+                                query: self.query,
+                                columns: options.columns,
+                                filterOnAllColumns: false,
+                                matchFunc: options.matchFunc
+                            });
                             if (self.query.orderBy) {
                                 dir = /desc/i.test(self.query.orderDir) ? -1 : 1;
-                                filteredItems_1 = helper.sortArray(filteredItems_1, self.query.orderBy, dir);
+                                filteredItems = helper.sortArray(filteredItems, self.query.orderBy, dir);
                             }
-                            data_2.items = filteredItems_1.slice((self.page - 1) * self.perPage, self.page * self.perPage);
-                            data_2.count = data_2.total = filteredItems_1.length;
+                            data_2.items = filteredItems.slice((self.page - 1) * self.perPage, self.page * self.perPage);
+                            data_2.count = data_2.total = filteredItems.length;
                         }
                         if (Array.isArray(columns)) {
                             self.columns = columns.concat();
@@ -466,58 +403,19 @@ var CRUDStore = service.ServiceStore.named('CRUDStore')
     };
     var initFromScope = function (scope, source, options) {
         var _a;
-        var matchFunc = options.matchFunc;
         var items = resolveVariableAndFilter.resolveVariableAndFilter(source, scope, '| raw');
         if (!Array.isArray(items) && !self.items.length) {
             return;
         }
-        items = Array.isArray(items) ? items : [];
-        /** 字段的格式类型无法穷举，所以支持使用函数过滤 */
-        if (matchFunc && typeof matchFunc === 'function') {
-            items = matchFunc(items, items.concat(), {
-                query: self.query,
-                columns: options.columns,
-                matchSorter: matchSorter.matchSorter
-            });
-        }
-        else {
-            if (Array.isArray(options.columns)) {
-                options.columns.forEach(function (column) {
-                    var value = typeof column.name === 'string'
-                        ? getVariable.getVariable(self.query, column.name)
-                        : undefined;
-                    var key = column.name;
-                    if (value != null && key) {
-                        // value可能为null、undefined、''、0
-                        if (Array.isArray(value)) {
-                            if (value.length > 0) {
-                                var arr_3 = tslib.__spreadArray([], tslib.__read(items), false);
-                                var arrItems_3 = [];
-                                /** 搜索 query 值为数组的情况 */
-                                value.forEach(function (item) {
-                                    arrItems_3 = tslib.__spreadArray(tslib.__spreadArray([], tslib.__read(arrItems_3), false), tslib.__read(matchSorter.matchSorter(arr_3, item, {
-                                        keys: [key],
-                                        threshold: matchSorter.matchSorter.rankings.CONTAINS
-                                    })), false);
-                                });
-                                items = items.filter(function (item) {
-                                    return arrItems_3.find(function (a) { return a === item; });
-                                });
-                            }
-                        }
-                        else {
-                            items = matchSorter.matchSorter(items, value, {
-                                keys: [key],
-                                threshold: matchSorter.matchSorter.rankings.CONTAINS
-                            });
-                        }
-                    }
-                });
-            }
-        }
+        items = helper.applyFilters(Array.isArray(items) ? items : [], {
+            query: self.query,
+            columns: options.columns,
+            matchFunc: options.matchFunc,
+            filterOnAllColumns: true
+        });
         if (self.query.orderBy) {
             var dir = /desc/i.test(self.query.orderDir) ? -1 : 1;
-            items = helper.sortArray(items, self.query.orderBy, dir);
+            items = helper.sortArray(items.concat(), self.query.orderBy, dir);
         }
         var data = tslib.__assign(tslib.__assign({}, self.pristine), { items: items.length > self.perPage
                 ? items.slice((self.page - 1) * self.perPage, self.page * self.perPage)
@@ -566,8 +464,8 @@ var CRUDStore = service.ServiceStore.named('CRUDStore')
                             // 将数据里的对象转成 json 字符串，不然输出的 csv 没法显示
                             var csvData = [];
                             try {
-                                for (var items_2 = tslib.__values(items), items_2_1 = items_2.next(); !items_2_1.done; items_2_1 = items_2.next()) {
-                                    var row = items_2_1.value;
+                                for (var items_1 = tslib.__values(items), items_1_1 = items_1.next(); !items_1_1.done; items_1_1 = items_1.next()) {
+                                    var row = items_1_1.value;
                                     var rowData = {};
                                     for (var key in row) {
                                         var value = row[key];
@@ -584,7 +482,7 @@ var CRUDStore = service.ServiceStore.named('CRUDStore')
                             catch (e_4_1) { e_4 = { error: e_4_1 }; }
                             finally {
                                 try {
-                                    if (items_2_1 && !items_2_1.done && (_a = items_2.return)) _a.call(items_2);
+                                    if (items_1_1 && !items_1_1.done && (_a = items_1.return)) _a.call(items_1);
                                 }
                                 finally { if (e_4) throw e_4.error; }
                             }