@zgfe/modules-page 1.0.8-lijingyu1538.1 → 1.0.17-zhongyuan.3

package/dist/esm/components/searchPanel/index.less

@@ -1,33 +1,33 @@
-@import '~@zgfe/business-lib/es/assets/styles/inner.less';
-
-.page-search-panel {
-  &-title.ant-form-item {
-    margin-bottom: 8px;
-    padding-left: 24px;
-    color: @text-color-secondary;
-    font-weight: 500;
-    .ant-form-item-control-input {
-      min-height: 20px;
-      .ant-form-item-control-input-content {
-        height: 20px;
-      }
-    }
-  }
-
-  &-item3.ant-form-item:not(.page-search-panel-hidden) {
-    margin-bottom: 20px;
-  }
-  &-item1.ant-form-item {
-    margin-bottom: 20px !important;
-  }
-  &-item2.ant-form-item {
-    margin-bottom: 4px !important;
-  }
-
-  &-hidden.ant-form-item {
-    margin-bottom: 16px;
-    .ant-form-item-control-input {
-      min-height: 0;
-    }
-  }
-}
+@import '~@zgfe/business-lib/es/assets/styles/inner.less';
+
+.page-search-panel {
+  &-title.ant-form-item {
+    margin-bottom: 8px;
+    padding-left: 24px;
+    color: @text-color-secondary;
+    font-weight: 500;
+    .ant-form-item-control-input {
+      min-height: 20px;
+      .ant-form-item-control-input-content {
+        height: 20px;
+      }
+    }
+  }
+
+  &-item3.ant-form-item:not(.page-search-panel-hidden) {
+    margin-bottom: 20px;
+  }
+  &-item1.ant-form-item {
+    margin-bottom: 20px !important;
+  }
+  &-item2.ant-form-item {
+    margin-bottom: 4px !important;
+  }
+
+  &-hidden.ant-form-item {
+    margin-bottom: 16px;
+    .ant-form-item-control-input {
+      min-height: 0;
+    }
+  }
+}

package/dist/esm/components/searchPanel/util.js

@@ -28,10 +28,10 @@ export var formatValue = function formatValue(source) {
   };
 };
 
-/**
- * 筛选条件当未选择值时，不查询
- * @param filters 筛选条件数组
- * @returns
+/**
+ * 筛选条件当未选择值时，不查询
+ * @param filters 筛选条件数组
+ * @returns
  */
 function getConditionList(filters) {
   if (!filters || !filters.conditions) return;

package/dist/esm/components/topContent/index.d.ts

@@ -1,6 +1,6 @@
 import React from 'react';
 import './index.less';
-import { DatePickerTypes } from '@zgfe/business-lib/es/datePicker/types';
+import { DatePickerTypes } from '@zgfe/business-lib/es/datePickerV2/types';
 declare const TopContent: React.FC<{
     value?: DatePickerTypes.Value;
     type?: string;

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

@@ -6,9 +6,9 @@ function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" !=
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 import React, { useEffect, useState, useContext } from 'react';
 import "./index.less";
-import { BizDatePicker, IconFont, BizGlobalDataContext } from '@zgfe/business-lib';
+import { IconFont, BizGlobalDataContext, BizDatePickerV2 } from '@zgfe/business-lib';
 import { Button } from 'antd';
-import { DatePickerTypes } from '@zgfe/business-lib/es/datePicker/types';
+import { DatePickerTypes } from '@zgfe/business-lib/es/datePickerV2/types';
 import moment from 'moment';
 var TopContent = function TopContent(props) {
   var _useState = useState(),
@@ -32,10 +32,10 @@ var TopContent = function TopContent(props) {
   }, [time]);
   return /*#__PURE__*/React.createElement("div", {
     className: "top-content"
-  }, /*#__PURE__*/React.createElement(BizDatePicker, {
-    value: time,
-    mode: "simple",
+  }, /*#__PURE__*/React.createElement(BizDatePickerV2, {
     includeToday: true,
+    dateTypeList: [DatePickerTypes.Unit.day],
+    value: time,
     onChange: setTime
   }), props.hidden ? null : props.type === 'pageGroup' ? /*#__PURE__*/React.createElement(Button, {
     type: "primary",

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

@@ -1,10 +1,10 @@
-.top-content {
-  display: flex;
-  justify-content: space-between;
-  font-size: 14px;
-  .ant-btn {
-    .bsicon {
-      margin-right: 8px;
-    }
-  }
-}
+.top-content {
+  display: flex;
+  justify-content: space-between;
+  font-size: 14px;
+  .ant-btn {
+    .bsicon {
+      margin-right: 8px;
+    }
+  }
+}

package/dist/esm/modules/empty/index.less

@@ -1,95 +1,95 @@
-.empty-panel {
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-  width: 100%;
-  min-width: 850px;
-  height: 100%;
-  overflow: auto;
-  background: url(./img/bg.png);
-  background-size: cover;
-  &-content {
-    width: 406px;
-    margin-left: 136px;
-    p {
-      color: #9aa1a9;
-      font-size: 14px;
-    }
-  }
-  &-content2 {
-    width: 400px;
-    p {
-      margin-bottom: 0;
-    }
-  }
-  &-title {
-    margin-bottom: 24px;
-    font-weight: 500;
-    font-size: 28px;
-  }
-  &-title-secondary {
-    margin-top: 24px;
-    margin-bottom: 8px;
-    font-weight: 500;
-    font-size: 16px;
-  }
-
-  &-code-container {
-    position: relative;
-    height: 200px;
-    margin: 8px 0;
-    padding: 16px;
-    background: #fafafb;
-    border-radius: 8px;
-    &:hover {
-      .empty-panel-code-copy {
-        display: flex;
-      }
-    }
-
-    & > div:not(.empty-panel-code-copy) {
-      color: #354354;
-      font-size: 14px;
-      line-height: 22px;
-      word-wrap: break-word;
-      span {
-        margin-left: 8px;
-        color: #9aa1a9;
-      }
-    }
-  }
-  &-code {
-    margin-left: 16px;
-  }
-  &-code-copy {
-    position: absolute;
-    top: 16px;
-    right: 16px;
-    display: flex;
-    display: none;
-    align-items: center;
-    height: 24px;
-    padding: 0 8px;
-    background: #f2f3f4;
-    border-radius: 4px;
-    cursor: pointer;
-    &:hover {
-      background: #e6e7ea;
-    }
-    &:focus {
-      background-color: #ccd0d4;
-    }
-
-    span {
-      margin-right: 8px;
-      margin-left: 0 !important;
-      font-size: 16px !important;
-      line-height: 1;
-    }
-  }
-
-  &-img {
-    height: 100%;
-    // max-width: 50%;
-  }
-}
+.empty-panel {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  width: 100%;
+  min-width: 850px;
+  height: 100%;
+  overflow: auto;
+  background: url(./img/bg.png);
+  background-size: cover;
+  &-content {
+    width: 406px;
+    margin-left: 136px;
+    p {
+      color: #9aa1a9;
+      font-size: 14px;
+    }
+  }
+  &-content2 {
+    width: 400px;
+    p {
+      margin-bottom: 0;
+    }
+  }
+  &-title {
+    margin-bottom: 24px;
+    font-weight: 500;
+    font-size: 28px;
+  }
+  &-title-secondary {
+    margin-top: 24px;
+    margin-bottom: 8px;
+    font-weight: 500;
+    font-size: 16px;
+  }
+
+  &-code-container {
+    position: relative;
+    height: 200px;
+    margin: 8px 0;
+    padding: 16px;
+    background: #fafafb;
+    border-radius: 8px;
+    &:hover {
+      .empty-panel-code-copy {
+        display: flex;
+      }
+    }
+
+    & > div:not(.empty-panel-code-copy) {
+      color: #354354;
+      font-size: 14px;
+      line-height: 22px;
+      word-wrap: break-word;
+      span {
+        margin-left: 8px;
+        color: #9aa1a9;
+      }
+    }
+  }
+  &-code {
+    margin-left: 16px;
+  }
+  &-code-copy {
+    position: absolute;
+    top: 16px;
+    right: 16px;
+    display: flex;
+    display: none;
+    align-items: center;
+    height: 24px;
+    padding: 0 8px;
+    background: #f2f3f4;
+    border-radius: 4px;
+    cursor: pointer;
+    &:hover {
+      background: #e6e7ea;
+    }
+    &:focus {
+      background-color: #ccd0d4;
+    }
+
+    span {
+      margin-right: 8px;
+      margin-left: 0 !important;
+      font-size: 16px !important;
+      line-height: 1;
+    }
+  }
+
+  &-img {
+    height: 100%;
+    // max-width: 50%;
+  }
+}

package/dist/esm/modules/home/demo/index.js

@@ -1,54 +1,59 @@
 import React from 'react';
 import { ModulesPage } from '@zgfe/modules-page';
 import { DemoWrapper } from '@zgfe/business-lib';
-var defaultValue = {
-  pageTitle: '进入百度首页894854121612',
-  appId: 225,
-  module: 'page',
-  pageUrl: 'http://baidu.com/query/894854121612',
-  time: {
-    unit: 'day',
-    end: '2023-09-14',
-    begin: '2023-08-31',
-    relative: [14, 0]
-  },
-  filters: {
-    conditions: [{
-      attrId: 0,
-      propCategory: 'userProp',
-      values: ['实名'],
-      dimensionSub: 'is_anonymous',
-      label: '实名/匿名',
-      type: 1,
-      category: 'fixed',
-      operator: 'equal',
-      attrName: 'is_anonymous'
-    }, {
-      attrId: 0,
-      propCategory: 'userProp',
-      values: ['30', '1'],
-      dimensionSub: 'last_visit_time',
-      label: '最后一次访问时间',
-      type: 3,
-      category: 'fixed',
-      operator: 'relative',
-      attrName: 'last_visit_time'
-    }, {
-      attrId: 0,
-      propCategory: 'envProp',
-      type: 1,
-      operator: 'equal',
-      values: ['baidu'],
-      dimensionSub: 'website',
-      label: '来源域名',
-      attrName: 'website',
-      category: 'fixed'
-    }],
-    relation: 'and'
-  },
-  userGroup: [758, 757],
-  platform: 3
-};
+// const defaultValue = {
+//   pageTitle: '进入百度首页894854121612',
+//   appId: 225,
+//   module: 'page',
+//   pageUrl: 'http://baidu.com/query/894854121612',
+//   time: {
+//     unit: 'day',
+//     end: '2023-09-14',
+//     begin: '2023-08-31',
+//     relative: [14, 0],
+//   },
+//   filters: {
+//     conditions: [
+//       {
+//         attrId: 0,
+//         propCategory: 'userProp',
+//         values: ['实名'],
+//         dimensionSub: 'is_anonymous',
+//         label: '实名/匿名',
+//         type: 1,
+//         category: 'fixed',
+//         operator: 'equal',
+//         attrName: 'is_anonymous',
+//       },
+//       {
+//         attrId: 0,
+//         propCategory: 'userProp',
+//         values: ['30', '1'],
+//         dimensionSub: 'last_visit_time',
+//         label: '最后一次访问时间',
+//         type: 3,
+//         category: 'fixed',
+//         operator: 'relative',
+//         attrName: 'last_visit_time',
+//       },
+//       {
+//         attrId: 0,
+//         propCategory: 'envProp',
+//         type: 1,
+//         operator: 'equal',
+//         values: ['baidu'],
+//         dimensionSub: 'website',
+//         label: '来源域名',
+//         attrName: 'website',
+//         category: 'fixed',
+//       },
+//     ],
+//     relation: 'and',
+//   },
+//   userGroup: [758, 757],
+//   platform: 3,
+// };
+
 export default (function () {
   var onClickWarn = function onClickWarn() {
     console.log('onClickWarn');
@@ -58,14 +63,13 @@ export default (function () {
   };
   return /*#__PURE__*/React.createElement(DemoWrapper, {
     needMeta: true,
-    defaultApp: 225
+    defaultApp: 2
   }, /*#__PURE__*/React.createElement("div", {
     style: {
       height: 750,
       overflow: 'auto'
     }
   }, /*#__PURE__*/React.createElement(ModulesPage, {
-    value: defaultValue,
     onClickWarn: onClickWarn,
     onChange: onChange
   })));

package/dist/esm/modules/home/index.js

@@ -98,7 +98,9 @@ var ModulesPage = function ModulesPage(props) {
   var _useContext = useContext(BizGlobalDataContext),
     eventGroupList = _useContext.eventGroupList,
     currentApp = _useContext.currentApp,
-    authority = _useContext.authority;
+    authority = _useContext.authority,
+    router = _useContext.router,
+    routes = _useContext.routes;
   // 是否是没进行埋点分析
   var isEmpty = useMemo(function () {
     var flag = true;
@@ -211,13 +213,33 @@ var ModulesPage = function ModulesPage(props) {
     setEditGroup(data);
     setShowGroup(true);
   };
+  // app页面分析
+  var handleAppPageAnalysis = function handleAppPageAnalysis() {
+    router === null || router === void 0 || router.push({
+      name: "".concat(routes.appAnalyseVisual, "/2"),
+      query: {
+        // tab: key,
+      }
+    });
+  };
   var render = /*#__PURE__*/React.createElement("div", {
     className: "".concat(classPrefix, "-top-render")
-  }, /*#__PURE__*/React.createElement(Button, {
+  }, /*#__PURE__*/React.createElement("div", {
+    className: "".concat(classPrefix, "-top-render-title")
+  }, "\u9875\u9762\u5206\u6790"), /*#__PURE__*/React.createElement(Button, {
     type: "primary",
     disabled: loading || !result || !result.length || !authority[100144],
     onClick: props.onClickWarn
   }, "\u8BBE\u7F6E\u6D41\u5931\u9884\u8B66"));
+  // 查看App页面分析
+  var renderApp = /*#__PURE__*/React.createElement("div", {
+    className: "".concat(classPrefix, "-top-render")
+  }, /*#__PURE__*/React.createElement("div", {
+    className: "".concat(classPrefix, "-top-render-title")
+  }, "\u9875\u9762\u5206\u6790"), /*#__PURE__*/React.createElement(Button, {
+    type: "primary",
+    onClick: handleAppPageAnalysis
+  }, "App\u9875\u9762\u5206\u6790"));
   if (isEmpty) return /*#__PURE__*/React.createElement(EmptyPanel, null);
   return /*#__PURE__*/React.createElement(ModulesPageContext.Provider, {
     value: {
@@ -227,8 +249,9 @@ var ModulesPage = function ModulesPage(props) {
       setCurrentClickPage: setCurrentClickPage
     }
   }, /*#__PURE__*/React.createElement(BizLayout, {
-    className: classPrefix,
-    title: "\u9875\u9762\u5206\u6790",
+    className: classPrefix
+    // title="页面分析"
+    ,
     hasCollapse: true,
     topPanel: /*#__PURE__*/React.createElement(Skeleton, {
       loading: pageLoading,
@@ -241,7 +264,7 @@ var ModulesPage = function ModulesPage(props) {
       value: searchValue,
       onChange: onChange
     })),
-    topRender: props.onClickWarn ? render : null,
+    topRender: props.onClickWarn ? render : renderApp,
     collapseRef: selectRef
   }, /*#__PURE__*/React.createElement(Spin, {
     spinning: pageLoading

package/dist/esm/modules/home/style/index.less

@@ -1,45 +1,59 @@
-.modules-page {
-  &-top-render {
-    display: flex;
-    justify-content: flex-end;
-    height: 32px;
-    margin-top: -8px;
-    margin-bottom: 8px;
-    .ant-btn {
-      padding: 4px 16px;
-    }
-  }
-  .ant-btn-primary[disabled] {
-    color: #fff;
-    background: #d0dfff;
-    border-color: #d0dfff;
-  }
-
-  &-spin {
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    min-height: 400px;
-    margin-top: 24px;
-    border: 1px solid #ecedf0;
-    border-radius: 8px;
-  }
-
-  &-content {
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    width: 100%;
-    min-height: 300px;
-    margin-top: 60px;
-    background-color: #fff;
-  }
-  .ant-btn {
-    display: flex;
-    align-items: center;
-    .bsicon {
-      font-size: 16px !important;
-      line-height: 1;
-    }
-  }
-}
+.modules-page {
+  &-top-render {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    height: 38px;
+    margin-top: -8px;
+    margin-bottom: 8px;
+    line-height: 38px;
+    .ant-btn {
+      padding: 4px 16px;
+    }
+    &-title {
+      color: var(--io-N-, #021429);
+      font-weight: 500;
+      font-size: 16px;
+      font-family: 'PingFang SC';
+      font-style: normal;
+      line-height: 20px; /* 125% */
+      letter-spacing: 0.016px;
+    }
+  }
+  .ant-btn-primary[disabled] {
+    color: #fff;
+    background: #d0dfff;
+    border-color: #d0dfff;
+  }
+
+  &-spin {
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    min-height: 400px;
+    margin-top: 24px;
+    border: 1px solid #ecedf0;
+    border-radius: 8px;
+  }
+
+  &-content {
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    width: 100%;
+    min-height: 300px;
+    margin-top: 60px;
+    background-color: #fff;
+  }
+  .ant-btn {
+    display: flex;
+    align-items: center;
+    .bsicon {
+      font-size: 16px !important;
+      line-height: 1;
+    }
+  }
+  .biz-layout-top {
+    padding: 16px;
+  }
+}

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.Page | ModulesPageTypes.PageGroup | undefined;
+    currentClickPage?: ModulesPageTypes.PageGroup | ModulesPageTypes.Page | undefined;
     setCurrentClickPage?: ((data: ModulesPageTypes.Page) => void) | undefined;
 }>;

package/package.json

@@ -1,6 +1,10 @@
 {
   "name": "@zgfe/modules-page",
-  "version": "1.0.8-lijingyu1538.1",
+  "version": "1.0.17-zhongyuan.3",
+  "private": false,
+  "publishConfig": {
+    "access": "public"
+  },
   "scripts": {
     "start": "dumi dev",
     "docs:build": "dumi build",
@@ -30,6 +34,8 @@
     ]
   },
   "dependencies": {
+    "echarts": "^5.6.0",
+    "echarts-for-react": "^3.0.2",
     "react": "^17.0.0"
   },
   "devDependencies": {
@@ -39,7 +45,7 @@
     "@types/lodash": "^4.14.197",
     "@umijs/fabric": "^2.8.1",
     "@umijs/test": "^3.0.5",
-    "@zgfe/business-lib": "1.2.28-heyh.2",
+    "@zgfe/business-lib": "1.2.70-hxd.1",
     "antd": "^4.22.6",
     "dumi": "^1.1.0",
     "father": "^4.0.0-rc.2",
@@ -48,7 +54,8 @@
     "lint-staged": "^10.0.7",
     "lodash": "^4.17.21",
     "prettier": "^2.2.1",
+    "rc-virtual-list": "^3.14.2",
     "yorkie": "^2.0.0"
   },
-  "gitHead": "35a71c448972b23a590cef625899bde399a69918"
+  "gitHead": "ab5b488304d001d07b9f821ce4617452442830e9"
 }