@qn-pandora/pandora-component 4.4.3 → 4.4.4

package/CHANGELOG.json

@@ -1,6 +1,23 @@
 {
   "name": "@qn-pandora/pandora-component",
   "entries": [
+    {
+      "version": "4.4.4",
+      "tag": "@qn-pandora/pandora-component_v4.4.4",
+      "date": "Tue, 27 Feb 2024 12:57:54 GMT",
+      "comments": {
+        "patch": [
+          {
+            "comment": "2024-02-27发包"
+          }
+        ],
+        "dependency": [
+          {
+            "comment": "Updating dependency \"@qn-pandora/app-sdk\" from `^3.4.3` to `^3.4.4`"
+          }
+        ]
+      }
+    },
     {
       "version": "4.4.3",
       "tag": "@qn-pandora/pandora-component_v4.4.3",

package/CHANGELOG.md

@@ -1,6 +1,13 @@
 # Change Log - @qn-pandora/pandora-component
 
-This log was last generated on Fri, 23 Feb 2024 06:02:50 GMT and should not be manually modified.
+This log was last generated on Tue, 27 Feb 2024 12:57:54 GMT and should not be manually modified.
+
+## 4.4.4
+Tue, 27 Feb 2024 12:57:54 GMT
+
+### Patches
+
+- 2024-02-27发包
 
 ## 4.4.3
 Fri, 23 Feb 2024 06:02:50 GMT

package/es/components/FileResumable/index.js

@@ -75,7 +75,6 @@ var __read = (this && this.__read) || function (o, n) {
 import React, { useCallback, useContext, useEffect, useMemo, useRef, useState } from 'react';
 import Resumablejs from 'resumablejs';
 import uuid from 'uuid';
-import md5 from 'crypto-js/md5';
 import { Progress, Tooltip, Upload } from 'antd';
 import { ConfigContext } from 'antd/es/config-provider';
 import classnames from 'classnames';
@@ -85,7 +84,7 @@ import { appEnv, fileIsExit } from '@qn-pandora/app-sdk';
 import { formatString } from '../../utils/language';
 import { UploadLocale } from '../../constants/language/upload/type';
 import { SDK_PREFIX } from '../../constants/style';
-import { isJpgOrPngOrSvg } from './utils';
+import { calculateFileMd5, isJpgOrPngOrSvg } from './utils';
 var Dragger = Upload.Dragger;
 export default function FileResumable(props) {
     var _a, _b;
@@ -261,67 +260,59 @@ export default function FileResumable(props) {
         onError
     ]);
     var handleStart = useCallback(function () { return __awaiter(_this, void 0, void 0, function () {
-        var params, realFile_1, reader, extension_1;
-        var _this = this;
-        return __generator(this, function (_a) {
-            params = __assign(__assign({}, query), { persistence: persistence });
-            if (fileList.length === 1) {
-                realFile_1 = fileList[0];
-                reader = new FileReader();
-                reader.readAsText(realFile_1.size > 50 * 1024 * 1024
-                    ? realFile_1.slice(0, 2 * 1024 * 1024)
-                    : realFile_1);
-                extension_1 = realFile_1.name.split('.').pop().toLowerCase();
-                reader.onloadend = function (e) { return __awaiter(_this, void 0, void 0, function () {
-                    var md5Str, id, fileId, error_1;
-                    var _a, _b, _c;
-                    return __generator(this, function (_d) {
-                        switch (_d.label) {
-                            case 0:
-                                if (!(e.target.readyState === FileReader.DONE)) return [3 /*break*/, 5];
-                                md5Str = md5(e.target.result).toString();
-                                id = '';
-                                _d.label = 1;
-                            case 1:
-                                _d.trys.push([1, 3, , 4]);
-                                return [4 /*yield*/, fileIsExit({
-                                        resumableModifyTime: realFile_1.lastModified,
-                                        resumableFilename: realFile_1.name,
-                                        resumableType: realFile_1.type || "application/" + extension_1,
-                                        resumableFileMd5: md5Str,
-                                        resumableTotalSize: realFile_1.size
-                                    })];
-                            case 2:
-                                fileId = (_d.sent()).fileId;
-                                id = fileId;
-                                return [3 /*break*/, 4];
-                            case 3:
-                                error_1 = _d.sent();
-                                handleError(get(error_1, 'message'));
-                                return [3 /*break*/, 4];
-                            case 4:
-                                if (!id) {
-                                    params.resumableFileMd5 = md5Str;
-                                    params.resumableModifyTime = realFile_1.lastModified;
-                                    params.resumableIdentifier = uuid();
-                                    params.resumableType = realFile_1.type || "application/" + extension_1;
-                                    (_a = resumable.current) === null || _a === void 0 ? void 0 : _a.updateQuery(params);
-                                    (_b = resumable.current) === null || _b === void 0 ? void 0 : _b.upload();
-                                }
-                                else {
-                                    handleFileSuccess(JSON.stringify({
-                                        fileId: id
-                                    }));
-                                    (_c = resumable.current) === null || _c === void 0 ? void 0 : _c.cancel();
-                                }
-                                _d.label = 5;
-                            case 5: return [2 /*return*/];
-                        }
-                    });
-                }); };
+        var params, realFile, extension, md5Str, id, fileId, error_1;
+        var _a, _b, _c;
+        return __generator(this, function (_d) {
+            switch (_d.label) {
+                case 0:
+                    params = __assign(__assign({}, query), { persistence: persistence });
+                    if (!(fileList.length === 1)) return [3 /*break*/, 6];
+                    realFile = fileList[0];
+                    extension = realFile.name.split('.').pop().toLowerCase();
+                    return [4 /*yield*/, calculateFileMd5(realFile.size > 50 * 1024 * 1024
+                            ? realFile.slice(0, 2 * 1024 * 1024)
+                            : realFile)];
+                case 1:
+                    md5Str = _d.sent();
+                    id = '';
+                    _d.label = 2;
+                case 2:
+                    _d.trys.push([2, 4, , 5]);
+                    return [4 /*yield*/, fileIsExit({
+                            resumableModifyTime: realFile.lastModified,
+                            resumableFilename: realFile.name,
+                            resumableType: realFile.type || "application/" + extension,
+                            resumableFileMd5: md5Str,
+                            resumableTotalSize: realFile.size
+                        })];
+                case 3:
+                    fileId = (_d.sent()).fileId;
+                    id = fileId;
+                    return [3 /*break*/, 5];
+                case 4:
+                    error_1 = _d.sent();
+                    handleError(get(error_1, 'message'));
+                    return [3 /*break*/, 5];
+                case 5:
+                    if (!id) {
+                        params.resumableFileMd5 = md5Str;
+                        params.resumableModifyTime = realFile.lastModified;
+                        params.resumableIdentifier = uuid();
+                        params.resumableType = realFile.type || "application/" + extension;
+                        (_a = resumable.current) === null || _a === void 0 ? void 0 : _a.updateQuery(params);
+                        (_b = resumable.current) === null || _b === void 0 ? void 0 : _b.upload();
+                    }
+                    else {
+                        handleFileSuccess(JSON.stringify({
+                            fileId: id
+                        }));
+                        (_c = resumable.current) === null || _c === void 0 ? void 0 : _c.cancel();
+                    }
+                    _d.label = 6;
+                case 6:
+                    setShowTool(true);
+                    return [2 /*return*/];
             }
-            setShowTool(true);
-            return [2 /*return*/];
         });
     }); }, [
         query,

package/es/components/FileResumable/utils.d.ts

@@ -1 +1,3 @@
+import { RcFile } from 'antd/es/upload';
 export declare const isJpgOrPngOrSvg: (type?: string, hexValue?: string) => boolean;
+export declare function calculateFileMd5(file: RcFile): Promise<string>;

package/es/components/FileResumable/utils.js

@@ -1,4 +1,5 @@
 import { includes } from 'lodash';
+import CryptoJS from 'crypto-js';
 var MIME_IMAGE_TYPE = [
     'image/png',
     'image/jpeg',
@@ -15,3 +16,19 @@ export var isJpgOrPngOrSvg = function (type, hexValue) {
             includes(hexValue.toLowerCase(), '3c3f786d') || // svg
             includes(hexValue.toLowerCase(), '89504e47')));
 };
+// 读取文件并计算 MD5
+export function calculateFileMd5(file) {
+    return new Promise(function (resolve) {
+        var reader = new FileReader();
+        reader.onload = function (event) {
+            var _a;
+            var arrayBuffer = (_a = event.target) === null || _a === void 0 ? void 0 : _a.result;
+            if (!arrayBuffer)
+                return;
+            var wordArray = CryptoJS.lib.WordArray.create(arrayBuffer);
+            var md5 = CryptoJS.MD5(wordArray).toString();
+            resolve(md5);
+        };
+        reader.readAsArrayBuffer(file);
+    });
+}

package/es/components/Table/ColumnSetting/index.d.ts

@@ -7,6 +7,7 @@ export interface IOption {
 export interface ISettingBtnProps {
     overlayClass?: string;
     onHiddenKeysChange?: (value: string[]) => void;
+    onMove?: (keys: string[]) => void;
     hiddenKeys?: string[];
     options?: IOption[];
     loading?: boolean;

package/es/components/Table/ColumnSetting/index.js

@@ -21,8 +21,9 @@ var __spread = (this && this.__spread) || function () {
 import React, { useMemo, useCallback, useState, useContext } from 'react';
 import classnames from 'classnames';
 import { includes } from 'lodash';
+import ReactSortable from 'react-sortablejs';
 import { Popover, Checkbox, Spin } from 'antd';
-import { SettingOutlined } from '@ant-design/icons';
+import { HolderOutlined, SettingOutlined } from '@ant-design/icons';
 import { ConfigContext } from 'antd/es/config-provider';
 import { formatString } from '../../../utils/language';
 import { TableLocale } from '../../../constants/language/table/type';
@@ -31,7 +32,7 @@ import NameLimiter from '../../NameLimiter';
 import Input from '../../Input';
 export var All = '_all';
 export function ColumnSetting(props) {
-    var overlayClass = props.overlayClass, _a = props.hiddenKeys, hiddenKeys = _a === void 0 ? [] : _a, onHiddenKeysChange = props.onHiddenKeysChange, _b = props.options, options = _b === void 0 ? [] : _b, loading = props.loading;
+    var overlayClass = props.overlayClass, _a = props.hiddenKeys, hiddenKeys = _a === void 0 ? [] : _a, onHiddenKeysChange = props.onHiddenKeysChange, onMove = props.onMove, _b = props.options, options = _b === void 0 ? [] : _b, loading = props.loading;
     var locale = useContext(ConfigContext).locale;
     var _c = __read(useState(''), 2), prefix = _c[0], setPrefix = _c[1];
     var allKeys = useMemo(function () {
@@ -80,12 +81,19 @@ export function ColumnSetting(props) {
                     React.createElement(Checkbox, { value: All, checked: hiddenKeys.length === 0, onChange: allCheckChange, className: SDK_PREFIX + "-table-column-setting-all-check" }, formatString(TableLocale.check_all, locale)),
                     React.createElement(Input, { value: prefix, allowClear: true, onChange: handlePrefixChange, placeholder: formatString(TableLocale.search, locale), className: SDK_PREFIX + "-table-column-setting-search-input" })),
                 React.createElement("div", null,
-                    React.createElement("div", { className: SDK_PREFIX + "-table-column-setting-content" }, realOptions.map(function (item) {
-                        return (React.createElement("div", { key: item.value },
-                            React.createElement("div", { className: SDK_PREFIX + "-table-column-setting-checkbox-container" },
-                                React.createElement(Checkbox, { checked: !!realValues.find(function (v) { return v === item.value; }), value: item.value, className: SDK_PREFIX + "-table-column-setting-checkbox", onChange: handleChange },
-                                    React.createElement("span", { className: SDK_PREFIX + "-table-column-setting-value" }, typeof item.label === 'string' ? (React.createElement(NameLimiter, { name: item.label })) : (item.label))))));
-                    }))))) },
+                    React.createElement("div", { className: SDK_PREFIX + "-table-column-setting-content" },
+                        React.createElement(ReactSortable, { onChange: onMove, options: {
+                                group: 'setting-config',
+                                animation: 150,
+                                preventOnFilter: false
+                            } }, realOptions.map(function (item) {
+                            return (React.createElement("div", { key: item.value, "data-id": item.value },
+                                React.createElement("div", { className: SDK_PREFIX + "-table-column-setting-checkbox-container" },
+                                    React.createElement("div", { className: SDK_PREFIX + "-table-column-setting-dragholder" },
+                                        React.createElement(HolderOutlined, null)),
+                                    React.createElement(Checkbox, { checked: !!realValues.find(function (v) { return v === item.value; }), value: item.value, className: SDK_PREFIX + "-table-column-setting-checkbox", onChange: handleChange },
+                                        React.createElement("span", { className: SDK_PREFIX + "-table-column-setting-value" }, typeof item.label === 'string' ? (React.createElement(NameLimiter, { name: item.label })) : (item.label))))));
+                        })))))) },
         React.createElement(SettingOutlined, { className: SDK_PREFIX + "-table-column-setting-icon", onClick: function (e) {
                 e.stopPropagation();
                 e.preventDefault();

package/es/components/Table/ColumnSetting/style.css

@@ -38,8 +38,17 @@
   overflow: hidden;
   text-overflow: ellipsis;
 }
+.pandora-sdk-table-column-setting-content > div .pandora-sdk-table-column-setting-checkbox-container {
+  margin: 4px 0;
+  display: -webkit-box;
+  display: -ms-flexbox;
+  display: flex;
+}
+.pandora-sdk-table-column-setting-content > div .pandora-sdk-table-column-setting-checkbox-container .pandora-sdk-table-column-setting-dragholder {
+  cursor: move;
+}
 .pandora-sdk-table-column-setting-content > div .pandora-sdk-table-column-setting-checkbox-container .pandora-sdk-table-column-setting-checkbox {
-  width: 100%;
+  width: 120px;
   overflow: hidden;
 }
 .pandora-sdk-table-column-setting-content > div .pandora-sdk-table-column-setting-checkbox-container .pandora-sdk-table-column-setting-checkbox > span:nth-child(2) {

package/es/components/Table/ColumnSetting/style.less

@@ -35,8 +35,13 @@
   overflow: hidden;
   text-overflow: ellipsis;
   .@{sdk-prefix}-table-column-setting-checkbox-container {
+    margin: 4px 0;
+    display: flex;
+    .@{sdk-prefix}-table-column-setting-dragholder {
+      cursor: move;
+    }
     .@{sdk-prefix}-table-column-setting-checkbox {
-      width: 100%;
+      width: 120px;
       overflow: hidden;
     }
     .@{sdk-prefix}-table-column-setting-checkbox > span:nth-child(2) {

package/es/components/Table/constant.d.ts

@@ -16,5 +16,7 @@ export declare enum ETableDragSaveKey {
     /** 仪表盘 */
     Dashboard = "Keta_drag_table_dashboard",
     /** 采集任务 */
-    CollectionTask = "Keta_drag_collection_task"
+    CollectionTask = "Keta_drag_collection_task",
+    /** 北冥事件 */
+    NeuralertEvent = "Keta_drag_neuralert_event"
 }

package/es/components/Table/constant.js

@@ -19,4 +19,6 @@ export var ETableDragSaveKey;
     ETableDragSaveKey["Dashboard"] = "Keta_drag_table_dashboard";
     /** 采集任务 */
     ETableDragSaveKey["CollectionTask"] = "Keta_drag_collection_task";
+    /** 北冥事件 */
+    ETableDragSaveKey["NeuralertEvent"] = "Keta_drag_neuralert_event";
 })(ETableDragSaveKey || (ETableDragSaveKey = {}));

package/es/components/Table/index.d.ts

@@ -21,6 +21,17 @@ export interface IOptionItem {
      */
     disabled?: boolean | ((selectItems: any[]) => boolean);
 }
+export interface ISaveFieldItem {
+    field: string;
+    hide?: boolean;
+    width?: number;
+    index?: number;
+    fixed?: boolean | 'right' | 'left';
+}
+export declare enum ETableSettingType {
+    SORT = "sort",
+    RESIZE = "resize"
+}
 export interface IColumnType<T> extends ColumnType<T> {
     colTitle?: string | React.ReactNode;
     configurable?: boolean;
@@ -47,9 +58,9 @@ export interface ITableProps<T> extends Omit<TableProps<T>, 'columns'> {
     hiddenColumns?: string[];
     onHiddenColumnsChange?: (keys: string[]) => void;
     columnSettingOverlayClass?: string;
-    draggable?: boolean;
-    dragSaveKey?: string;
-    onDraggableChange?: (fieldsWidth: IKeyValues<number>) => void;
+    draggable?: boolean | ETableSettingType;
+    saveSettingKey?: string;
+    onSettingChange?: (fields: ISaveFieldItem[]) => void;
 }
 /**
  * pandora2.0风格的表格
@@ -66,6 +77,12 @@ declare class Table<T = any> extends React.Component<ITableProps<T>, any> {
     checkAll: boolean;
     hiddenColumn: string[] | undefined;
     columns: IKeyValues[];
+    sortConfig: {
+        sortKeys: string[];
+        fixedRightKeys: string[];
+        fixedLeftKeys: string[];
+    };
+    settingFields: ISaveFieldItem[];
     UNSAFE_componentWillReceiveProps(nextProps: ITableProps<T>): void;
     get selectedRowKeys(): React.ReactText[];
     get rowSelection(): TableRowSelection<T> | undefined;
@@ -78,13 +95,22 @@ declare class Table<T = any> extends React.Component<ITableProps<T>, any> {
         unconfigableKeys: string[];
         resetKeys: string[];
     };
+    get resizable(): boolean;
+    get sortable(): boolean;
+    initSettingConfig(): void;
     handleHideColumnsChange(keys: string[]): Promise<void> | undefined;
-    getColumns(): IKeyValues<any>[];
+    getSortedColumns(): (IKeyValues<any> | undefined)[];
+    getColumns(): (IKeyValues<any> | undefined)[];
     getRowKey(row: any, index: number): any;
+    getSortCoulmns(columns: IKeyValues[]): (IKeyValues<any> | undefined)[];
     setIndeterminate(indeterminate: boolean): void;
     setCheckAll(checkAll: boolean): void;
     setHiddenColumn(hiddenColumn?: string[]): void;
     setColumns(columns: IKeyValues[]): void;
+    setSortKeys(columns: string[]): void;
+    setSettingFields(columns: ISaveFieldItem[]): void;
+    setFixedRightKeys(columns: string[]): void;
+    setFixedLeftKeys(columns: string[]): void;
     setCheckboxStatus(selectedRowsOfCurrentPage?: T[], dataSource?: T[]): void;
     handleSelectionChange(selectedRowKeys: React.Key[], selectedRowsOfCurrentPage: any[]): void;
     onRowSelectionChange(selectedRowKeys: React.Key[], selectedRowsOfCurrentPage: any[]): void;