npm - amis - Versions diffs - 2.0.0-rc.20 → 2.0.0 - Mend

@@ -1,5 +1,5 @@
 /**
- * amis v2.0.0-rc.20
+ * amis v2.0.0
  * Copyright 2018-2022 baidu
  */
@@ -800,7 +800,8 @@ var Table = /** @class */ (function (_super) {
     // 垂直线拖拽移动
     Table.prototype.handleColResizeMouseMove = function (e) {
         var moveX = e.clientX - this.lineStartX;
-        this.resizeLine.style.left = this.resizeLineLeft + moveX + 'px';
+        // 光标right为-4px，列宽改变时会自动跟随，不需要单独处理位置
+        // this.resizeLine.style.left = this.resizeLineLeft + moveX + 'px';
         this.targetTh.style.width = this.targetThWidth + moveX + 'px';
     };
     // 垂直线拖拽结束
@@ -1318,11 +1319,13 @@ var Table = /** @class */ (function (_super) {
             : footerNode || toolbarNode || null;
     };
     Table.prototype.renderTableContent = function () {
-        var _a = this.props, cx = _a.classnames, tableClassName = _a.tableClassName, store = _a.store, placeholder = _a.placeholder, render = _a.render, checkOnItemClick = _a.checkOnItemClick, buildItemProps = _a.buildItemProps, rowClassNameExpr = _a.rowClassNameExpr, rowClassName = _a.rowClassName, prefixRow = _a.prefixRow, locale = _a.locale, affixRow = _a.affixRow, tableContentClassName = _a.tableContentClassName, translate = _a.translate, itemAction = _a.itemAction; _a.affixRowClassNameExpr; var affixRowClassName = _a.affixRowClassName; _a.prefixRowClassNameExpr; var prefixRowClassName = _a.prefixRowClassName; _a.autoFillHeight; var itemActions = _a.itemActions, dispatchEvent = _a.dispatchEvent, onEvent = _a.onEvent, loading = _a.loading;
+        var _a = this.props, cx = _a.classnames, tableClassName = _a.tableClassName, store = _a.store, placeholder = _a.placeholder, render = _a.render, checkOnItemClick = _a.checkOnItemClick, buildItemProps = _a.buildItemProps, rowClassNameExpr = _a.rowClassNameExpr, rowClassName = _a.rowClassName, prefixRow = _a.prefixRow, locale = _a.locale, affixRow = _a.affixRow, tableContentClassName = _a.tableContentClassName, translate = _a.translate, itemAction = _a.itemAction; _a.affixRowClassNameExpr; var affixRowClassName = _a.affixRowClassName; _a.prefixRowClassNameExpr; var prefixRowClassName = _a.prefixRowClassName; _a.autoFillHeight; var itemActions = _a.itemActions, dispatchEvent = _a.dispatchEvent, onEvent = _a.onEvent, _b = _a.loading, loading = _b === void 0 ? false : _b;
         // 理论上来说 store.rows 应该也行啊
         // 不过目前看来只有这样写它才会重新更新视图
         store.rows.length;
-        return (React__default["default"].createElement(TableContent.TableContent, { tableClassName: cx(store.combineNum > 0 ? 'Table-table--withCombine' : '', { 'Table-table--checkOnItemClick': checkOnItemClick }, tableClassName), className: tableContentClassName, itemActions: itemActions, itemAction: itemAction, store: store, classnames: cx, columns: store.filteredColumns, columnsGroup: store.columnGroup, rows: store.rows, placeholder: placeholder, render: render, onMouseMove: this.handleMouseMove, onScroll: this.handleOutterScroll, tableRef: this.tableRef, renderHeadCell: this.renderHeadCell, renderCell: this.renderCell, onCheck: this.handleCheck, onQuickChange: store.dragging ? undefined : this.handleQuickChange, footable: store.footable, footableColumns: store.footableColumns, checkOnItemClick: checkOnItemClick, buildItemProps: buildItemProps, onAction: this.handleAction, rowClassNameExpr: rowClassNameExpr, rowClassName: rowClassName, data: store.data, prefixRow: prefixRow, affixRow: affixRow, prefixRowClassName: prefixRowClassName, affixRowClassName: affixRowClassName, locale: locale, translate: translate, dispatchEvent: dispatchEvent, onEvent: onEvent, loading: loading }));
+        return (React__default["default"].createElement(React__default["default"].Fragment, null,
+            React__default["default"].createElement(TableContent.TableContent, { tableClassName: cx(store.combineNum > 0 ? 'Table-table--withCombine' : '', { 'Table-table--checkOnItemClick': checkOnItemClick }, tableClassName), className: tableContentClassName, itemActions: itemActions, itemAction: itemAction, store: store, classnames: cx, columns: store.filteredColumns, columnsGroup: store.columnGroup, rows: store.rows, placeholder: placeholder, render: render, onMouseMove: this.handleMouseMove, onScroll: this.handleOutterScroll, tableRef: this.tableRef, renderHeadCell: this.renderHeadCell, renderCell: this.renderCell, onCheck: this.handleCheck, onQuickChange: store.dragging ? undefined : this.handleQuickChange, footable: store.footable, footableColumns: store.footableColumns, checkOnItemClick: checkOnItemClick, buildItemProps: buildItemProps, onAction: this.handleAction, rowClassNameExpr: rowClassNameExpr, rowClassName: rowClassName, data: store.data, prefixRow: prefixRow, affixRow: affixRow, prefixRowClassName: prefixRowClassName, affixRowClassName: affixRowClassName, locale: locale, translate: translate, dispatchEvent: dispatchEvent, onEvent: onEvent, loading: loading }),
+            React__default["default"].createElement(amisUi.Spinner, { overlay: true, show: loading })));
     };
     Table.prototype.doAction = function (action, args, throwErrors) {
         var _a = this.props, store = _a.store, valueField = _a.valueField, data = _a.data;

package/lib/renderers/Table-v2/ColumnToggler.js CHANGED Viewed

@@ -1,5 +1,5 @@
 /**
- * amis v2.0.0-rc.20
+ * amis v2.0.0
  * Copyright 2018-2022 baidu
  */

package/lib/renderers/Table-v2/HeadCellSearchDropdown.js CHANGED Viewed

@@ -1,5 +1,5 @@
 /**
- * amis v2.0.0-rc.20
+ * amis v2.0.0
  * Copyright 2018-2022 baidu
  */

package/lib/renderers/Table-v2/TableCell.js CHANGED Viewed

@@ -1,5 +1,5 @@
 /**
- * amis v2.0.0-rc.20
+ * amis v2.0.0
  * Copyright 2018-2022 baidu
  */

package/lib/renderers/Table-v2/index.js CHANGED Viewed

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

package/lib/renderers/TableView.js CHANGED Viewed

@@ -1,5 +1,5 @@
 /**
- * amis v2.0.0-rc.20
+ * amis v2.0.0
  * Copyright 2018-2022 baidu
  */

package/lib/renderers/Tabs.js CHANGED Viewed

@@ -1,5 +1,5 @@
 /**
- * amis v2.0.0-rc.20
+ * amis v2.0.0
  * Copyright 2018-2022 baidu
  */

package/lib/renderers/Tag.js CHANGED Viewed

@@ -1,5 +1,5 @@
 /**
- * amis v2.0.0-rc.20
+ * amis v2.0.0
  * Copyright 2018-2022 baidu
  */

package/lib/renderers/Tasks.js CHANGED Viewed

@@ -1,5 +1,5 @@
 /**
- * amis v2.0.0-rc.20
+ * amis v2.0.0
  * Copyright 2018-2022 baidu
  */

package/lib/renderers/Timeline.js CHANGED Viewed

@@ -1,5 +1,5 @@
 /**
- * amis v2.0.0-rc.20
+ * amis v2.0.0
  * Copyright 2018-2022 baidu
  */

package/lib/renderers/TooltipWrapper.js CHANGED Viewed

@@ -1,5 +1,5 @@
 /**
- * amis v2.0.0-rc.20
+ * amis v2.0.0
  * Copyright 2018-2022 baidu
  */
@@ -30,7 +30,7 @@ var TooltipWrapper = /** @class */ (function (_super) {
             }), style: amisCore.buildStyle(style, data) }, render('body', body)));
     };
     TooltipWrapper.prototype.render = function () {
-        var _a = this.props, ns = _a.classPrefix, cx = _a.classnames, tooltipClassName = _a.tooltipClassName, tooltipTheme = _a.tooltipTheme, container = _a.container, placement = _a.placement, rootClose = _a.rootClose, tooltipStyle = _a.tooltipStyle, title = _a.title, content = _a.content, tooltip = _a.tooltip, mouseEnterDelay = _a.mouseEnterDelay, mouseLeaveDelay = _a.mouseLeaveDelay, trigger = _a.trigger, offset = _a.offset, showArrow = _a.showArrow, disabled = _a.disabled, enterable = _a.enterable, data = _a.data;
+        var _a = this.props, ns = _a.classPrefix, cx = _a.classnames, tooltipClassName = _a.tooltipClassName, tooltipTheme = _a.tooltipTheme, container = _a.container, placement = _a.placement, rootClose = _a.rootClose, tooltipStyle = _a.tooltipStyle, title = _a.title, content = _a.content, tooltip = _a.tooltip, mouseEnterDelay = _a.mouseEnterDelay, mouseLeaveDelay = _a.mouseLeaveDelay, trigger = _a.trigger, offset = _a.offset, showArrow = _a.showArrow, disabled = _a.disabled, enterable = _a.enterable, data = _a.data, env = _a.env;
         var tooltipObj = {
             title: amisCore.filter(title, data),
             content: amisCore.filter(content || tooltip, data),
@@ -38,7 +38,7 @@ var TooltipWrapper = /** @class */ (function (_super) {
             placement: placement,
             trigger: trigger,
             rootClose: rootClose,
-            container: container,
+            container: container !== undefined ? container : (env && env.getModalContainer ? env.getModalContainer : undefined),
             tooltipTheme: tooltipTheme,
             tooltipClassName: tooltipClassName,
             mouseEnterDelay: mouseEnterDelay,

package/lib/renderers/Tpl.js CHANGED Viewed

@@ -1,5 +1,5 @@
 /**
- * amis v2.0.0-rc.20
+ * amis v2.0.0
  * Copyright 2018-2022 baidu
  */

package/lib/renderers/VBox.js CHANGED Viewed

@@ -1,5 +1,5 @@
 /**
- * amis v2.0.0-rc.20
+ * amis v2.0.0
  * Copyright 2018-2022 baidu
  */

package/lib/renderers/Video.js CHANGED Viewed

@@ -1,5 +1,5 @@
 /**
- * amis v2.0.0-rc.20
+ * amis v2.0.0
  * Copyright 2018-2022 baidu
  */

package/lib/renderers/WebComponent.js CHANGED Viewed

@@ -1,5 +1,5 @@
 /**
- * amis v2.0.0-rc.20
+ * amis v2.0.0
  * Copyright 2018-2022 baidu
  */

package/lib/renderers/Wizard.d.ts CHANGED Viewed

@@ -158,7 +158,7 @@ export default class Wizard extends React.Component<WizardProps, WizardState> {
     handleInit(values: any): void;
     handleReset(values: any): void;
     finalSubmit(values?: object, action?: ActionObject): Promise<void>;
-    handleSubmit(values: object, action: ActionObject): Promise<boolean>;
+    handleSubmit(values: object, action: ActionObject): boolean;
     handleDialogConfirm(values: object[], action: ActionObject, targets: Array<any>): void;
     handleDialogClose(confirmed?: boolean): void;
     renderSteps(): JSX.Element;

package/lib/renderers/Wizard.js CHANGED Viewed

@@ -1,5 +1,5 @@
 /**
- * amis v2.0.0-rc.20
+ * amis v2.0.0
  * Copyright 2018-2022 baidu
  */
@@ -546,82 +546,77 @@ var Wizard = /** @class */ (function (_super) {
     };
     // 接管里面 form 的提交，不能直接让 form 提交，因为 wizard 自己需要知道进度。
     Wizard.prototype.handleSubmit = function (values, action) {
-        return tslib.__awaiter(this, void 0, void 0, function () {
-            var _a, store, steps, finishedField, step, finnalAsyncApi_2;
-            var _b;
-            var _this = this;
-            return tslib.__generator(this, function (_c) {
-                _a = this.props, store = _a.store, steps = _a.steps, finishedField = _a.finishedField;
-                if (this.state.currentStep < steps.length) {
-                    step = steps[this.state.currentStep - 1];
-                    store.updateData(values);
-                    finnalAsyncApi_2 = action.asyncApi || step.asyncApi;
-                    amisCore.isEffectiveApi(finnalAsyncApi_2, store.data) &&
-                        store.updateData((_b = {},
-                            _b[finishedField || 'finished'] = false,
-                            _b));
-                    if (amisCore.isEffectiveApi(action.api || step.api, store.data)) {
-                        store
-                            .saveRemote(action.api || step.api, store.data, {
-                            onSuccess: function () {
-                                _this.dispatchEvent('stepSubmitSucc');
-                                if (!amisCore.isEffectiveApi(finnalAsyncApi_2, store.data) ||
-                                    store.data[finishedField || 'finished']) {
-                                    return;
-                                }
-                                return amisCore.until(function () { return store.checkRemote(finnalAsyncApi_2, store.data); }, function (ret) { return ret && ret[finishedField || 'finished']; }, function (cancel) { return (_this.asyncCancel = cancel); });
-                            },
-                            onFailed: function (json) {
-                                _this.dispatchEvent('stepSubmitFail', { error: json });
-                                if (json.status === 422 && json.errors && _this.form) {
-                                    _this.form.props.store.setFormItemErrors(json.errors);
+        var _a;
+        var _this = this;
+        var _b = this.props, store = _b.store, steps = _b.steps, finishedField = _b.finishedField;
+        if (this.state.currentStep < steps.length) {
+            var step = steps[this.state.currentStep - 1];
+            store.updateData(values);
+            var finnalAsyncApi_2 = action.asyncApi || step.asyncApi;
+            amisCore.isEffectiveApi(finnalAsyncApi_2, store.data) &&
+                store.updateData((_a = {},
+                    _a[finishedField || 'finished'] = false,
+                    _a));
+            if (amisCore.isEffectiveApi(action.api || step.api, store.data)) {
+                store
+                    .saveRemote(action.api || step.api, store.data, {
+                    onSuccess: function () {
+                        _this.dispatchEvent('stepSubmitSucc');
+                        if (!amisCore.isEffectiveApi(finnalAsyncApi_2, store.data) ||
+                            store.data[finishedField || 'finished']) {
+                            return;
+                        }
+                        return amisCore.until(function () { return store.checkRemote(finnalAsyncApi_2, store.data); }, function (ret) { return ret && ret[finishedField || 'finished']; }, function (cancel) { return (_this.asyncCancel = cancel); });
+                    },
+                    onFailed: function (json) {
+                        _this.dispatchEvent('stepSubmitFail', { error: json });
+                        if (json.status === 422 && json.errors && _this.form) {
+                            _this.form.props.store.setFormItemErrors(json.errors);
+                        }
+                    }
+                })
+                    .then(function (value) { return tslib.__awaiter(_this, void 0, void 0, function () {
+                    var feedback, confirmed;
+                    return tslib.__generator(this, function (_a) {
+                        switch (_a.label) {
+                            case 0:
+                                feedback = action.feedback;
+                                if (!(feedback && amisCore.isVisible(feedback, value))) return [3 /*break*/, 2];
+                                return [4 /*yield*/, this.openFeedback(feedback, value)];
+                            case 1:
+                                confirmed = _a.sent();
+                                // 如果 feedback 配置了，取消就跳过原有逻辑。
+                                if (feedback.skipRestOnCancel && !confirmed) {
+                                    throw new amisCore.SkipOperation();
                                 }
-                            }
-                        })
-                            .then(function (value) { return tslib.__awaiter(_this, void 0, void 0, function () {
-                            var feedback, confirmed;
-                            return tslib.__generator(this, function (_a) {
-                                switch (_a.label) {
-                                    case 0:
-                                        feedback = action.feedback;
-                                        if (!(feedback && amisCore.isVisible(feedback, value))) return [3 /*break*/, 2];
-                                        return [4 /*yield*/, this.openFeedback(feedback, value)];
-                                    case 1:
-                                        confirmed = _a.sent();
-                                        // 如果 feedback 配置了，取消就跳过原有逻辑。
-                                        if (feedback.skipRestOnCancel && !confirmed) {
-                                            throw new amisCore.SkipOperation();
-                                        }
-                                        else if (feedback.skipRestOnConfirm && confirmed) {
-                                            throw new amisCore.SkipOperation();
-                                        }
-                                        _a.label = 2;
-                                    case 2:
-                                        this.gotoStep(value && typeof value.step === 'number'
-                                            ? value.step
-                                            : this.state.currentStep + 1);
-                                        return [2 /*return*/];
+                                else if (feedback.skipRestOnConfirm && confirmed) {
+                                    throw new amisCore.SkipOperation();
                                 }
-                            });
-                        }); })
-                            .catch(function (reason) {
-                            _this.dispatchEvent('stepSubmitFail', { error: reason });
-                            if (reason instanceof amisCore.SkipOperation) {
-                                return;
-                            }
-                            // do nothing
-                        });
-                    }
-                    else {
-                        this.gotoStep(this.state.currentStep + 1);
+                                _a.label = 2;
+                            case 2:
+                                this.gotoStep(value && typeof value.step === 'number'
+                                    ? value.step
+                                    : this.state.currentStep + 1);
+                                return [2 /*return*/];
+                        }
+                    });
+                }); })
+                    .catch(function (reason) {
+                    _this.dispatchEvent('stepSubmitFail', { error: reason });
+                    if (reason instanceof amisCore.SkipOperation) {
+                        return;
                     }
-                }
-                else {
-                    this.finalSubmit(values, action);
-                }
-                return [2 /*return*/, false];
-            });
-        });
+                    // do nothing
+                });
+            }
+            else {
+                this.gotoStep(this.state.currentStep + 1);
+            }
+        }
+        else {
+            this.finalSubmit(values, action);
+        }
+        return false;
     };
     Wizard.prototype.handleDialogConfirm = function (values, action, targets) {
         var store = this.props.store;
@@ -844,7 +839,7 @@ var Wizard = /** @class */ (function (_super) {
         amisCore.autobind,
         tslib.__metadata("design:type", Function),
         tslib.__metadata("design:paramtypes", [Object, Object]),
-        tslib.__metadata("design:returntype", Promise)
+        tslib.__metadata("design:returntype", void 0)
     ], Wizard.prototype, "handleSubmit", null);
     tslib.__decorate([
         amisCore.autobind,

package/lib/renderers/Wrapper.js CHANGED Viewed

@@ -1,5 +1,5 @@
 /**
- * amis v2.0.0-rc.20
+ * amis v2.0.0
  * Copyright 2018-2022 baidu
  */

package/lib/schemaExtend.js CHANGED Viewed

@@ -1,5 +1,5 @@
 /**
- * amis v2.0.0-rc.20
+ * amis v2.0.0
  * Copyright 2018-2022 baidu
  */

package/lib/themes/ang-ie11.css CHANGED Viewed

@@ -19569,9 +19569,9 @@ fieldset.a-Collapse--lg:after {
   align-items: center;
 }
 .a-TextControl-revealPassword .icon {
-  width: var(--Form-input-password-icon-size);
-  height: var(--Form-input-password-icon-size);
-  color: var(--Form-input-password-icon-color);
+  width: 1rem;
+  height: 1rem;
+  color: #84868c;
   cursor: pointer;
 }
 input.a-TextControl-input-password {
@@ -21185,6 +21185,9 @@ input.a-TextControl-input-password {
   white-space: nowrap;
   align-items: center;
 }
+.a-Select-option-checkbox > label > i {
+  flex-shrink: 0;
+}
 .a-Select-option-checkbox > label > span {
   text-overflow: ellipsis;
   overflow: hidden;
@@ -23377,6 +23380,7 @@ td.rdtQuarter.rdtDisabled:hover {
   border-radius: 50%;
   background-color: #fff;
   position: absolute;
+  transform: translateX(-50%);
 }
 .a-InputRange-track--background {
   left: 0.5rem;
@@ -27206,6 +27210,46 @@ td.rdtQuarter.rdtDisabled:hover {
   left: 0.375rem;
   border-radius: 50%;
 }
+.a-Timeline-horizontal .a-TimelineItem-content {
+  padding-bottom: 1rem;
+  margin-left: 0.125rem;
+}
+.a-Timeline-horizontal .a-TimelineItem-content .a-TimelineItem-time {
+  color: #83868c;
+  font-size: var(--Timeline--font-size);
+  margin-bottom: 0.25rem;
+}
+.a-Timeline-horizontal .a-TimelineItem-content .a-TimelineItem-title {
+  color: #151a26;
+  font-size: var(--Timeline--font-size);
+  margin-bottom: 0.25rem;
+}
+.a-Timeline-horizontal .a-TimelineItem-content .a-TimelineItem-detail .a-TimelineItem-detail-button {
+  display: flex;
+  cursor: pointer;
+  align-items: center;
+  font-size: var(--Timeline--font-size);
+  color: #7266ba;
+  margin-bottom: 0.75rem;
+}
+.a-Timeline-horizontal .a-TimelineItem-content .a-TimelineItem-detail .a-TimelineItem-detail-arrow {
+  width: 1rem;
+  height: 1rem;
+}
+.a-Timeline-horizontal .a-TimelineItem-content .a-TimelineItem-detail .a-TimelineItem-detail-arrow-top {
+  transform: rotateX(180deg);
+}
+.a-Timeline-horizontal .a-TimelineItem-content .a-TimelineItem-detail .a-TimelineItem-detail-visible {
+  display: block;
+  max-width: 18.75rem;
+  font-size: var(--Timeline--font-size);
+  padding: 0.625rem;
+  box-shadow: 0 0.0625rem 0.625rem 0
+    rgba(0 0 0 / 10%);
+}
+.a-Timeline-horizontal .a-TimelineItem-content .a-TimelineItem-detail .a-TimelineItem-detail-invisible {
+  display: none;
+}
 .a-BarCode > img {
   display: block;
   margin: 0 auto;