amis 2.5.4-alpha.4 → 2.6.0

package/lib/renderers/Table2/TableCell.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.5.4-alpha.4
+ * amis v2.6.0
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/Table2/index.d.ts

@@ -1,6 +1,6 @@
 import React from 'react';
 import { IScopedContext, RendererProps, ActionObject, ITableStore2, IRow2, ClassNamesFn } from 'amis-core';
-import { BadgeObject } from 'amis-ui';
+import { BadgeObject, SpinnerExtraProps } from 'amis-ui';
 import type { SortProps, ColumnProps, OnRowProps, SummaryProps } from 'amis-ui/lib/components/table';
 import { BaseSchema, SchemaObject, SchemaTokenizeableString, SchemaApi, SchemaMessage } from '../../Schema';
 import { ActionSchema } from '../Action';
@@ -269,7 +269,7 @@ export interface TableSchema2 extends BaseSchema {
 }
 export type Table2RendererEvent = 'selected' | 'columnSort' | 'columnFilter' | 'columnSearch' | 'columnToggled' | 'dragOver';
 export type Table2RendererAction = 'selectAll' | 'clearAll' | 'select' | 'expand';
-export interface Table2Props extends RendererProps {
+export interface Table2Props extends RendererProps, SpinnerExtraProps {
     title?: string;
     columns: Array<ColumnSchema | ColumnProps>;
     onSelect?: Function;

package/lib/renderers/Table2/index.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.5.4-alpha.4
+ * amis v2.6.0
  * Copyright 2018-2022 baidu
  */
 
@@ -775,14 +775,14 @@ var Table2 = /** @class */ (function (_super) {
         return null;
     };
     Table2.prototype.render = function () {
-        var _a = this.props, cx = _a.classnames, style = _a.style, _b = _a.loading, loading = _b === void 0 ? false : _b;
+        var _a = this.props, cx = _a.classnames, style = _a.style, _b = _a.loading, loading = _b === void 0 ? false : _b, loadingConfig = _a.loadingConfig;
         this.renderedToolbars = []; // 用来记录哪些 toolbar 已经渲染了
         var heading = this.renderHeading();
         return (React__default["default"].createElement("div", { className: cx('Table-render-wrapper'), style: style },
             this.renderActions('header'),
             heading,
             this.renderTable(),
-            React__default["default"].createElement(amisUi.Spinner, { overlay: true, show: loading })));
+            React__default["default"].createElement(amisUi.Spinner, { overlay: true, show: loading, loadingConfig: loadingConfig })));
     };
     Table2.contextType = amisCore.ScopedContext;
     tslib.__decorate([

package/lib/renderers/TableView.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.5.4-alpha.4
+ * amis v2.6.0
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/Tabs.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.5.4-alpha.4
+ * amis v2.6.0
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/Tag.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.5.4-alpha.4
+ * amis v2.6.0
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/Tasks.d.ts

@@ -2,12 +2,13 @@ import React from 'react';
 import { RendererProps } from 'amis-core';
 import { Payload } from 'amis-core';
 import { IScopedContext } from 'amis-core';
+import { SpinnerExtraProps } from 'amis-ui';
 import { BaseSchema, SchemaApi, SchemaClassName, SchemaName } from '../Schema';
 /**
  * Tasks 渲染器，格式说明
  * 文档：https://baidu.gitee.io/amis/docs/components/tasks
  */
-export interface TasksSchema extends BaseSchema {
+export interface TasksSchema extends BaseSchema, SpinnerExtraProps {
     /** 指定为任务类型 */
     type: 'tasks';
     btnClassName?: SchemaClassName;

package/lib/renderers/Tasks.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.5.4-alpha.4
+ * amis v2.6.0
  * Copyright 2018-2022 baidu
  */
 
@@ -140,7 +140,7 @@ var Task = /** @class */ (function (_super) {
     };
     Task.prototype.render = function () {
         var _this = this;
-        var _a = this.props, cx = _a.classnames, className = _a.className, style = _a.style, tableClassName = _a.tableClassName, taskNameLabel = _a.taskNameLabel, operationLabel = _a.operationLabel, statusLabel = _a.statusLabel, remarkLabel = _a.remarkLabel, btnText = _a.btnText, retryBtnText = _a.retryBtnText, btnClassName = _a.btnClassName, retryBtnClassName = _a.retryBtnClassName, statusLabelMap = _a.statusLabelMap, statusTextMap = _a.statusTextMap, readyStatusCode = _a.readyStatusCode, loadingStatusCode = _a.loadingStatusCode, canRetryStatusCode = _a.canRetryStatusCode, __ = _a.translate, render = _a.render;
+        var _a = this.props, cx = _a.classnames, className = _a.className, style = _a.style, tableClassName = _a.tableClassName, taskNameLabel = _a.taskNameLabel, operationLabel = _a.operationLabel, statusLabel = _a.statusLabel, remarkLabel = _a.remarkLabel, btnText = _a.btnText, retryBtnText = _a.retryBtnText, btnClassName = _a.btnClassName, retryBtnClassName = _a.retryBtnClassName, statusLabelMap = _a.statusLabelMap, statusTextMap = _a.statusTextMap, readyStatusCode = _a.readyStatusCode, loadingStatusCode = _a.loadingStatusCode, canRetryStatusCode = _a.canRetryStatusCode, __ = _a.translate, render = _a.render, loadingConfig = _a.loadingConfig;
         var items = this.state.items;
         var error = this.state.error;
         return (React__default["default"].createElement("div", { className: cx('Table-content', className), style: style },
@@ -155,7 +155,7 @@ var Task = /** @class */ (function (_super) {
                     React__default["default"].createElement("td", { colSpan: 4 },
                         React__default["default"].createElement("div", { className: "text-danger" }, error)))) : (items.map(function (item, key) { return (React__default["default"].createElement("tr", { key: key },
                     React__default["default"].createElement("td", null, item.label),
-                    React__default["default"].createElement("td", null, item.status == loadingStatusCode ? (React__default["default"].createElement(amisUi.Spinner, { show: true, icon: "reload", spinnerClassName: cx('Task-spinner') })) : item.status == canRetryStatusCode ? (React__default["default"].createElement("a", { onClick: function () { return _this.submitTask(item, key, true); }, className: cx('Button', 'Button--danger', 'Button--size-md', retryBtnClassName || btnClassName) }, retryBtnText || btnText)) : (React__default["default"].createElement("a", { onClick: function () { return _this.submitTask(item, key); }, className: cx('Button', 'Button--default', 'Button--size-md', btnClassName, {
+                    React__default["default"].createElement("td", null, item.status == loadingStatusCode ? (React__default["default"].createElement(amisUi.Spinner, { loadingConfig: loadingConfig, show: true, icon: "reload", spinnerClassName: cx('Task-spinner') })) : item.status == canRetryStatusCode ? (React__default["default"].createElement("a", { onClick: function () { return _this.submitTask(item, key, true); }, className: cx('Button', 'Button--danger', 'Button--size-md', retryBtnClassName || btnClassName) }, retryBtnText || btnText)) : (React__default["default"].createElement("a", { onClick: function () { return _this.submitTask(item, key); }, className: cx('Button', 'Button--default', 'Button--size-md', btnClassName, {
                             disabled: item.status !== readyStatusCode
                         }) }, btnText))),
                     React__default["default"].createElement("td", null,

package/lib/renderers/Timeline.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.5.4-alpha.4
+ * amis v2.6.0
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/TooltipWrapper.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.5.4-alpha.4
+ * amis v2.6.0
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/Tpl.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.5.4-alpha.4
+ * amis v2.6.0
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/VBox.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.5.4-alpha.4
+ * amis v2.6.0
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/Video.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.5.4-alpha.4
+ * amis v2.6.0
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/WebComponent.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.5.4-alpha.4
+ * amis v2.6.0
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/Wizard.d.ts

@@ -3,6 +3,7 @@ import { IScopedContext } from 'amis-core';
 import { RendererProps } from 'amis-core';
 import { IServiceStore } from 'amis-core';
 import { ActionObject } from 'amis-core';
+import { SpinnerExtraProps } from 'amis-ui';
 import { BaseSchema, FormSchema, SchemaApi, SchemaClassName, SchemaExpression, SchemaName, SchemaReload } from '../Schema';
 import { ActionSchema } from './Action';
 export type WizardStepSchema = Omit<FormSchema, 'type'> & {
@@ -46,7 +47,7 @@ export type WizardStepSchema = Omit<FormSchema, 'type'> & {
  * 表单向导
  * 文档：https://baidu.gitee.io/amis/docs/components/wizard
  */
-export interface WizardSchema extends BaseSchema {
+export interface WizardSchema extends BaseSchema, SpinnerExtraProps {
     /**
      * 指定为表单向导
      */
@@ -176,4 +177,5 @@ export declare class WizardRenderer extends Wizard {
     reloadTarget(target: string, data: any): void;
     handleDialogConfirm(values: object[], action: ActionObject, targets: Array<any>): void;
     setData(values: object, replace?: boolean): void;
+    getData(): any;
 }

package/lib/renderers/Wizard.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.5.4-alpha.4
+ * amis v2.6.0
  * Copyright 2018-2022 baidu
  */
 
@@ -724,7 +724,7 @@ var Wizard = /** @class */ (function (_super) {
                 React__default["default"].createElement("div", { className: cx('Panel-footer') }, actions))) : null));
     };
     Wizard.prototype.renderWizard = function () {
-        var _a = this.props, className = _a.className, style = _a.style, steps = _a.steps, render = _a.render, store = _a.store, ns = _a.classPrefix, cx = _a.classnames, popOverContainer = _a.popOverContainer, mode = _a.mode, __ = _a.translate;
+        var _a = this.props, className = _a.className, style = _a.style, steps = _a.steps, render = _a.render, store = _a.store, ns = _a.classPrefix, cx = _a.classnames, popOverContainer = _a.popOverContainer, mode = _a.mode, __ = _a.translate, loadingConfig = _a.loadingConfig;
         var currentStep = this.state.currentStep;
         var step = Array.isArray(steps) ? steps[currentStep - 1] : null;
         return (React__default["default"].createElement("div", { ref: this.domRef, className: cx("".concat(ns, "Panel ").concat(ns, "Panel--default ").concat(ns, "Wizard ").concat(ns, "Wizard--").concat(mode), className), style: style },
@@ -754,7 +754,7 @@ var Wizard = /** @class */ (function (_super) {
                 onClose: this.handleDialogClose,
                 show: store.dialogOpen
             }),
-            React__default["default"].createElement(amisUi.Spinner, { size: "lg", overlay: true, key: "info", show: store.loading })));
+            React__default["default"].createElement(amisUi.Spinner, { loadingConfig: loadingConfig, size: "lg", overlay: true, key: "info", show: store.loading })));
     };
     Wizard.prototype.render = function () {
         return this.renderWizard();
@@ -910,6 +910,10 @@ function isJumpable(step, index, currentStep, data) {
     WizardRenderer.prototype.setData = function (values, replace) {
         return this.props.store.updateData(values, undefined, replace);
     };
+    WizardRenderer.prototype.getData = function () {
+        var store = this.props.store;
+        return store.data;
+    };
     WizardRenderer.contextType = amisCore.ScopedContext;
     tslib.__decorate([
         amisCore.autobind,

package/lib/renderers/Words.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.5.4-alpha.4
+ * amis v2.6.0
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/Wrapper.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.5.4-alpha.4
+ * amis v2.6.0
  * Copyright 2018-2022 baidu
  */
 

package/lib/schemaExtend.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.5.4-alpha.4
+ * amis v2.6.0
  * Copyright 2018-2022 baidu
  */
 

package/lib/themes/ang-ie11.css

@@ -11395,6 +11395,7 @@ input[type=button].a-Button--block {
     #f8f7fa;
   border-top-left-radius: 6px;
   border-top-right-radius: 6px;
+  z-index: 150;
 }
 .a-Modal-header::before, .a-Modal-header::after {
   display: table;
@@ -29431,6 +29432,7 @@ td.rdtQuarter.rdtDisabled:hover {
 }
 .a-TabsTransfer-tabs .a-Tabs-linksContainer {
   padding-left: 1.25rem;
+  padding-right: 1.25rem;
   padding-top: 0.5rem;
   background-color: #f7f7f9;
 }

package/lib/themes/ang.css

@@ -13997,6 +13997,7 @@ input[type=button].a-Button--block {
   border-bottom: var(--Modal-body-borderTop);
   border-top-left-radius: var(--Modal-content-borderRadius);
   border-top-right-radius: var(--Modal-content-borderRadius);
+  z-index: 150;
 }
 .a-Modal-header::before, .a-Modal-header::after {
   display: table;
@@ -31761,6 +31762,7 @@ td.rdtQuarter.rdtDisabled:hover {
 }
 .a-TabsTransfer-tabs .a-Tabs-linksContainer {
   padding-left: 1.25rem;
+  padding-right: 1.25rem;
   padding-top: 0.5rem;
   background-color: var(--TabsTransfer-title-bg);
 }

package/lib/themes/antd-ie11.css

@@ -11394,6 +11394,7 @@ input[type=button].antd-Button--block {
     #f7f9fa;
   border-top-left-radius: 6px;
   border-top-right-radius: 6px;
+  z-index: 150;
 }
 .antd-Modal-header::before, .antd-Modal-header::after {
   display: table;
@@ -29430,6 +29431,7 @@ td.rdtQuarter.rdtDisabled:hover {
 }
 .antd-TabsTransfer-tabs .antd-Tabs-linksContainer {
   padding-left: 1.25rem;
+  padding-right: 1.25rem;
   padding-top: 0.5rem;
   background-color: #f7f7f9;
 }

package/lib/themes/antd.css

@@ -13997,6 +13997,7 @@ input[type=button].antd-Button--block {
   border-bottom: var(--Modal-body-borderTop);
   border-top-left-radius: var(--Modal-content-borderRadius);
   border-top-right-radius: var(--Modal-content-borderRadius);
+  z-index: 150;
 }
 .antd-Modal-header::before, .antd-Modal-header::after {
   display: table;
@@ -31761,6 +31762,7 @@ td.rdtQuarter.rdtDisabled:hover {
 }
 .antd-TabsTransfer-tabs .antd-Tabs-linksContainer {
   padding-left: 1.25rem;
+  padding-right: 1.25rem;
   padding-top: 0.5rem;
   background-color: var(--TabsTransfer-title-bg);
 }

package/lib/themes/cxd-ie11.css

@@ -11394,6 +11394,7 @@ input[type=button].cxd-Button--block {
     #f7f8fa;
   border-top-left-radius: 6px;
   border-top-right-radius: 6px;
+  z-index: 150;
 }
 .cxd-Modal-header::before, .cxd-Modal-header::after {
   display: table;
@@ -29430,6 +29431,7 @@ td.rdtQuarter.rdtDisabled:hover {
 }
 .cxd-TabsTransfer-tabs .cxd-Tabs-linksContainer {
   padding-left: 1.25rem;
+  padding-right: 1.25rem;
   padding-top: 0.5rem;
   background-color: #f7f7f9;
 }

package/lib/themes/cxd.css

@@ -13993,6 +13993,7 @@ input[type=button].cxd-Button--block {
   border-bottom: var(--Modal-body-borderTop);
   border-top-left-radius: var(--Modal-content-borderRadius);
   border-top-right-radius: var(--Modal-content-borderRadius);
+  z-index: 150;
 }
 .cxd-Modal-header::before, .cxd-Modal-header::after {
   display: table;
@@ -31757,6 +31758,7 @@ td.rdtQuarter.rdtDisabled:hover {
 }
 .cxd-TabsTransfer-tabs .cxd-Tabs-linksContainer {
   padding-left: 1.25rem;
+  padding-right: 1.25rem;
   padding-top: 0.5rem;
   background-color: var(--TabsTransfer-title-bg);
 }

package/lib/themes/dark-ie11.css

@@ -11394,6 +11394,7 @@ input[type=button].dark-Button--block {
     #f7f9fa;
   border-top-left-radius: 6px;
   border-top-right-radius: 6px;
+  z-index: 150;
 }
 .dark-Modal-header::before, .dark-Modal-header::after {
   display: table;
@@ -29430,6 +29431,7 @@ td.rdtQuarter.rdtDisabled:hover {
 }
 .dark-TabsTransfer-tabs .dark-Tabs-linksContainer {
   padding-left: 1.25rem;
+  padding-right: 1.25rem;
   padding-top: 0.5rem;
   background-color: #f7f7f9;
 }

package/lib/themes/dark.css

@@ -13999,6 +13999,7 @@ input[type=button].dark-Button--block {
   border-bottom: var(--Modal-body-borderTop);
   border-top-left-radius: var(--Modal-content-borderRadius);
   border-top-right-radius: var(--Modal-content-borderRadius);
+  z-index: 150;
 }
 .dark-Modal-header::before, .dark-Modal-header::after {
   display: table;
@@ -31763,6 +31764,7 @@ td.rdtQuarter.rdtDisabled:hover {
 }
 .dark-TabsTransfer-tabs .dark-Tabs-linksContainer {
   padding-left: 1.25rem;
+  padding-right: 1.25rem;
   padding-top: 0.5rem;
   background-color: var(--TabsTransfer-title-bg);
 }

package/lib/themes/default-ie11.css

@@ -11394,6 +11394,7 @@ input[type=button].cxd-Button--block {
     #f7f8fa;
   border-top-left-radius: 6px;
   border-top-right-radius: 6px;
+  z-index: 150;
 }
 .cxd-Modal-header::before, .cxd-Modal-header::after {
   display: table;
@@ -29430,6 +29431,7 @@ td.rdtQuarter.rdtDisabled:hover {
 }
 .cxd-TabsTransfer-tabs .cxd-Tabs-linksContainer {
   padding-left: 1.25rem;
+  padding-right: 1.25rem;
   padding-top: 0.5rem;
   background-color: #f7f7f9;
 }

package/lib/themes/default.css

@@ -13993,6 +13993,7 @@ input[type=button].cxd-Button--block {
   border-bottom: var(--Modal-body-borderTop);
   border-top-left-radius: var(--Modal-content-borderRadius);
   border-top-right-radius: var(--Modal-content-borderRadius);
+  z-index: 150;
 }
 .cxd-Modal-header::before, .cxd-Modal-header::after {
   display: table;
@@ -31757,6 +31758,7 @@ td.rdtQuarter.rdtDisabled:hover {
 }
 .cxd-TabsTransfer-tabs .cxd-Tabs-linksContainer {
   padding-left: 1.25rem;
+  padding-right: 1.25rem;
   padding-top: 0.5rem;
   background-color: var(--TabsTransfer-title-bg);
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "amis",
-  "version": "2.5.4-alpha.4",
+  "version": "2.6.0",
   "description": "一种MIS页面生成工具",
   "main": "lib/index.js",
   "module": "esm/index.js",
@@ -41,8 +41,8 @@
     ]
   },
   "dependencies": {
-    "amis-core": "^2.5.4-alpha.4",
-    "amis-ui": "^2.5.4-alpha.4",
+    "amis-core": "^2.6.0",
+    "amis-ui": "^2.6.0",
     "attr-accept": "2.2.2",
     "blueimp-canvastoblob": "2.1.0",
     "classnames": "2.3.1",
@@ -235,5 +235,5 @@
     "react": ">=16.8.6",
     "react-dom": ">=16.8.6"
   },
-  "gitHead": "2de0b44b8fcebc9e869c72e5a566b07776b1530f"
+  "gitHead": "eb43508d3e904813dd2dc24e4174e45f2fbf8ebf"
 }

package/revision.json

@@ -0,0 +1,7 @@
+{
+  "branch": "master",
+  "SHA1": "418a5f45",
+  "message": "fix: 显示列字段不展示隐藏列 (#5307)",
+  "author": "RUNZE LU",
+  "date": "2022-09-05 15:12:09"
+}