npm - amis - Versions diffs - 2.0.0 → 2.0.1 - Mend

@@ -4,7 +4,7 @@
 import React from 'react';
 import { RendererProps } from 'amis-core';
 import { BaseSchema } from '../Schema';
-export declare type LogOperation = 'stop' | 'restart' | 'showLineNumber' | 'clear';
+export declare type LogOperation = 'stop' | 'restart' | 'showLineNumber' | 'clear' | 'filter';
 /**
  * 日志展示组件
  * 文档：https://baidu.gitee.io/amis/docs/components/log
@@ -56,9 +56,10 @@ export interface LogProps extends RendererProps, Omit<LogSchema, 'type' | 'class
 export interface LogState {
     lastLine: string;
     logs: string[];
+    originLogs: string[];
     refresh: boolean;
     showLineNumber: boolean;
-    showOperation: boolean;
+    filterWord: string;
 }
 export declare class Log extends React.Component<LogProps, LogState> {
     static defaultProps: {
@@ -76,11 +77,12 @@ export declare class Log extends React.Component<LogProps, LogState> {
     componentDidMount(): void;
     componentDidUpdate(prevProps: LogProps): void;
     pauseOrResumeScrolling(): void;
-    refresh: () => void;
-    clear: () => void;
-    changeShowLineNumber: () => void;
-    changeShowOperation: () => void;
+    refresh: (e: React.MouseEvent<HTMLElement>) => void;
+    clear: (e: React.MouseEvent<HTMLElement>) => void;
+    changeFilterWord: (value: string) => void;
     loadLogs(): Promise<void>;
+    renderHighlightWord(line: string): string | (string | JSX.Element)[];
+    renderHighlightWordWithAnsi(line: string): string;
     /**
      * 渲染某一行
      */

package/esm/renderers/Log.js CHANGED Viewed

@@ -1,5 +1,5 @@
 /**
- * amis v2.0.0
+ * amis v2.0.1
  * Copyright 2018-2022 baidu
  */
@@ -7,7 +7,7 @@ import { __extends, __awaiter, __generator, __assign, __decorate } from 'tslib';
 import React from 'react';
 import { isApiOutdated, buildApi, Renderer } from 'amis-core';
 import Ansi from 'ansi-to-react';
-import { VirtualList, Button, PauseIcon, ReloadIcon, MinusIcon, PlusIcon, InputClearIcon, LeftArrowIcon, RightArrowIcon } from 'amis-ui';
+import { VirtualList, Icon, SearchBox } from 'amis-ui';
 var Log = /** @class */ (function (_super) {
     __extends(Log, _super);
@@ -18,34 +18,40 @@ var Log = /** @class */ (function (_super) {
         _this.state = {
             lastLine: '',
             logs: [],
+            originLogs: [],
             refresh: true,
             showLineNumber: false,
-            showOperation: false
+            filterWord: ''
         };
-        _this.refresh = function () {
+        _this.refresh = function (e) {
             var origin = _this.state.refresh;
             _this.setState({
                 refresh: !origin
             });
             if (!origin) {
-                _this.clear();
+                _this.clear(e);
                 _this.loadLogs();
             }
+            e.preventDefault();
         };
-        _this.clear = function () {
+        _this.clear = function (e) {
             _this.setState({
                 logs: [],
                 lastLine: ''
             });
+            e.preventDefault();
         };
-        _this.changeShowLineNumber = function () {
-            _this.setState({
-                showLineNumber: !_this.state.showLineNumber
-            });
-        };
-        _this.changeShowOperation = function () {
+        _this.changeFilterWord = function (value) {
+            var logs = _this.state.originLogs;
+            if (value !== '' &&
+                value !== undefined &&
+                value !== null &&
+                value.length > 0) {
+                logs = logs.filter(function (line) { return line.includes(value); });
+            }
             _this.setState({
-                showOperation: !_this.state.showOperation
+                filterWord: value,
+                logs: logs
             });
         };
         _this.logRef = React.createRef();
@@ -146,10 +152,12 @@ var Log = /** @class */ (function (_super) {
                                 logs = logs.concat(lines);
                                 this.setState({
                                     logs: logs,
+                                    originLogs: logs,
                                     lastLine: lastline
                                 });
                             }
                         }
+                        this.changeFilterWord(this.state.filterWord);
                         if (done) {
                             this.isDone = true;
                             return [2 /*return*/];
@@ -165,6 +173,29 @@ var Log = /** @class */ (function (_super) {
             });
         });
     };
+    Log.prototype.renderHighlightWord = function (line) {
+        var cx = this.props.classnames;
+        var filterWord = this.state.filterWord;
+        if (filterWord === '') {
+            return line;
+        }
+        var items = line.split(filterWord);
+        return items.map(function (item, index) {
+            if (index < items.length - 1) {
+                return (React.createElement("span", null,
+                    item,
+                    React.createElement("span", { className: cx('Log-line-highlight') }, filterWord)));
+            }
+            return item;
+        });
+    };
+    Log.prototype.renderHighlightWordWithAnsi = function (line) {
+        var filterWord = this.state.filterWord;
+        if (filterWord === '') {
+            return line;
+        }
+        return line.replaceAll(filterWord, "\u001B[43;1m\u001B[30;1m".concat(filterWord, "\u001B[0m"));
+    };
     /**
      * 渲染某一行
      */
@@ -174,12 +205,12 @@ var Log = /** @class */ (function (_super) {
             showLineNumber && (React.createElement("span", { className: cx('Log-line-number') },
                 index + 1,
                 " ")),
-            disableColor ? line : React.createElement(Ansi, { useClasses: true }, line)));
+            disableColor ? (this.renderHighlightWord(line)) : (React.createElement(Ansi, { useClasses: true }, this.renderHighlightWordWithAnsi(line)))));
     };
     Log.prototype.render = function () {
         var _this = this;
-        var _a = this.props, source = _a.source, className = _a.className, cx = _a.classnames, placeholder = _a.placeholder, height = _a.height, rowHeight = _a.rowHeight, disableColor = _a.disableColor, __ = _a.translate, operation = _a.operation; _a.env;
-        var _b = this.state, refresh = _b.refresh, showLineNumber = _b.showLineNumber, showOperation = _b.showOperation;
+        var _a = this.props, source = _a.source, className = _a.className, cx = _a.classnames, placeholder = _a.placeholder, height = _a.height, rowHeight = _a.rowHeight, disableColor = _a.disableColor, __ = _a.translate, operation = _a.operation;
+        var _b = this.state, refresh = _b.refresh, showLineNumber = _b.showLineNumber;
         var loading = __(placeholder);
         if (!source) {
             loading = __('Log.mustHaveSource');
@@ -197,7 +228,7 @@ var Log = /** @class */ (function (_super) {
                         showLineNumber && (React.createElement("span", { className: cx('Log-line-number') },
                             index + 1,
                             " ")),
-                        disableColor ? (logs[index]) : (React.createElement(Ansi, { useClasses: true }, logs[index]))));
+                        disableColor ? (_this.renderHighlightWord(logs[index])) : (React.createElement(Ansi, { useClasses: true }, _this.renderHighlightWordWithAnsi(logs[index])))));
                 } }));
         }
         else {
@@ -206,22 +237,22 @@ var Log = /** @class */ (function (_super) {
             });
         }
         return (React.createElement("div", { className: cx('Log', className) },
-            React.createElement("div", { ref: this.logRef, className: cx('Log-body'), style: { height: useVirtualRender ? 'auto' : height } }, useVirtualRender ? lines : lines.length ? lines : loading),
-            React.createElement("div", { className: cx('Log-operation') }, operation &&
-                (operation === null || operation === void 0 ? void 0 : operation.length) > 0 &&
-                (showOperation ? (React.createElement(React.Fragment, null,
-                    operation.includes('stop') && (React.createElement(Button, { size: "sm", title: "__('stop')", disabled: !refresh, onClick: this.refresh },
-                        React.createElement(PauseIcon, null))),
-                    operation.includes('restart') && (React.createElement(Button, { size: "sm", title: __('reload'), disabled: refresh, onClick: this.refresh },
-                        React.createElement(ReloadIcon, null))),
-                    operation.includes('showLineNumber') && (React.createElement(Button, { size: "sm", title: showLineNumber
-                            ? __('Log.notShowLineNumber')
-                            : __('Log.showLineNumber'), onClick: this.changeShowLineNumber }, showLineNumber ? React.createElement(MinusIcon, null) : React.createElement(PlusIcon, null))),
-                    operation.includes('clear') && (React.createElement(Button, { size: "sm", title: __('clear'), onClick: this.clear },
-                        React.createElement(InputClearIcon, null))),
-                    React.createElement(Button, { size: "sm", title: __('Log.collapse'), onClick: this.changeShowOperation },
-                        React.createElement(LeftArrowIcon, null)))) : (React.createElement("div", { title: __('Log.expand'), className: cx('Log-operation-hidden'), onClick: this.changeShowOperation },
-                    React.createElement(RightArrowIcon, null)))))));
+            React.createElement("div", { className: cx('Log-operation') }, operation && (operation === null || operation === void 0 ? void 0 : operation.length) > 0 && (React.createElement(React.Fragment, null,
+                operation.includes('stop') && (React.createElement("a", { title: __('stop'), className: !refresh ? 'is-disabled' : '', onClick: this.refresh },
+                    React.createElement(Icon, { icon: "pause" }))),
+                operation.includes('restart') && (React.createElement("a", { title: __('reload'), className: refresh ? 'is-disabled' : '', onClick: this.refresh },
+                    React.createElement(Icon, { icon: "refresh" }))),
+                operation.includes('showLineNumber') && (React.createElement("a", { title: showLineNumber
+                        ? __('Log.notShowLineNumber')
+                        : __('Log.showLineNumber'), onClick: function (e) {
+                        _this.setState({ showLineNumber: !showLineNumber });
+                        e.preventDefault();
+                    } },
+                    React.createElement(Icon, { icon: showLineNumber ? 'invisible' : 'view' }))),
+                operation.includes('clear') && (React.createElement("a", { onClick: this.clear, title: __('clear') },
+                    React.createElement(Icon, { icon: "remove" }))),
+                operation && operation.includes('filter') && (React.createElement(SearchBox, { className: cx('Log-filter-box'), placeholder: "\u8FC7\u6EE4\u8BCD", onChange: this.changeFilterWord }))))),
+            React.createElement("div", { ref: this.logRef, className: cx('Log-body'), style: { height: useVirtualRender ? 'auto' : height } }, useVirtualRender ? lines : lines.length ? lines : loading)));
     };
     Log.defaultProps = {
         height: 500,

package/esm/renderers/Mapping.js CHANGED Viewed

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

package/esm/renderers/Markdown.js CHANGED Viewed

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

package/esm/renderers/Nav.js CHANGED Viewed

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

package/esm/renderers/Operation.js CHANGED Viewed

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

package/esm/renderers/Page.js CHANGED Viewed

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

package/esm/renderers/Pagination.js CHANGED Viewed

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

package/esm/renderers/PaginationWrapper.js CHANGED Viewed

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

package/esm/renderers/Panel.js CHANGED Viewed

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

package/esm/renderers/Plain.js CHANGED Viewed

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

package/esm/renderers/PopOver.js CHANGED Viewed

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

package/esm/renderers/Portlet.js CHANGED Viewed

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

package/esm/renderers/Progress.js CHANGED Viewed

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

package/esm/renderers/Property.js CHANGED Viewed

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

package/esm/renderers/QRCode.js CHANGED Viewed

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

package/esm/renderers/QuickEdit.js CHANGED Viewed

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

package/esm/renderers/Remark.js CHANGED Viewed

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

package/esm/renderers/SearchBox.js CHANGED Viewed

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

package/esm/renderers/Service.js CHANGED Viewed

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

package/esm/renderers/SparkLine.js CHANGED Viewed

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

package/esm/renderers/Spinner.js CHANGED Viewed

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

package/esm/renderers/Status.js CHANGED Viewed

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

package/esm/renderers/Steps.js CHANGED Viewed

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

package/esm/renderers/Table/ColumnToggler.js CHANGED Viewed

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

package/esm/renderers/Table/HeadCellFilterDropdown.js CHANGED Viewed

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

package/esm/renderers/Table/HeadCellSearchDropdown.js CHANGED Viewed

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

package/esm/renderers/Table/ItemActionsWrapper.js CHANGED Viewed

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

package/esm/renderers/Table/TableBody.js CHANGED Viewed

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

package/esm/renderers/Table/TableCell.js CHANGED Viewed

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

package/esm/renderers/Table/TableContent.js CHANGED Viewed

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

package/esm/renderers/Table/TableRow.js CHANGED Viewed

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

package/esm/renderers/Table/exportExcel.js CHANGED Viewed

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

package/esm/renderers/Table/index.d.ts CHANGED Viewed

@@ -277,6 +277,7 @@ export default class Table extends React.Component<TableProps, object> {
     affixedTable?: HTMLTableElement;
     parentNode?: HTMLElement | Window;
     lastScrollLeft: number;
+    lastScrollTop: number;
     totalWidth: number;
     totalHeight: number;
     outterWidth: number;
@@ -319,6 +320,7 @@ export default class Table extends React.Component<TableProps, object> {
     affixDetect(): void;
     updateTableInfo(): void;
     handleOutterScroll(): void;
+    handleFixedColumnsScroll(event: React.UIEvent<any>): void;
     tableRef(ref: HTMLTableElement): void;
     dragTipRef(ref: any): void;
     affixedTableRef(ref: HTMLTableElement): void;