amis-core 2.3.1 → 2.4.0

package/lib/renderers/Item.d.ts

@@ -516,9 +516,6 @@ export declare function asFormItem(config: Omit<FormItemConfig, 'component'>): (
         readonly fetcher: any;
         readonly notify: any;
         readonly isCancel: (value: any) => boolean;
-        /**
-         * 输入提示，聚焦的时候显示
-         */
         readonly __: import("..").TranslateFn<any>;
         getStoreById(id: string): {
             id: string;
@@ -612,6 +609,9 @@ export declare function asFormItem(config: Omit<FormItemConfig, 'component'>): (
         addStore(store: {
             [propName: string]: any;
             storeType: string;
+            /**
+             * 表单 control 是否为 inline 模式。
+             */
             id: string;
             path: string;
             parentId?: string | undefined;
@@ -707,9 +707,6 @@ export declare function asFormItem(config: Omit<FormItemConfig, 'component'>): (
         readonly fetcher: any;
         readonly notify: any;
         readonly isCancel: (value: any) => boolean;
-        /**
-         * 输入提示，聚焦的时候显示
-         */
         readonly __: import("..").TranslateFn<any>;
         getStoreById(id: string): {
             id: string;
@@ -803,6 +800,9 @@ export declare function asFormItem(config: Omit<FormItemConfig, 'component'>): (
         addStore(store: {
             [propName: string]: any;
             storeType: string;
+            /**
+             * 表单 control 是否为 inline 模式。
+             */
             id: string;
             path: string;
             parentId?: string | undefined;

package/lib/renderers/Item.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v2.3.1
+ * amis-core v2.4.0
  * Copyright 2018-2022 fex
  */
 
@@ -37,12 +37,11 @@ require('lodash/isObject');
 require('lodash/isString');
 require('lodash/isBoolean');
 var getVariable = require('../utils/getVariable.js');
-require('../utils/image.js');
 require('lodash');
+require('../utils/image.js');
 require('../actions/Action.js');
 require('../utils/resize-sensor.js');
 require('../node_modules/dom-helpers/esm/addEventListener.js');
-require('../node_modules/warning/warning.js');
 require('../utils/SimpleMap.js');
 require('lodash/mapValues');
 require('lodash/camelCase');
@@ -58,6 +57,14 @@ var React__default = /*#__PURE__*/_interopDefaultLegacy(React);
 var hoistNonReactStatic__default = /*#__PURE__*/_interopDefaultLegacy(hoistNonReactStatic);
 var debouce__default = /*#__PURE__*/_interopDefaultLegacy(debouce);
 
+var getItemLabelClassName = function (props) {
+    var staticLabelClassName = props.staticLabelClassName, labelClassName = props.labelClassName;
+    return props.static && staticLabelClassName ? staticLabelClassName : labelClassName;
+};
+var getItemInputClassName = function (props) {
+    var staticInputClassName = props.staticInputClassName, inputClassName = props.inputClassName;
+    return props.static && staticInputClassName ? staticInputClassName : inputClassName;
+};
 var FormItemWrap = /** @class */ (function (_super) {
     tslib.__extends(FormItemWrap, _super);
     function FormItemWrap(props) {
@@ -320,7 +327,7 @@ var FormItemWrap = /** @class */ (function (_super) {
     };
     FormItemWrap.prototype.renderControl = function () {
         var _a;
-        var _b = this.props, inputClassName = _b.inputClassName, model = _b.formItem, cx = _b.classnames; _b.children; var type = _b.type, renderControl = _b.renderControl; _b.formItemConfig; var sizeMutable = _b.sizeMutable, size = _b.size, defaultSize = _b.defaultSize, useMobileUI = _b.useMobileUI, rest = tslib.__rest(_b, ["inputClassName", "formItem", "classnames", "children", "type", "renderControl", "formItemConfig", "sizeMutable", "size", "defaultSize", "useMobileUI"]);
+        var _b = this.props, model = _b.formItem, cx = _b.classnames; _b.children; var type = _b.type, renderControl = _b.renderControl; _b.formItemConfig; var sizeMutable = _b.sizeMutable, size = _b.size, defaultSize = _b.defaultSize, useMobileUI = _b.useMobileUI, rest = tslib.__rest(_b, ["formItem", "classnames", "children", "type", "renderControl", "formItemConfig", "sizeMutable", "size", "defaultSize", "useMobileUI"]);
         var mobileUI = useMobileUI && helper.isMobile();
         if (renderControl) {
             var controlSize = size || defaultSize;
@@ -332,7 +339,7 @@ var FormItemWrap = /** @class */ (function (_super) {
                         typeof controlSize === 'string' &&
                         !!controlSize &&
                         controlSize !== 'full',
-                    _a), model === null || model === void 0 ? void 0 : model.errClassNames, inputClassName) }));
+                    _a), model === null || model === void 0 ? void 0 : model.errClassNames, getItemInputClassName(this.props)) }));
         }
         return null;
     };
@@ -362,7 +369,7 @@ var FormItemWrap = /** @class */ (function (_super) {
     FormItemWrap.layoutRenderers = {
         horizontal: function (props, renderControl) {
             var _a, _b, _c;
-            var className = props.className, cx = props.classnames, description = props.description, descriptionClassName = props.descriptionClassName, captionClassName = props.captionClassName, desc = props.desc, label = props.label, labelClassName = props.labelClassName, render = props.render, required = props.required, caption = props.caption, remark = props.remark, labelRemark = props.labelRemark, env = props.env, model = props.formItem, renderLabel = props.renderLabel, renderDescription = props.renderDescription, hint = props.hint, data = props.data, showErrorMsg = props.showErrorMsg, useMobileUI = props.useMobileUI; props.translate;
+            var className = props.className, cx = props.classnames, description = props.description, descriptionClassName = props.descriptionClassName, captionClassName = props.captionClassName, desc = props.desc, label = props.label, render = props.render, required = props.required, caption = props.caption, remark = props.remark, labelRemark = props.labelRemark, env = props.env, model = props.formItem, renderLabel = props.renderLabel, renderDescription = props.renderDescription, hint = props.hint, data = props.data, showErrorMsg = props.showErrorMsg, useMobileUI = props.useMobileUI; props.translate; var isStatic = props.static, staticClassName = props.staticClassName;
             // 强制不渲染 label 的话
             if (renderLabel === false) {
                 label = label === false ? false : '';
@@ -373,7 +380,7 @@ var FormItemWrap = /** @class */ (function (_super) {
             var right = helper.getWidthRate(horizontal.right);
             var labelAlign = props.labelAlign || props.formLabelAlign;
             var labelWidth = props.labelWidth || props.formLabelWidth;
-            return (React__default["default"].createElement("div", { "data-role": "form-item", className: cx("Form-item Form-item--horizontal", className, (_a = {
+            return (React__default["default"].createElement("div", { "data-role": "form-item", className: cx("Form-item Form-item--horizontal", isStatic && staticClassName ? staticClassName : className, (_a = {
                         'Form-item--horizontal-justify': horizontal.justify
                     },
                     _a["is-error"] = model && !model.valid,
@@ -385,7 +392,7 @@ var FormItemWrap = /** @class */ (function (_super) {
                             : 'normal')] = horizontal.leftFixed,
                         _b["Form-itemColumn--".concat(left)] = !horizontal.leftFixed,
                         _b['Form-label--left'] = labelAlign === 'left',
-                        _b), labelClassName), style: labelWidth != null ? { width: labelWidth } : undefined },
+                        _b), getItemLabelClassName(props)), style: labelWidth != null ? { width: labelWidth } : undefined },
                     React__default["default"].createElement("span", null,
                         label
                             ? render('label', typeof label === 'string' ? tpl.filter(label, data) : label)
@@ -446,14 +453,14 @@ var FormItemWrap = /** @class */ (function (_super) {
         },
         normal: function (props, renderControl) {
             var _a;
-            var className = props.className, cx = props.classnames, desc = props.desc, description = props.description, label = props.label, labelClassName = props.labelClassName, render = props.render, required = props.required, caption = props.caption, remark = props.remark, labelRemark = props.labelRemark, env = props.env, descriptionClassName = props.descriptionClassName, captionClassName = props.captionClassName, model = props.formItem, renderLabel = props.renderLabel, renderDescription = props.renderDescription, hint = props.hint, data = props.data, showErrorMsg = props.showErrorMsg, useMobileUI = props.useMobileUI; props.translate;
+            var className = props.className, cx = props.classnames, desc = props.desc, description = props.description, label = props.label, render = props.render, required = props.required, caption = props.caption, remark = props.remark, labelRemark = props.labelRemark, env = props.env, descriptionClassName = props.descriptionClassName, captionClassName = props.captionClassName, model = props.formItem, renderLabel = props.renderLabel, renderDescription = props.renderDescription, hint = props.hint, data = props.data, showErrorMsg = props.showErrorMsg, useMobileUI = props.useMobileUI; props.translate;
             description = description || desc;
             return (React__default["default"].createElement("div", { "data-role": "form-item", className: cx("Form-item Form-item--normal", className, (_a = {
                         'is-error': model && !model.valid
                     },
                     _a["is-required"] = required,
                     _a), model === null || model === void 0 ? void 0 : model.errClassNames) },
-                label && renderLabel !== false ? (React__default["default"].createElement("label", { className: cx("Form-label", labelClassName) },
+                label && renderLabel !== false ? (React__default["default"].createElement("label", { className: cx("Form-label", getItemLabelClassName(props)) },
                     React__default["default"].createElement("span", null,
                         label
                             ? render('label', typeof label === 'string' ? tpl.filter(label, data) : label)
@@ -508,7 +515,7 @@ var FormItemWrap = /** @class */ (function (_super) {
         },
         inline: function (props, renderControl) {
             var _a;
-            var className = props.className, cx = props.classnames, desc = props.desc, description = props.description, label = props.label, labelClassName = props.labelClassName, render = props.render, required = props.required, caption = props.caption, descriptionClassName = props.descriptionClassName, captionClassName = props.captionClassName, model = props.formItem, remark = props.remark, labelRemark = props.labelRemark, env = props.env, hint = props.hint, renderLabel = props.renderLabel, renderDescription = props.renderDescription, data = props.data, showErrorMsg = props.showErrorMsg, useMobileUI = props.useMobileUI; props.translate;
+            var className = props.className, cx = props.classnames, desc = props.desc, description = props.description, label = props.label, render = props.render, required = props.required, caption = props.caption, descriptionClassName = props.descriptionClassName, captionClassName = props.captionClassName, model = props.formItem, remark = props.remark, labelRemark = props.labelRemark, env = props.env, hint = props.hint, renderLabel = props.renderLabel, renderDescription = props.renderDescription, data = props.data, showErrorMsg = props.showErrorMsg, useMobileUI = props.useMobileUI; props.translate;
             var labelWidth = props.labelWidth || props.formLabelWidth;
             description = description || desc;
             return (React__default["default"].createElement("div", { "data-role": "form-item", className: cx("Form-item Form-item--inline", className, (_a = {
@@ -516,7 +523,7 @@ var FormItemWrap = /** @class */ (function (_super) {
                     },
                     _a["is-required"] = required,
                     _a), model === null || model === void 0 ? void 0 : model.errClassNames) },
-                label && renderLabel !== false ? (React__default["default"].createElement("label", { className: cx("Form-label", labelClassName), style: labelWidth != null ? { width: labelWidth } : undefined },
+                label && renderLabel !== false ? (React__default["default"].createElement("label", { className: cx("Form-label", getItemLabelClassName(props)), style: labelWidth != null ? { width: labelWidth } : undefined },
                     React__default["default"].createElement("span", null,
                         label
                             ? render('label', typeof label === 'string' ? tpl.filter(label, data) : label)
@@ -574,7 +581,7 @@ var FormItemWrap = /** @class */ (function (_super) {
         },
         row: function (props, renderControl) {
             var _a;
-            var className = props.className, cx = props.classnames, desc = props.desc, description = props.description, label = props.label, labelClassName = props.labelClassName, render = props.render, required = props.required, caption = props.caption, remark = props.remark, labelRemark = props.labelRemark, env = props.env, descriptionClassName = props.descriptionClassName, captionClassName = props.captionClassName, model = props.formItem, renderLabel = props.renderLabel, renderDescription = props.renderDescription, hint = props.hint, data = props.data, showErrorMsg = props.showErrorMsg, useMobileUI = props.useMobileUI; props.translate;
+            var className = props.className, cx = props.classnames, desc = props.desc, description = props.description, label = props.label, render = props.render, required = props.required, caption = props.caption, remark = props.remark, labelRemark = props.labelRemark, env = props.env, descriptionClassName = props.descriptionClassName, captionClassName = props.captionClassName, model = props.formItem, renderLabel = props.renderLabel, renderDescription = props.renderDescription, hint = props.hint, data = props.data, showErrorMsg = props.showErrorMsg, useMobileUI = props.useMobileUI; props.translate;
             var labelWidth = props.labelWidth || props.formLabelWidth;
             description = description || desc;
             return (React__default["default"].createElement("div", { "data-role": "form-item", className: cx("Form-item Form-item--row", className, (_a = {
@@ -583,7 +590,7 @@ var FormItemWrap = /** @class */ (function (_super) {
                     _a["is-required"] = required,
                     _a), model === null || model === void 0 ? void 0 : model.errClassNames) },
                 React__default["default"].createElement("div", { className: cx('Form-rowInner') },
-                    label && renderLabel !== false ? (React__default["default"].createElement("label", { className: cx("Form-label", labelClassName), style: labelWidth != null ? { width: labelWidth } : undefined },
+                    label && renderLabel !== false ? (React__default["default"].createElement("label", { className: cx("Form-label", getItemLabelClassName(props)), style: labelWidth != null ? { width: labelWidth } : undefined },
                         React__default["default"].createElement("span", null,
                             render('label', typeof label === 'string' ? tpl.filter(label, data) : label),
                             required && (label || labelRemark) ? (React__default["default"].createElement("span", { className: cx("Form-star") }, "*")) : null,
@@ -698,6 +705,7 @@ var detectProps = [
     'desc',
     'description',
     'disabled',
+    'static',
     'draggable',
     'editable',
     'editButtonClassName',
@@ -802,7 +810,7 @@ function asFormItem(config) {
                 };
                 class_1.prototype.renderControl = function () {
                     var _a;
-                    var _b = this.props, inputClassName = _b.inputClassName, model = _b.formItem, cx = _b.classnames; _b.children; var type = _b.type, size = _b.size, defaultSize = _b.defaultSize, useMobileUI = _b.useMobileUI, rest = tslib.__rest(_b, ["inputClassName", "formItem", "classnames", "children", "type", "size", "defaultSize", "useMobileUI"]);
+                    var _b = this.props, model = _b.formItem, cx = _b.classnames; _b.children; var type = _b.type, size = _b.size, defaultSize = _b.defaultSize, useMobileUI = _b.useMobileUI, rest = tslib.__rest(_b, ["formItem", "classnames", "children", "type", "size", "defaultSize", "useMobileUI"]);
                     var controlSize = size || defaultSize;
                     var mobileUI = useMobileUI && helper.isMobile();
                     //@ts-ignore
@@ -816,7 +824,7 @@ function asFormItem(config) {
                                     typeof controlSize === 'string' &&
                                     !!controlSize &&
                                     controlSize !== 'full',
-                                _a), model === null || model === void 0 ? void 0 : model.errClassNames, inputClassName) })),
+                                _a), model === null || model === void 0 ? void 0 : model.errClassNames, getItemInputClassName(this.props)) })),
                         isOpened ? this.buildSchema() : null));
                 };
                 return class_1;

package/lib/renderers/Options.d.ts

@@ -6,7 +6,7 @@ import { Api, PlainObject, OptionProps, BaseApiObject } from '../types';
 import { FormControlProps, FormItemBasicConfig, FormBaseControl } from './Item';
 export declare type OptionsControlComponent = React.ComponentType<FormControlProps>;
 import React from 'react';
-import { Option } from '../types';
+import type { Option } from '../types';
 export { Option };
 export interface FormOptionsControl extends FormBaseControl {
     /**

package/lib/renderers/Options.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v2.3.1
+ * amis-core v2.4.0
  * Copyright 2018-2022 fex
  */
 
@@ -27,7 +27,30 @@ var findIndex = require('lodash/findIndex');
 var isPlainObject = require('lodash/isPlainObject');
 var normalizeOptions = require('../utils/normalizeOptions.js');
 var optionValueCompare = require('../utils/optionValueCompare.js');
+require('../utils/ColorScale.js');
+require('lodash/chunk');
+require('../utils/DataSchema.js');
+require('../utils/DataScope.js');
+require('../utils/debug.js');
+require('react-dom');
+require('../utils/errors.js');
+require('classnames');
+require('lodash/isObject');
+require('lodash/isString');
+require('lodash/isBoolean');
+require('lodash');
+require('../utils/image.js');
 var keyToPath = require('../utils/keyToPath.js');
+var rendererEvent = require('../utils/renderer-event.js');
+require('../utils/resize-sensor.js');
+require('../node_modules/dom-helpers/esm/addEventListener.js');
+require('../utils/SimpleMap.js');
+require('lodash/mapValues');
+require('lodash/camelCase');
+require('uncontrollable');
+require('hoist-non-react-statics');
+require('../utils/validations.js');
+require('../utils/Animation.js');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
@@ -160,19 +183,17 @@ function registerOptionsControl(config) {
         FormOptionsItem.prototype.dispatchOptionEvent = function (eventName, eventData) {
             if (eventData === void 0) { eventData = ''; }
             return tslib.__awaiter(this, void 0, void 0, function () {
-                var _a, dispatchEvent, options, data, rendererEvent;
+                var _a, dispatchEvent, options, rendererEvent$1;
                 return tslib.__generator(this, function (_b) {
                     switch (_b.label) {
                         case 0:
-                            _a = this.props, dispatchEvent = _a.dispatchEvent, options = _a.options, data = _a.data;
-                            return [4 /*yield*/, dispatchEvent(eventName, object.createObject(data, {
-                                    value: eventData,
-                                    options: options
-                                }))];
+                            _a = this.props, dispatchEvent = _a.dispatchEvent, options = _a.options;
+                            return [4 /*yield*/, dispatchEvent(eventName, rendererEvent.resolveEventData(this.props, { value: eventData, options: options, items: options }, // 为了保持名字统一
+                                'value'))];
                         case 1:
-                            rendererEvent = _b.sent();
+                            rendererEvent$1 = _b.sent();
                             // 返回阻塞标识
-                            return [2 /*return*/, !!(rendererEvent === null || rendererEvent === void 0 ? void 0 : rendererEvent.prevented)];
+                            return [2 /*return*/, !!(rendererEvent$1 === null || rendererEvent$1 === void 0 ? void 0 : rendererEvent$1.prevented)];
                     }
                 });
             });

package/lib/renderers/Placeholder.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v2.3.1
+ * amis-core v2.4.0
  * Copyright 2018-2022 fex
  */
 

package/lib/renderers/builtin.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v2.3.1
+ * amis-core v2.4.0
  * Copyright 2018-2022 fex
  */
 

package/lib/renderers/wrapControl.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v2.3.1
+ * amis-core v2.4.0
  * Copyright 2018-2022 fex
  */
 

package/lib/store/app.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v2.3.1
+ * amis-core v2.4.0
  * Copyright 2018-2022 fex
  */
 

package/lib/store/combo.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v2.3.1
+ * amis-core v2.4.0
  * Copyright 2018-2022 fex
  */
 

package/lib/store/crud.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v2.3.1
+ * amis-core v2.4.0
  * Copyright 2018-2022 fex
  */
 

package/lib/store/form.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v2.3.1
+ * amis-core v2.4.0
  * Copyright 2018-2022 fex
  */
 
@@ -86,7 +86,7 @@ var FormStore = service.ServiceStore.named('FormStore')
                 if (current.storeType === 'FormItemStore') {
                     formItems.push(current);
                 }
-                else if (current.storeType !== 'ComboStore') {
+                else if (!['ComboStore', 'TableStore'].includes(current.storeType)) {
                     pool.push.apply(pool, current.children);
                 }
             }

package/lib/store/formItem.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v2.3.1
+ * amis-core v2.4.0
  * Copyright 2018-2022 fex
  */
 

package/lib/store/iRenderer.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v2.3.1
+ * amis-core v2.4.0
  * Copyright 2018-2022 fex
  */
 

package/lib/store/index.d.ts

@@ -1,18 +1,31 @@
 import { Instance } from 'mobx-state-tree';
-import { iRendererStore, IIRendererStore } from './iRenderer';
-import { IServiceStore, ServiceStore } from './service';
-import { ComboStore, IComboStore } from './combo';
-import { FormStore, IFormStore } from './form';
-import { CRUDStore, ICRUDStore } from './crud';
-import { IColumn, IRow, ITableStore, TableStore } from './table';
-import { IColumn2, IRow2, ITableStore2, TableStore2 } from './table2';
-import { IListStore, ListStore } from './list';
-import { IModalStore, ModalStore } from './modal';
+import { iRendererStore } from './iRenderer';
+import type { IIRendererStore } from './iRenderer';
+import { ServiceStore } from './service';
+import type { IServiceStore } from './service';
+import { ComboStore } from './combo';
+import type { IComboStore } from './combo';
+import { FormStore } from './form';
+import type { IFormStore } from './form';
+import { CRUDStore } from './crud';
+import type { ICRUDStore } from './crud';
+import { TableStore } from './table';
+import type { IColumn, IRow, ITableStore } from './table';
+import { TableStore2 } from './table2';
+import type { IColumn2, IRow2, ITableStore2 } from './table2';
+import { ListStore } from './list';
+import type { IListStore } from './list';
+import { ModalStore } from './modal';
+import type { IModalStore } from './modal';
 import { TranslateFn } from '../locale';
-import { IStoreNode, StoreNode } from './node';
-import { FormItemStore, IFormItemStore } from './formItem';
-import { IPaginationStore, PaginationStore } from './pagination';
-import { AppStore, IAppStore } from './app';
+import { StoreNode } from './node';
+import type { IStoreNode } from './node';
+import { FormItemStore } from './formItem';
+import type { IFormItemStore } from './formItem';
+import { PaginationStore } from './pagination';
+import type { IPaginationStore } from './pagination';
+import { AppStore } from './app';
+import type { IAppStore } from './app';
 export declare const RendererStore: import("mobx-state-tree").IModelType<{
     storeType: import("mobx-state-tree").IType<string | undefined, string, string>;
 }, {

package/lib/store/index.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v2.3.1
+ * amis-core v2.4.0
  * Copyright 2018-2022 fex
  */
 
@@ -29,7 +29,7 @@ function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'defau
 
 var find__default = /*#__PURE__*/_interopDefaultLegacy(find);
 
-mobxStateTree.setLivelinessChecking(process.env.NODE_ENV === 'production' ? 'ignore' : 'error');
+mobxStateTree.setLivelinessChecking('ignore' );
 var allowedStoreList = [
     service.ServiceStore,
     form.FormStore,

package/lib/store/list.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v2.3.1
+ * amis-core v2.4.0
  * Copyright 2018-2022 fex
  */
 

package/lib/store/manager.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v2.3.1
+ * amis-core v2.4.0
  * Copyright 2018-2022 fex
  */
 

package/lib/store/modal.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v2.3.1
+ * amis-core v2.4.0
  * Copyright 2018-2022 fex
  */
 

package/lib/store/node.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v2.3.1
+ * amis-core v2.4.0
  * Copyright 2018-2022 fex
  */
 

package/lib/store/pagination.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v2.3.1
+ * amis-core v2.4.0
  * Copyright 2018-2022 fex
  */
 

package/lib/store/root.d.ts

@@ -33,6 +33,7 @@ export declare const RootStore: import("mobx-state-tree").IModelType<{
     query: import("mobx-state-tree").IType<any, any, any>;
     visibleState: import("mobx-state-tree").IOptionalIType<import("mobx-state-tree").IType<any, any, any>, [undefined]>;
     disableState: import("mobx-state-tree").IOptionalIType<import("mobx-state-tree").IType<any, any, any>, [undefined]>;
+    staticState: import("mobx-state-tree").IOptionalIType<import("mobx-state-tree").IType<any, any, any>, [undefined]>;
 }, {
     readonly parentStore: any;
     readonly __: any;
@@ -79,5 +80,6 @@ export declare const RootStore: import("mobx-state-tree").IModelType<{
     updateLocation(location?: any): void;
     setVisible(id: string, value: boolean): void;
     setDisable(id: string, value: boolean): void;
+    setStatic(id: string, value: boolean): void;
 }, import("mobx-state-tree")._NotCustomized, import("mobx-state-tree")._NotCustomized>;
 export declare type IRootStore = Instance<typeof RootStore>;

package/lib/store/root.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v2.3.1
+ * amis-core v2.4.0
  * Copyright 2018-2022 fex
  */
 
@@ -19,12 +19,13 @@ var RootStore = service.ServiceStore.named('RootStore')
     runtimeErrorStack: mobxStateTree.types.frozen(),
     query: mobxStateTree.types.frozen(),
     visibleState: mobxStateTree.types.optional(mobxStateTree.types.frozen(), {}),
-    disableState: mobxStateTree.types.optional(mobxStateTree.types.frozen(), {})
+    disableState: mobxStateTree.types.optional(mobxStateTree.types.frozen(), {}),
+    staticState: mobxStateTree.types.optional(mobxStateTree.types.frozen(), {})
 })
     .views(function (self) { return ({
     get downStream() {
         return self.query
-            ? object.createObject(tslib.__assign(tslib.__assign(tslib.__assign({}, (self.data && self.data.__super ? self.data.__super : null)), self.query), { __query: self.query }), self.data)
+            ? object.createObject(object.extendObject(self.data && self.data.__super ? self.data.__super : null, tslib.__assign(tslib.__assign({}, self.query), { __query: self.query })), self.data)
             : self.data;
     }
 }); })
@@ -45,6 +46,11 @@ var RootStore = service.ServiceStore.named('RootStore')
         var _a;
         var state = tslib.__assign(tslib.__assign({}, self.disableState), (_a = {}, _a[id] = value, _a));
         self.disableState = state;
+    },
+    setStatic: function (id, value) {
+        var _a;
+        var state = tslib.__assign(tslib.__assign({}, self.staticState), (_a = {}, _a[id] = value, _a));
+        self.staticState = state;
     }
 }); });
 

package/lib/store/service.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v2.3.1
+ * amis-core v2.4.0
  * Copyright 2018-2022 fex
  */
 

package/lib/store/table.d.ts

@@ -344,14 +344,14 @@ export declare const TableStore: import("mobx-state-tree").IModelType<{
         } & {
             readonly loading: boolean;
         } & {
-            markFetching: (fetching?: boolean) => void;
+            markFetching: (fetching?: boolean) => void; /** Group单元格显示名称，从1开始 */
             markSaving: (saving?: boolean) => void;
             markBusying: (busying?: boolean) => void;
-            fetchInitData: (api: import("..").Api, data?: object | undefined, options?: import("..").fetchOptions | undefined) => Promise<any>;
+            fetchInitData: (api: import("..").Api, data?: object | undefined, options?: import("..").fetchOptions | undefined) => Promise<any>; /** Group单元格包含的首列的索引值，范围[1, columns.length] */
             fetchData: (api: import("..").Api, data?: object | undefined, options?: import("..").fetchOptions | undefined) => Promise<any>;
             reInitData: (data: object | undefined, replace?: boolean) => void;
             updateMessage: (msg?: string | undefined, error?: boolean) => void;
-            clearMessage: () => void;
+            clearMessage: () => void; /** Group单元格包含列数 */
             setHasRemoteData: () => void;
             saveRemote: (api: import("..").Api, data?: object | undefined, options?: import("..").fetchOptions | undefined) => Promise<any>;
             fetchSchema: (api: import("..").Api, data?: object | undefined, options?: import("..").fetchOptions | undefined) => Promise<any>;
@@ -4585,14 +4585,14 @@ export declare const TableStore: import("mobx-state-tree").IModelType<{
         } & {
             readonly loading: boolean;
         } & {
-            markFetching: (fetching?: boolean) => void;
+            markFetching: (fetching?: boolean) => void; /** Group单元格显示名称，从1开始 */
             markSaving: (saving?: boolean) => void;
             markBusying: (busying?: boolean) => void;
-            fetchInitData: (api: import("..").Api, data?: object | undefined, options?: import("..").fetchOptions | undefined) => Promise<any>;
+            fetchInitData: (api: import("..").Api, data?: object | undefined, options?: import("..").fetchOptions | undefined) => Promise<any>; /** Group单元格包含的首列的索引值，范围[1, columns.length] */
             fetchData: (api: import("..").Api, data?: object | undefined, options?: import("..").fetchOptions | undefined) => Promise<any>;
             reInitData: (data: object | undefined, replace?: boolean) => void;
             updateMessage: (msg?: string | undefined, error?: boolean) => void;
-            clearMessage: () => void;
+            clearMessage: () => void; /** Group单元格包含列数 */
             setHasRemoteData: () => void;
             saveRemote: (api: import("..").Api, data?: object | undefined, options?: import("..").fetchOptions | undefined) => Promise<any>;
             fetchSchema: (api: import("..").Api, data?: object | undefined, options?: import("..").fetchOptions | undefined) => Promise<any>;

package/lib/store/table.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v2.3.1
+ * amis-core v2.4.0
  * Copyright 2018-2022 fex
  */
 
@@ -256,16 +256,8 @@ var TableStore = iRenderer.iRendererStore
         return self.columns.filter(function (item) {
             return (item &&
                 helper.isVisible(item.pristine, helper.hasVisibleExpression(item.pristine) ? self.data : {}) &&
-                (item.type === '__checkme'
-                    ? self.selectable &&
-                        !self.dragging &&
-                        !self.hideCheckToggler &&
-                        self.rows.length
-                    : item.type === '__dragme'
-                        ? self.dragging
-                        : item.type === '__expandme'
-                            ? (getFootableColumns().length || self.isNested) && !self.dragging
-                            : item.toggled || !item.toggable));
+                (item.toggled || !item.toggable) &&
+                !/^__/.test(item.type));
         });
     }
     function getFilteredColumns() {

package/lib/store/table2.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v2.3.1
+ * amis-core v2.4.0
  * Copyright 2018-2022 fex
  */
 

package/lib/theme.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v2.3.1
+ * amis-core v2.4.0
  * Copyright 2018-2022 fex
  */