wargerm 0.6.9 → 0.6.11

package/dist/components/NtTable/index.d.ts

@@ -72,7 +72,7 @@ declare type Props = {
         pageSize?: number;
         current?: number;
     }, sort?: any, filter?: any) => Promise<any>;
-    onLoad?: (dataSource: Record<string, any>[]) => void;
+    onLoad?: (dataSource: Record<string, any>[], res: Record<string, any>) => void;
     onSubmit?: (params: Record<string, any>) => void;
     onReset?: () => void;
     rowKey: ((record: Record<string, any>) => number | string) | string;
@@ -94,4 +94,5 @@ declare namespace NtTable {
         rowKey: string;
     };
 }
-export default NtTable;
+declare const _default: React.MemoExoticComponent<typeof NtTable>;
+export default _default;

package/dist/index.css

@@ -28096,6 +28096,12 @@ button[data-prefers-color='light'] .swiper-pagination-bullet {
   background: #4d82ff;
   color: #ffffff;
 }
+[data-prefers-color='light'] .ant-table-tbody > tr.ant-table-row:hover > td a,
+[data-prefers-color='light'] .ant-table-tbody > tr > td.ant-table-cell-row-hover a,
+[data-prefers-color='light'] .ant-table-tbody > tr.ant-table-row:hover > td .ant-typography,
+[data-prefers-color='light'] .ant-table-tbody > tr > td.ant-table-cell-row-hover .ant-typography {
+  color: #ffffff;
+}
 [data-prefers-color='light'] .ant-table-tbody > tr > td.ant-table-cell-row-hover:first-child {
   border-radius: 4px 0px 0px 4px;
 }

package/dist/index.esm.css

@@ -28096,6 +28096,12 @@ button[data-prefers-color='light'] .swiper-pagination-bullet {
   background: #4d82ff;
   color: #ffffff;
 }
+[data-prefers-color='light'] .ant-table-tbody > tr.ant-table-row:hover > td a,
+[data-prefers-color='light'] .ant-table-tbody > tr > td.ant-table-cell-row-hover a,
+[data-prefers-color='light'] .ant-table-tbody > tr.ant-table-row:hover > td .ant-typography,
+[data-prefers-color='light'] .ant-table-tbody > tr > td.ant-table-cell-row-hover .ant-typography {
+  color: #ffffff;
+}
 [data-prefers-color='light'] .ant-table-tbody > tr > td.ant-table-cell-row-hover:first-child {
   border-radius: 4px 0px 0px 4px;
 }

package/dist/index.esm.js

@@ -1533,7 +1533,11 @@ var WSelect = function WSelect(props) {
   return /*#__PURE__*/React.createElement(_Select, _objectSpread2({
     showSearch: true,
     filterOption: function filterOption(input, option) {
-      return option.children.toLowerCase().indexOf(input.toLowerCase()) >= 0;
+      var _ref3;
+
+      var children = option.children,
+          label = option.label;
+      return ((_ref3 = children || label) === null || _ref3 === void 0 ? void 0 : _ref3.toLowerCase().indexOf(input === null || input === void 0 ? void 0 : input.toLowerCase())) >= 0;
     }
   }, extraProps), request ? childrenNode : valueEnum ? valueEnumList : children);
 };
@@ -2680,7 +2684,8 @@ function Table(_ref) {
       tableList = _ref.dataSource,
       request = _ref.request,
       onLoad = _ref.onLoad,
-      params = _ref.params,
+      _ref$params = _ref.params,
+      params = _ref$params === void 0 ? {} : _ref$params,
       onSubmit = _ref.onSubmit,
       _ref$rowKey = _ref.rowKey,
       rowKey = _ref$rowKey === void 0 ? 'key' : _ref$rowKey,
@@ -6635,7 +6640,7 @@ function Xgplay(_ref, fRef) {
       setRef(null);
       playerRef.current = null;
     };
-  }, []);
+  }, [type]);
   useImperativeHandle(fRef, function () {
     return {
       player: playerRef.current
@@ -7117,6 +7122,7 @@ function FrameBox$1(_ref) {
 }
 
 var _excluded$n = ["columns", "dataSource", "request", "onLoad", "params", "onSubmit", "rowKey", "onRow", "className", "rowClassName", "rowSelection", "style", "tbodyStyle", "thStyle", "border", "scroll", "pagination", "search", "frameBoxTable", "frameBoxDirection", "formRef", "none"];
+
 function NtTable(_ref) {
   var _formSearchRef$curren4, _classnames2, _columns$, _columns$2;
 
@@ -7124,7 +7130,8 @@ function NtTable(_ref) {
       tableList = _ref.dataSource,
       request = _ref.request,
       onLoad = _ref.onLoad,
-      params = _ref.params,
+      _ref$params = _ref.params,
+      params = _ref$params === void 0 ? {} : _ref$params,
       onSubmit = _ref.onSubmit,
       _ref$rowKey = _ref.rowKey,
       rowKey = _ref$rowKey === void 0 ? 'key' : _ref$rowKey,
@@ -7531,12 +7538,14 @@ function NtTable(_ref) {
             case 7:
               res = _context.sent;
               setLoading(false);
-              onLoad && onLoad(res.data);
-              setDataSource(res.data);
-              setTotal(res.total || 0);
+              onLoad && onLoad(res === null || res === void 0 ? void 0 : res.data, res);
+              setDataSource((res === null || res === void 0 ? void 0 : res.data) || []);
+              setTotal((res === null || res === void 0 ? void 0 : res.total) || 0);
               setpaginationParams(function (c) {
+                var _res$data;
+
                 return _objectSpread2(_objectSpread2(_objectSpread2({}, c), {}, {
-                  total: res.total || res.data.length
+                  total: (res === null || res === void 0 ? void 0 : res.total) || (res === null || res === void 0 ? void 0 : (_res$data = res.data) === null || _res$data === void 0 ? void 0 : _res$data.length) || 0
                 }, pagination), requestParams);
               });
               _context.next = 16;
@@ -7544,13 +7553,15 @@ function NtTable(_ref) {
 
             case 15:
               setpaginationParams(function (c) {
+                var _tableList$slice;
+
                 var obj = _objectSpread2(_objectSpread2(_objectSpread2({}, c), {}, {
-                  total: tableList && tableList.length || 0
+                  total: (tableList === null || tableList === void 0 ? void 0 : tableList.length) || 0
                 }, pagination), pageParams);
 
                 var current = obj.current,
                     pageSize = obj.pageSize;
-                setDataSource(tableList ? tableList.slice((current - 1) * pageSize, current * pageSize) : []);
+                setDataSource((tableList === null || tableList === void 0 ? void 0 : (_tableList$slice = tableList.slice) === null || _tableList$slice === void 0 ? void 0 : _tableList$slice.call(tableList, (current - 1) * pageSize, current * pageSize)) || []);
                 return obj;
               });
 
@@ -7561,7 +7572,7 @@ function NtTable(_ref) {
         }
       }, _callee);
     }))();
-  }, [params, pageParams, pagination, tableList, formSearch, columns]);
+  }, [JSON.stringify(params), JSON.stringify(pageParams), JSON.stringify(pagination), JSON.stringify(tableList), formSearch, JSON.stringify(columns)]);
 
   var onFormSubmit = function onFormSubmit(values) {
     onSubmit && onSubmit(values);
@@ -7678,9 +7689,11 @@ function NtTable(_ref) {
     }
   }, paginationParams)));
 }
+
 NtTable.defaultProps = {
   rowKey: 'key'
 };
+var index$7 = /*#__PURE__*/memo(NtTable);
 
 /*
  * @Author: lijin
@@ -8477,4 +8490,4 @@ if (REACT_APP_ENV == 'development') {
   document.documentElement.setAttribute(COLOR_ATTR_NAME, 'nt');
 }
 
-export { Index$a as AutoScroll, Index$c as Breadcrumb, WButton as Button, index$4 as Calendar, index$2 as Card, WCascader as Cascader, Index$4 as Checkbox, Index$9 as CountUp, Index$2 as DatePicker, DragBox, index as IconFont, Index as Input, WInputNumber as InputNumber, LineEcharts, Modal, ModalForm$1 as ModalForm, Modal$1 as ModalTips, NtTable, Index$8 as Number, NumericInput, Index$3 as Radio, Select, Index$b as Swiper, WSwitch as Switch, index$3 as TabelCard, index$1 as Table, Index$7 as TreeSelect, Upload, index$6 as Video, index$5 as VideoPlayer, Index$6 as WDatePicker, WForm$1 as WForm, WaterLevelCharts, WebsocketHeart, useEventEmitter, create as whox, wmox };
+export { Index$a as AutoScroll, Index$c as Breadcrumb, WButton as Button, index$4 as Calendar, index$2 as Card, WCascader as Cascader, Index$4 as Checkbox, Index$9 as CountUp, Index$2 as DatePicker, DragBox, index as IconFont, Index as Input, WInputNumber as InputNumber, LineEcharts, Modal, ModalForm$1 as ModalForm, Modal$1 as ModalTips, index$7 as NtTable, Index$8 as Number, NumericInput, Index$3 as Radio, Select, Index$b as Swiper, WSwitch as Switch, index$3 as TabelCard, index$1 as Table, Index$7 as TreeSelect, Upload, index$6 as Video, index$5 as VideoPlayer, Index$6 as WDatePicker, WForm$1 as WForm, WaterLevelCharts, WebsocketHeart, useEventEmitter, create as whox, wmox };

package/dist/index.js

@@ -1598,7 +1598,11 @@ var WSelect = function WSelect(props) {
   return /*#__PURE__*/React__default['default'].createElement(_Select__default['default'], _objectSpread2({
     showSearch: true,
     filterOption: function filterOption(input, option) {
-      return option.children.toLowerCase().indexOf(input.toLowerCase()) >= 0;
+      var _ref3;
+
+      var children = option.children,
+          label = option.label;
+      return ((_ref3 = children || label) === null || _ref3 === void 0 ? void 0 : _ref3.toLowerCase().indexOf(input === null || input === void 0 ? void 0 : input.toLowerCase())) >= 0;
     }
   }, extraProps), request ? childrenNode : valueEnum ? valueEnumList : children);
 };
@@ -2745,7 +2749,8 @@ function Table(_ref) {
       tableList = _ref.dataSource,
       request = _ref.request,
       onLoad = _ref.onLoad,
-      params = _ref.params,
+      _ref$params = _ref.params,
+      params = _ref$params === void 0 ? {} : _ref$params,
       onSubmit = _ref.onSubmit,
       _ref$rowKey = _ref.rowKey,
       rowKey = _ref$rowKey === void 0 ? 'key' : _ref$rowKey,
@@ -6700,7 +6705,7 @@ function Xgplay(_ref, fRef) {
       setRef(null);
       playerRef.current = null;
     };
-  }, []);
+  }, [type]);
   React.useImperativeHandle(fRef, function () {
     return {
       player: playerRef.current
@@ -7182,6 +7187,7 @@ function FrameBox$1(_ref) {
 }
 
 var _excluded$n = ["columns", "dataSource", "request", "onLoad", "params", "onSubmit", "rowKey", "onRow", "className", "rowClassName", "rowSelection", "style", "tbodyStyle", "thStyle", "border", "scroll", "pagination", "search", "frameBoxTable", "frameBoxDirection", "formRef", "none"];
+
 function NtTable(_ref) {
   var _formSearchRef$curren4, _classnames2, _columns$, _columns$2;
 
@@ -7189,7 +7195,8 @@ function NtTable(_ref) {
       tableList = _ref.dataSource,
       request = _ref.request,
       onLoad = _ref.onLoad,
-      params = _ref.params,
+      _ref$params = _ref.params,
+      params = _ref$params === void 0 ? {} : _ref$params,
       onSubmit = _ref.onSubmit,
       _ref$rowKey = _ref.rowKey,
       rowKey = _ref$rowKey === void 0 ? 'key' : _ref$rowKey,
@@ -7596,12 +7603,14 @@ function NtTable(_ref) {
             case 7:
               res = _context.sent;
               setLoading(false);
-              onLoad && onLoad(res.data);
-              setDataSource(res.data);
-              setTotal(res.total || 0);
+              onLoad && onLoad(res === null || res === void 0 ? void 0 : res.data, res);
+              setDataSource((res === null || res === void 0 ? void 0 : res.data) || []);
+              setTotal((res === null || res === void 0 ? void 0 : res.total) || 0);
               setpaginationParams(function (c) {
+                var _res$data;
+
                 return _objectSpread2(_objectSpread2(_objectSpread2({}, c), {}, {
-                  total: res.total || res.data.length
+                  total: (res === null || res === void 0 ? void 0 : res.total) || (res === null || res === void 0 ? void 0 : (_res$data = res.data) === null || _res$data === void 0 ? void 0 : _res$data.length) || 0
                 }, pagination), requestParams);
               });
               _context.next = 16;
@@ -7609,13 +7618,15 @@ function NtTable(_ref) {
 
             case 15:
               setpaginationParams(function (c) {
+                var _tableList$slice;
+
                 var obj = _objectSpread2(_objectSpread2(_objectSpread2({}, c), {}, {
-                  total: tableList && tableList.length || 0
+                  total: (tableList === null || tableList === void 0 ? void 0 : tableList.length) || 0
                 }, pagination), pageParams);
 
                 var current = obj.current,
                     pageSize = obj.pageSize;
-                setDataSource(tableList ? tableList.slice((current - 1) * pageSize, current * pageSize) : []);
+                setDataSource((tableList === null || tableList === void 0 ? void 0 : (_tableList$slice = tableList.slice) === null || _tableList$slice === void 0 ? void 0 : _tableList$slice.call(tableList, (current - 1) * pageSize, current * pageSize)) || []);
                 return obj;
               });
 
@@ -7626,7 +7637,7 @@ function NtTable(_ref) {
         }
       }, _callee);
     }))();
-  }, [params, pageParams, pagination, tableList, formSearch, columns]);
+  }, [JSON.stringify(params), JSON.stringify(pageParams), JSON.stringify(pagination), JSON.stringify(tableList), formSearch, JSON.stringify(columns)]);
 
   var onFormSubmit = function onFormSubmit(values) {
     onSubmit && onSubmit(values);
@@ -7743,9 +7754,11 @@ function NtTable(_ref) {
     }
   }, paginationParams)));
 }
+
 NtTable.defaultProps = {
   rowKey: 'key'
 };
+var index$7 = /*#__PURE__*/React.memo(NtTable);
 
 /*
  * @Author: lijin
@@ -8559,7 +8572,7 @@ exports.LineEcharts = LineEcharts;
 exports.Modal = Modal;
 exports.ModalForm = ModalForm$1;
 exports.ModalTips = Modal$1;
-exports.NtTable = NtTable;
+exports.NtTable = index$7;
 exports.Number = Index$8;
 exports.NumericInput = NumericInput;
 exports.Radio = Index$3;

package/package.json

@@ -1,92 +1,92 @@
-{
-  "private": false,
-  "name": "wargerm",
-  "version": "0.6.9",
-  "scripts": {
-    "dev": "dumi dev",
-    "docs:build": "dumi build",
-    "docs:deploy": "gh-pages -d docs-dist",
-    "build": "father-build",
-    "deploy": "npm run docs:build && npm run docs:deploy",
-    "release": "npm run build && npm publish",
-    "prettier": "prettier --write \"**/*.{js,jsx,tsx,ts,less,md,json}\"",
-    "test": "umi-test",
-    "test:coverage": "umi-test --coverage"
-  },
-  "main": "dist/index.js",
-  "module": "dist/index.esm.js",
-  "unpkg": "dist/index.umd.min.js",
-  "typings": "dist/index.d.ts",
-  "author": "jinly2",
-  "license": "MIT",
-  "keywords": [
-    "React",
-    "Component"
-  ],
-  "gitHooks": {
-    "pre-commit": "lint-staged"
-  },
-  "repository": {
-    "type": "git",
-    "url": "http://code.eblssmart.com/platform/web/wargerm-components.git",
-    "branch": "main"
-  },
-  "files": [
-    "dist",
-    "es",
-    "lib",
-    "index.css"
-  ],
-  "lint-staged": {
-    "*.{js,jsx,less,md,json}": [
-      "prettier --write"
-    ],
-    "*.ts?(x)": [
-      "prettier --parser=typescript --write"
-    ]
-  },
-  "dependencies": {
-    "@ant-design/pro-table": "^2.79.0",
-    "animate.css": "^4.1.1",
-    "echarts": "^5.2.2",
-    "echarts-for-react": "^3.0.2",
-    "lodash-es": "^4.17.21",
-    "moment": "^2.29.4",
-    "react-countup": "^6.0.0",
-    "react-dom": "^17.0.2",
-    "react-file-viewer": "^1.2.1",
-    "swiper": "^6.7.0",
-    "use-sync-external-store": "^1.2.0",
-    "xgplayer": "^2.31.6",
-    "xgplayer-flv": "^2.5.1",
-    "xgplayer-flv.js": "^2.3.0",
-    "xgplayer-hls": "^2.5.2",
-    "xgplayer-hls.js": "^2.6.1"
-  },
-  "peerDependencies": {
-    "@ant-design/icons": ">=4.2.0",
-    "antd": ">=4.7.0",
-    "classnames": ">=2.2.0",
-    "echarts": "^5.2.2",
-    "echarts-for-react": "^3.0.2",
-    "lodash-es": ">=4.17.21",
-    "react": ">=17.0.0"
-  },
-  "devDependencies": {
-    "@ant-design/icons": "^4.6.4",
-    "@types/lodash-es": "^4.17.6",
-    "@types/react-dom": "^17.0.11",
-    "@types/use-sync-external-store": "^0.0.3",
-    "@umijs/test": "^3.0.5",
-    "antd": "^4.16.13",
-    "babel-plugin-import": "^1.13.3",
-    "classnames": "^2.3.1",
-    "dumi": "^1.1.31",
-    "father-build": "^1.19.1",
-    "gh-pages": "^3.0.0",
-    "lint-staged": "^10.0.7",
-    "prettier": "^1.19.1",
-    "react": "^16.12.0",
-    "yorkie": "^2.0.0"
-  }
-}
+{
+  "private": false,
+  "name": "wargerm",
+  "version": "0.6.11",
+  "scripts": {
+    "dev": "dumi dev",
+    "docs:build": "dumi build",
+    "docs:deploy": "gh-pages -d docs-dist",
+    "build": "father-build",
+    "deploy": "npm run docs:build && npm run docs:deploy",
+    "release": "npm run build && npm publish",
+    "prettier": "prettier --write \"**/*.{js,jsx,tsx,ts,less,md,json}\"",
+    "test": "umi-test",
+    "test:coverage": "umi-test --coverage"
+  },
+  "main": "dist/index.js",
+  "module": "dist/index.esm.js",
+  "unpkg": "dist/index.umd.min.js",
+  "typings": "dist/index.d.ts",
+  "author": "jinly2",
+  "license": "MIT",
+  "keywords": [
+    "React",
+    "Component"
+  ],
+  "gitHooks": {
+    "pre-commit": "lint-staged"
+  },
+  "repository": {
+    "type": "git",
+    "url": "http://code.eblssmart.com/platform/web/wargerm-components.git",
+    "branch": "main"
+  },
+  "files": [
+    "dist",
+    "es",
+    "lib",
+    "index.css"
+  ],
+  "lint-staged": {
+    "*.{js,jsx,less,md,json}": [
+      "prettier --write"
+    ],
+    "*.ts?(x)": [
+      "prettier --parser=typescript --write"
+    ]
+  },
+  "dependencies": {
+    "@ant-design/pro-table": "^2.79.0",
+    "animate.css": "^4.1.1",
+    "echarts": "^5.2.2",
+    "echarts-for-react": "^3.0.2",
+    "lodash-es": "^4.17.21",
+    "moment": "^2.29.4",
+    "react-countup": "^6.0.0",
+    "react-dom": "^17.0.2",
+    "react-file-viewer": "^1.2.1",
+    "swiper": "^6.7.0",
+    "use-sync-external-store": "^1.2.0",
+    "xgplayer": "^2.31.6",
+    "xgplayer-flv": "^2.5.1",
+    "xgplayer-flv.js": "^2.3.0",
+    "xgplayer-hls": "^2.5.2",
+    "xgplayer-hls.js": "^2.6.1"
+  },
+  "peerDependencies": {
+    "@ant-design/icons": ">=4.2.0",
+    "antd": ">=4.7.0",
+    "classnames": ">=2.2.0",
+    "echarts": "^5.2.2",
+    "echarts-for-react": "^3.0.2",
+    "lodash-es": ">=4.17.21",
+    "react": ">=17.0.0"
+  },
+  "devDependencies": {
+    "@ant-design/icons": "^4.6.4",
+    "@types/lodash-es": "^4.17.6",
+    "@types/react-dom": "^17.0.11",
+    "@types/use-sync-external-store": "^0.0.3",
+    "@umijs/test": "^3.0.5",
+    "antd": "^4.16.13",
+    "babel-plugin-import": "^1.13.3",
+    "classnames": "^2.3.1",
+    "dumi": "^1.1.31",
+    "father-build": "^1.19.1",
+    "gh-pages": "^3.0.0",
+    "lint-staged": "^10.0.7",
+    "prettier": "^1.19.1",
+    "react": "^16.12.0",
+    "yorkie": "^2.0.0"
+  }
+}