dlt-for-react 2.1.4 → 2.1.6

package/README.md

@@ -8,14 +8,18 @@ npm publish
 
 ## 前端 dlt-for-react 依赖包版本更新记录
 
-##### 当前最新版本：2.1.3
-
 ##### 安装依赖
 
 > npm install dlt-for-react --save
 
 ##### 版本修改记录
 
+#### V2.1.6—2024 年 6 月 4 日
+
+1. 更新echart版本
+2. 去除echarts/map/js/china
+3. 优化handleMenus方法
+
 #### V2.1.0—2024 年 6 月 3 日
 
 1. 新增 isEqual 函数

package/lib/components/KyECharts/index.js

@@ -58,11 +58,24 @@ require('echarts/lib/component/polar');
 
 require('echarts/lib/component/geo');
 
-require('echarts/map/js/china');
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-//中国地图数据
+//地理坐标系组件
+// import 'echarts/lib/component/parallel';
+// import 'echarts/lib/component/singleAxis';
+// import 'echarts/lib/component/brush';
+
+// import 'echarts/lib/component/dataZoom';
+// import 'echarts/lib/component/visualMap';
+
+// import 'echarts/lib/component/markPoint';
+// import 'echarts/lib/component/markLine';
+// import 'echarts/lib/component/markArea';
+
+// import 'echarts/lib/component/timeline';
+// import 'echarts/lib/component/toolbox'
+
+// import 'echarts/map/js/china' //中国地图数据
 
 // import 'echarts/lib/chart/heatmap';
 
@@ -71,7 +84,13 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
 //图例组件
 //提示框组件
 //标题组件
-//极坐标系组件
+//曲线图
+// import 'echarts/lib/chart/gauge';
+// import 'echarts/lib/chart/funnel';
+// import 'echarts/lib/chart/parallel';
+// import 'echarts/lib/chart/sankey';
+// import 'echarts/lib/chart/boxplot';
+// import 'echarts/lib/chart/candlestick';
 //echarts 基础配置，必须引入
 /* 按需引入echarts */
 //折线图
@@ -79,12 +98,6 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
 //饼图
 //散点图
 //雷达图
-//地图
-// import 'echarts/lib/chart/treemap';
-/*******
- * @description:科研-KyECharts 图表绘画
- * @author: 琴时
- */
 var KyECharts = function KyECharts(_ref) {
   var className = _ref.className,
       notMerge = _ref.notMerge,
@@ -98,28 +111,13 @@ var KyECharts = function KyECharts(_ref) {
     notMerge: notMerge,
     lazyUpdate: lazyUpdate
   }, props));
-}; //地理坐标系组件
-// import 'echarts/lib/component/parallel';
-// import 'echarts/lib/component/singleAxis';
-// import 'echarts/lib/component/brush';
-
-// import 'echarts/lib/component/dataZoom';
-// import 'echarts/lib/component/visualMap';
-
-// import 'echarts/lib/component/markPoint';
-// import 'echarts/lib/component/markLine';
-// import 'echarts/lib/component/markArea';
-
-// import 'echarts/lib/component/timeline';
-// import 'echarts/lib/component/toolbox'
-
-//曲线图
-// import 'echarts/lib/chart/gauge';
-// import 'echarts/lib/chart/funnel';
-// import 'echarts/lib/chart/parallel';
-// import 'echarts/lib/chart/sankey';
-// import 'echarts/lib/chart/boxplot';
-// import 'echarts/lib/chart/candlestick';
+}; //极坐标系组件
+//地图
+// import 'echarts/lib/chart/treemap';
+/*******
+ * @description:科研-KyECharts 图表绘画
+ * @author: 琴时
+ */
 
 KyECharts.defaultProps = {
   notMerge: true,

package/lib/utils/common.js

@@ -416,8 +416,8 @@ var deepCheckField = exports.deepCheckField = function deepCheckField(treeList,
   return temp;
 };
 
-var handleMenus = exports.handleMenus = function handleMenus(allMenu) {
-  var auths = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : [];
+// 获取有权限的菜单
+var handleMenus = exports.handleMenus = function handleMenus(allMenu, auths) {
   var routes = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : [];
 
   //过滤掉没有权限的菜单
@@ -442,7 +442,7 @@ var findAuth = exports.findAuth = function findAuth(routes, menu) {
     return r.path == menu.url;
   });
   if (item && item.authority) {
-    authority = item.authority;
+    authority = item.authority || item.auth;
   }
   return authority;
 };
@@ -467,25 +467,33 @@ var filterChildrenMenus = exports.filterChildrenMenus = function filterChildrenM
 var filterAuthMenus = exports.filterAuthMenus = function filterAuthMenus(menus, auths, routes) {
   var filterMenus = [];
   menus.map(function (item) {
-    var authority = item.authority;
+    var authority = item.authority || item.auth;
+    if (item.url || item.path) {
+      item.url = item.url || item.path;
+      delete item.path;
+    }
+    if (item.children || item.routes) {
+      item.children = item.children || item.routes;
+      delete item.routes;
+    }
     if (item.url && routes && routes.length > 0) {
       authority = findAuth(routes, item);
     }
-    if (item.children) {
-      //存在子菜单，只需要处理子菜单即可
-      item.children = filterAuthMenus(item.children, auths, routes);
-      filterMenus.push(item);
-    } else if (authority) {
+    if (authority) {
       //存在权限判断，此时需要判断用户是否有该权限
-      if (IsType('Array', authority)) {
-        if (auths.includes(auths)) {
+      if (IsType('Object', auths)) {
+        if (auths[authority] !== undefined) {
           filterMenus.push(item);
         }
-      } else if (IsType('Object', auths)) {
-        if (auths[item.auth] !== undefined) {
+      } else {
+        if (auths.includes(authority)) {
           filterMenus.push(item);
         }
       }
+    } else if (item.children) {
+      //存在子菜单，只需要处理子菜单即可
+      item.children = filterAuthMenus(item.children, auths, routes);
+      filterMenus.push(item);
     } else {
       filterMenus.push(item);
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dlt-for-react",
-  "version": "2.1.4",
+  "version": "2.1.6",
   "description": "dlt for react",
   "main": "lib/index.js",
   "scripts": {