@zgfe/modules-page 1.0.2 → 1.0.4-heyh.0

package/dist/esm/components/content/utils.js

@@ -117,7 +117,7 @@ export var getColumns = function getColumns(type, hasUserGroup, onClickCallback,
     align: 'right',
     className: 'thread-right',
     sorter: function sorter(a, b) {
-      return a.clickUser - b.clickUser;
+      return getNum(a) - getNum(b);
     },
     showSorterTooltip: false,
     render: function render(_txt, record) {
@@ -166,6 +166,12 @@ export var getNumPer = function getNumPer(viewUser, clickUser) {
   }
   return viewUser ? (clickUser / viewUser * 100).toFixed(1) + '%' : 0 + '%';
 };
+var getNum = function getNum(data) {
+  var viewUser = data.viewUser,
+    clickUser = data.clickUser;
+  if (!viewUser || viewUser === -1) return 0;
+  return Number((clickUser / viewUser * 100).toFixed(1));
+};
 export var toThousands = function toThousands(num) {
   if (util.isNumber(num)) {
     return num === -1 ? '-' : util.toThousands(num);

package/dist/esm/components/topContent/index.js

@@ -4,9 +4,9 @@ function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o =
 function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
 function _iterableToArrayLimit(arr, i) { var _i = null == arr ? null : "undefined" != typeof Symbol && arr[Symbol.iterator] || arr["@@iterator"]; if (null != _i) { var _s, _e, _x, _r, _arr = [], _n = !0, _d = !1; try { if (_x = (_i = _i.call(arr)).next, 0 === i) { if (Object(_i) !== _i) return; _n = !1; } else for (; !(_n = (_s = _x.call(_i)).done) && (_arr.push(_s.value), _arr.length !== i); _n = !0); } catch (err) { _d = !0, _e = err; } finally { try { if (!_n && null != _i.return && (_r = _i.return(), Object(_r) !== _r)) return; } finally { if (_d) throw _e; } } return _arr; } }
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
-import React, { useEffect, useState } from 'react';
+import React, { useEffect, useState, useContext } from 'react';
 import "./index.less";
-import { BizDatePicker, IconFont } from '@zgfe/business-lib';
+import { BizDatePicker, IconFont, BizGlobalDataContext } from '@zgfe/business-lib';
 import { Button } from 'antd';
 import { DatePickerTypes } from '@zgfe/business-lib/es/datePicker/types';
 import moment from 'moment';
@@ -15,6 +15,8 @@ var TopContent = function TopContent(props) {
     _useState2 = _slicedToArray(_useState, 2),
     time = _useState2[0],
     setTime = _useState2[1];
+  var _useContext = useContext(BizGlobalDataContext),
+    authority = _useContext.authority;
   useEffect(function () {
     // 初始为最新一天
     var initValue = {
@@ -42,7 +44,7 @@ var TopContent = function TopContent(props) {
   }, /*#__PURE__*/React.createElement(IconFont, {
     type: "tianjia1"
   }), " \u65B0\u5EFA\u5206\u7EC4") : /*#__PURE__*/React.createElement(Button, {
-    disabled: props.disabled,
+    disabled: props.disabled || !authority[100068],
     onClick: props.onDownload
   }, /*#__PURE__*/React.createElement(IconFont, {
     type: "xiazai1"

package/dist/esm/modules/home/types.d.ts

@@ -41,6 +41,6 @@ export declare namespace ModulesPageTypes {
 export declare const ModulesPageContext: import("react").Context<{
     pageList: ModulesPageTypes.Page[];
     pageGroupList: ModulesPageTypes.PageGroup[];
-    currentClickPage?: ModulesPageTypes.PageGroup | ModulesPageTypes.Page | undefined;
+    currentClickPage?: ModulesPageTypes.Page | ModulesPageTypes.PageGroup | undefined;
     setCurrentClickPage?: ((data: ModulesPageTypes.Page) => void) | undefined;
 }>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zgfe/modules-page",
-  "version": "1.0.2",
+  "version": "1.0.4-heyh.0",
   "scripts": {
     "start": "dumi dev",
     "docs:build": "dumi build",
@@ -39,7 +39,7 @@
     "@types/lodash": "^4.14.197",
     "@umijs/fabric": "^2.8.1",
     "@umijs/test": "^3.0.5",
-    "@zgfe/business-lib": "1.1.84-panel.5",
+    "@zgfe/business-lib": "1.1.87-auth.7",
     "antd": "^4.22.6",
     "dumi": "^1.1.0",
     "father": "^4.0.0-rc.2",
@@ -50,5 +50,5 @@
     "prettier": "^2.2.1",
     "yorkie": "^2.0.0"
   },
-  "gitHead": "0dcf9a6f6d72a00a3459f9d7c9712a12b933c9a6"
+  "gitHead": "4836f86cbd2e5abe53d469640b66fe25f3143f56"
 }