@zgfe/modules-page 1.0.1-alpha.9 → 1.0.2

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

@@ -1,47 +1,53 @@
 import _ from 'lodash';
-export var formValue = function formValue(source, userGroupList) {
+import { OperateTypes } from '@zgfe/business-lib/es/attrConditions/types';
+export var formValue = function formValue(source) {
   var data = _.cloneDeep(source) || {};
-  // 用户群变形
-  var result = [];
-  if (data.userGroup && data.userGroup.length) {
-    userGroupList === null || userGroupList === void 0 ? void 0 : userGroupList.forEach(function (user) {
-      var _data$userGroup;
-      if ((_data$userGroup = data.userGroup) !== null && _data$userGroup !== void 0 && _data$userGroup.includes(user.id)) {
-        result.push(user);
-      }
-    });
-  } else {
-    result = userGroupList ? [userGroupList[0]] : [{
-      id: 0,
-      name: '所有用户'
-    }];
-  }
-  var page = {
-    type: 'page',
+  var page = !data.pageUrl && !data.pageTitle && !data.pageGroup && data.pageGroup != 0 ? undefined : {
     pageGroup: data === null || data === void 0 ? void 0 : data.pageGroup,
     pageUrl: data === null || data === void 0 ? void 0 : data.pageUrl,
     pageTitle: data === null || data === void 0 ? void 0 : data.pageTitle
   };
   return {
-    userGroup: result,
+    userGroup: data.userGroup || [0],
     page: page,
     filters: data.filters
   };
 };
 export var formatValue = function formatValue(source) {
-  var _data$userGroup2, _data$page, _data$page2, _data$page3;
+  var _data$userGroup, _data$page, _data$page2, _data$page3;
   var data = _.cloneDeep(source) || {};
-  var group = [];
-  (_data$userGroup2 = data.userGroup) === null || _data$userGroup2 === void 0 ? void 0 : _data$userGroup2.forEach(function (item) {
-    if (item) {
-      group.push(item.id);
-    }
-  });
+  var filters = getConditionList(data.filters);
   return {
-    userGroup: group,
+    userGroup: ((_data$userGroup = data.userGroup) === null || _data$userGroup === void 0 ? void 0 : _data$userGroup.filter(function (item) {
+      return item || item === 0;
+    })) || [0],
     pageTitle: (_data$page = data.page) === null || _data$page === void 0 ? void 0 : _data$page.pageTitle,
     pageUrl: (_data$page2 = data.page) === null || _data$page2 === void 0 ? void 0 : _data$page2.pageUrl,
     pageGroup: (_data$page3 = data.page) === null || _data$page3 === void 0 ? void 0 : _data$page3.pageGroup,
-    filters: data.filters
+    filters: filters
   };
-};
+};
+
+/**
+ * 筛选条件当未选择值时，不查询
+ * @param filters 筛选条件数组
+ * @returns
+ */
+function getConditionList(filters) {
+  if (!filters || !filters.conditions) return;
+  var conditionList = [];
+  filters.conditions.forEach(function (item) {
+    if (!item.attrId && !item.attrName) return;
+    if (!item.values || !item.values.length) {
+      if (item.operator === OperateTypes.IsNotNull || item.operator === OperateTypes.IsNull) {
+        conditionList.push(item);
+      }
+    } else {
+      conditionList.push(item);
+    }
+  });
+  return conditionList.length ? {
+    conditions: conditionList,
+    relation: 'and'
+  } : undefined;
+}

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

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

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

@@ -28,6 +28,8 @@ var EmptyPanel = function EmptyPanel() {
   }, /*#__PURE__*/React.createElement("div", {
     className: "".concat(classPrefix, "-title")
   }, "\u9875\u9762\u70B9\u51FB\u5206\u6790"), /*#__PURE__*/React.createElement("p", null, "\u9875\u9762\u7684\u70B9\u51FB\u6548\u679C\u5C55\u793A\uFF0C\u53EF\u4EE5\u66F4\u52A0\u76F4\u89C2\u7684\u770B\u51FA\u9875\u9762\u4E2D\u70B9\u51FB\u7684\u5206\u5E03\u60C5\u51B5"), /*#__PURE__*/React.createElement("div", {
+    className: "".concat(classPrefix, "-content2")
+  }, /*#__PURE__*/React.createElement("div", {
     className: "".concat(classPrefix, "-title-secondary")
   }, "\u8BBE\u7F6E\u65B9\u6CD5"), /*#__PURE__*/React.createElement("p", null, "\u70B9\u51FB\u5206\u6790\u6570\u636E\u9ED8\u8BA4\u4E3A\u4E0D\u91C7\u96C6\uFF0C\u5982\u9700\u91C7\u96C6\uFF0C\u53EF\u5728\u76F8\u5E94\u9875\u9762\u7684SDK\u4EE3\u7801\u4E2D\u52A0\u5165\u4EE5\u4E0B\u53C2\u6570\u914D\u7F6E"), /*#__PURE__*/React.createElement("div", {
     className: "".concat(classPrefix, "-code-container")
@@ -40,7 +42,7 @@ var EmptyPanel = function EmptyPanel() {
     className: "".concat(classPrefix, "-code")
   }, "autoTrack: true,", /*#__PURE__*/React.createElement("span", null, "//\u5168\u57CB\u70B9\u5F00\u5173")), /*#__PURE__*/React.createElement("div", {
     className: "".concat(classPrefix, "-code")
-  }, "singlePage: false", /*#__PURE__*/React.createElement("span", null, "//\u662F\u5426\u4E3A\u5355\u9875\u9762\u5E94\u7528 \u9ED8\u8BA4\u4E3Afalse")), /*#__PURE__*/React.createElement("div", null, '}', ");")), /*#__PURE__*/React.createElement("p", null, "\u9002\u7528\u4E8ELanding Page\u3001\u6D3B\u52A8\u9875\u3001\u5B98\u7F51\uFF0C\u9875\u9762\u7B80\u5355\u53EF\u4F7F\u7528\u9875\u9762\u70B9\u51FB\u5206\u6790\u63D0\u5347\u6548\u7387\uFF0C\u5EFA\u8BAE\u4E0D\u8981\u5728\u590D\u6742\u9875\u9762\u4F7F\u7528\u3002")), /*#__PURE__*/React.createElement("img", {
+  }, "singlePage: false", /*#__PURE__*/React.createElement("span", null, "//\u662F\u5426\u4E3A\u5355\u9875\u9762\u5E94\u7528 \u9ED8\u8BA4\u4E3Afalse")), /*#__PURE__*/React.createElement("div", null, '}', ");")), /*#__PURE__*/React.createElement("p", null, "\u9002\u7528\u4E8ELanding Page\u3001\u6D3B\u52A8\u9875\u3001\u5B98\u7F51\uFF0C\u9875\u9762\u7B80\u5355\u53EF\u4F7F\u7528\u9875\u9762\u70B9\u51FB\u5206\u6790\u63D0\u5347\u6548\u7387\uFF0C\u5EFA\u8BAE\u4E0D\u8981\u5728\u590D\u6742\u9875\u9762\u4F7F\u7528\u3002"))), /*#__PURE__*/React.createElement("img", {
     className: "".concat(classPrefix, "-img"),
     src: chartImg
   }));

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

@@ -9,13 +9,19 @@
   background: url(./img/bg.png);
   background-size: cover;
   &-content {
-    width: 400px;
+    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;
@@ -31,10 +37,10 @@
   &-code-container {
     position: relative;
     height: 200px;
+    margin: 8px 0;
     padding: 16px;
-    background: #fff;
+    background: #fafafb;
     border-radius: 8px;
-
     &:hover {
       .empty-panel-code-copy {
         display: flex;
@@ -57,12 +63,11 @@
   }
   &-code-copy {
     position: absolute;
-    top: 8px;
-    right: 0;
+    top: 16px;
+    right: 16px;
     display: flex;
     display: none;
     align-items: center;
-    align-items: center;
     height: 24px;
     padding: 0 8px;
     background: #f2f3f4;

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

@@ -1,14 +1,72 @@
 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
+};
 export default (function () {
+  var onClickWarn = function onClickWarn() {
+    console.log('onClickWarn');
+  };
+  var onChange = function onChange(data) {
+    console.log('onChange:', data);
+  };
   return /*#__PURE__*/React.createElement(DemoWrapper, {
     needMeta: true,
-    defaultApp: 266
+    defaultApp: 225
   }, /*#__PURE__*/React.createElement("div", {
     style: {
       height: 750,
       overflow: 'auto'
     }
-  }, /*#__PURE__*/React.createElement(ModulesPage, null)));
+  }, /*#__PURE__*/React.createElement(ModulesPage, {
+    value: defaultValue,
+    onClickWarn: onClickWarn,
+    onChange: onChange
+  })));
 });

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

@@ -10,10 +10,10 @@ 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, { useContext, useEffect, useMemo, useState } from 'react';
+import React, { useContext, useEffect, useMemo, useRef, useState } from 'react';
 import EmptyPanel from "../empty";
-import { BizGlobalDataContext, BizLayout } from '@zgfe/business-lib';
-import { Button, Spin } from 'antd';
+import { BizGlobalDataContext, BizLayout, BizLoading } from '@zgfe/business-lib';
+import { Button, Skeleton, Spin } from 'antd';
 import "./style/index.less";
 import SearchPanel from "../../components/searchPanel";
 import TopContent from "../../components/topContent";
@@ -22,6 +22,7 @@ import { ModulesPageContext } from "./types";
 import GroupModal from "../../components/groupModal";
 import { getPageGroupList, getPageList, getPageResult, onDownload as _onDownload } from "./utils";
 import DetailContent from "../../components/detail";
+import _ from 'lodash';
 var classPrefix = 'modules-page';
 var ModulesPage = function ModulesPage(props) {
   // 页面类型
@@ -29,58 +30,71 @@ var ModulesPage = function ModulesPage(props) {
     _useState2 = _slicedToArray(_useState, 2),
     currentType = _useState2[0],
     setCurrentType = _useState2[1];
-  // 查询条件
-  var _useState3 = useState(),
+  // 最新查询条件
+  var _useState3 = useState(props.value),
     _useState4 = _slicedToArray(_useState3, 2),
     searchValue = _useState4[0],
     setSearchValue = _useState4[1];
-  // 是否展示分组弹窗
-  var _useState5 = useState(false),
+  // 上一次查询条件
+  var _useState5 = useState(),
     _useState6 = _slicedToArray(_useState5, 2),
-    showGroup = _useState6[0],
-    setShowGroup = _useState6[1];
-  // 页面列表
-  var _useState7 = useState([]),
+    originSearchValue = _useState6[0],
+    setOriginSearchValue = _useState6[1];
+
+  // 是否展示分组弹窗
+  var _useState7 = useState(false),
     _useState8 = _slicedToArray(_useState7, 2),
-    pageList = _useState8[0],
-    setPageList = _useState8[1];
-  // 页面分组列表
+    showGroup = _useState8[0],
+    setShowGroup = _useState8[1];
+  // 页面列表
   var _useState9 = useState([]),
     _useState10 = _slicedToArray(_useState9, 2),
-    pageGroupList = _useState10[0],
-    setPageGroupList = _useState10[1];
-  // 查询结果
+    pageList = _useState10[0],
+    setPageList = _useState10[1];
+  // 页面分组列表
   var _useState11 = useState([]),
     _useState12 = _slicedToArray(_useState11, 2),
-    result = _useState12[0],
-    setResult = _useState12[1];
-  var _useState13 = useState(true),
+    pageGroupList = _useState12[0],
+    setPageGroupList = _useState12[1];
+  // 查询结果
+  var _useState13 = useState([]),
     _useState14 = _slicedToArray(_useState13, 2),
-    loading = _useState14[0],
-    setLoading = _useState14[1];
+    result = _useState14[0],
+    setResult = _useState14[1];
   var _useState15 = useState(true),
     _useState16 = _slicedToArray(_useState15, 2),
-    pageLoading = _useState16[0],
-    setPageLoading = _useState16[1];
-  // 要编辑的分组
-  var _useState17 = useState(),
+    loading = _useState16[0],
+    setLoading = _useState16[1];
+  var _useState17 = useState(true),
     _useState18 = _slicedToArray(_useState17, 2),
-    editGroup = _useState18[0],
-    setEditGroup = _useState18[1];
-  // 当前页面类型 list/detail
-  var _useState19 = useState('list'),
+    pageLoading = _useState18[0],
+    setPageLoading = _useState18[1];
+  // 要编辑的分组
+  var _useState19 = useState(),
     _useState20 = _slicedToArray(_useState19, 2),
-    pageType = _useState20[0],
-    setPageType = _useState20[1];
-  var _useState21 = useState(0),
+    editGroup = _useState20[0],
+    setEditGroup = _useState20[1];
+  // 当前页面类型 list/detail
+  var _useState21 = useState('list'),
     _useState22 = _slicedToArray(_useState21, 2),
-    timer = _useState22[0],
-    setTimer = _useState22[1];
-  //当前点击内容（用于同步查询条件中的内容）
-  var _useState23 = useState(),
+    pageType = _useState22[0],
+    setPageType = _useState22[1];
+  var _useState23 = useState(0),
     _useState24 = _slicedToArray(_useState23, 2),
-    currentClickPage = _useState24[0],
-    setCurrentClickPage = _useState24[1];
+    timer = _useState24[0],
+    setTimer = _useState24[1];
+  //当前点击内容（用于同步查询条件中的内容）
+  var _useState25 = useState(),
+    _useState26 = _slicedToArray(_useState25, 2),
+    currentClickPage = _useState26[0],
+    setCurrentClickPage = _useState26[1];
+  var _React$useState = React.useState(),
+    _React$useState2 = _slicedToArray(_React$useState, 2),
+    controller = _React$useState2[0],
+    setController = _React$useState2[1];
+
+  // 查询条件ref
+  var selectRef = useRef(null);
   var _useContext = useContext(BizGlobalDataContext),
     eventGroupList = _useContext.eventGroupList,
     currentApp = _useContext.currentApp;
@@ -112,7 +126,6 @@ var ModulesPage = function ModulesPage(props) {
   useEffect(function () {
     if (isEmpty) return;
     if (!searchValue) return;
-    console.log('searchValue:', searchValue);
     var type = searchValue !== null && searchValue !== void 0 && searchValue.pageGroup || (searchValue === null || searchValue === void 0 ? void 0 : searchValue.pageGroup) === 0 ? 'pageGroup' : 'page';
     setCurrentType(type);
     // 选择概览时，跳到列表页
@@ -121,7 +134,18 @@ var ModulesPage = function ModulesPage(props) {
     }
     if (type === 'pageGroup' && !(searchValue !== null && searchValue !== void 0 && searchValue.pageGroup)) return;
     if (type === 'page' || pageType === 'detail') {
+      if (!searchValue.pageUrl && !searchValue.pageTitle && !searchValue.pageGroup && searchValue.pageGroup != 0) return;
       fetch();
+    } else if (type === 'pageGroup') {
+      if (!searchValue.pageGroup && searchValue.pageGroup != 0) return;
+      props.onChange && props.onChange(_objectSpread(_objectSpread({
+        appId: currentApp === null || currentApp === void 0 ? void 0 : currentApp.appId,
+        platform: 3,
+        module: 'page'
+      }, searchValue), {}, {
+        pageUrl: undefined,
+        pageTitle: undefined
+      }));
     }
   }, [searchValue]);
   // 查询结果
@@ -133,12 +157,23 @@ var ModulesPage = function ModulesPage(props) {
     setTimer(setTimeout(function () {
       var param = _objectSpread({
         appId: currentApp === null || currentApp === void 0 ? void 0 : currentApp.appId,
-        platform: 3
+        platform: 3,
+        module: 'page'
       }, searchValue);
-      getPageResult(param, setResult, setLoading);
+      props.onChange && props.onChange(param);
+      if (_.isEqual(originSearchValue, searchValue)) {
+        setLoading(false);
+        return;
+      }
+      setOriginSearchValue(_.cloneDeep(searchValue));
+      var control = new AbortController();
+      var signal = control.signal;
+      controller === null || controller === void 0 ? void 0 : controller.abort();
+      setController(control);
+      getPageResult(param, setResult, setLoading, signal);
     }, 500));
   };
-  // 改变查询条件
+  // 改变查询条件/
   var onChange = function onChange(data) {
     setSearchValue(function (value) {
       if (!value) return data;
@@ -179,6 +214,7 @@ var ModulesPage = function ModulesPage(props) {
     className: "".concat(classPrefix, "-top-render")
   }, /*#__PURE__*/React.createElement(Button, {
     type: "primary",
+    disabled: loading || !result || !result.length,
     onClick: props.onClickWarn
   }, "\u8BBE\u7F6E\u6D41\u5931\u9884\u8B66"));
   if (isEmpty) return /*#__PURE__*/React.createElement(EmptyPanel, null);
@@ -190,13 +226,22 @@ var ModulesPage = function ModulesPage(props) {
       setCurrentClickPage: setCurrentClickPage
     }
   }, /*#__PURE__*/React.createElement(BizLayout, {
+    className: classPrefix,
     title: "\u9875\u9762\u5206\u6790",
     hasCollapse: true,
-    topPanel: /*#__PURE__*/React.createElement(SearchPanel, {
+    topPanel: /*#__PURE__*/React.createElement(Skeleton, {
+      loading: pageLoading,
+      active: true,
+      paragraph: {
+        rows: 4
+      }
+    }, /*#__PURE__*/React.createElement(SearchPanel, {
+      ref: selectRef,
       value: searchValue,
       onChange: onChange
-    }),
-    topRender: props.onClickWarn ? render : null
+    })),
+    topRender: props.onClickWarn ? render : null,
+    collapseRef: selectRef
   }, /*#__PURE__*/React.createElement(Spin, {
     spinning: pageLoading
   }, /*#__PURE__*/React.createElement(TopContent, {
@@ -211,9 +256,9 @@ var ModulesPage = function ModulesPage(props) {
     onDownload: function onDownload() {
       return _onDownload(searchValue, currentApp);
     }
-  }), /*#__PURE__*/React.createElement(Spin, {
-    spinning: loading
-  }, pageType === 'list' ? /*#__PURE__*/React.createElement(PageContent, {
+  }), loading && !pageLoading ? /*#__PURE__*/React.createElement("div", {
+    className: "".concat(classPrefix, "-content")
+  }, /*#__PURE__*/React.createElement(BizLoading, null)) : pageType === 'list' ? /*#__PURE__*/React.createElement(PageContent, {
     type: currentType,
     value: result,
     groupId: searchValue === null || searchValue === void 0 ? void 0 : searchValue.pageGroup,
@@ -226,7 +271,7 @@ var ModulesPage = function ModulesPage(props) {
   }) : /*#__PURE__*/React.createElement(DetailContent, {
     params: searchValue,
     result: result
-  })), showGroup ? /*#__PURE__*/React.createElement(GroupModal, {
+  }), showGroup ? /*#__PURE__*/React.createElement(GroupModal, {
     value: editGroup,
     onCancel: function onCancel() {
       return setShowGroup(false);

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

@@ -9,6 +9,11 @@
       padding: 4px 16px;
     }
   }
+  .ant-btn-primary[disabled] {
+    color: #fff;
+    background: #d0dfff;
+    border-color: #d0dfff;
+  }
 
   &-spin {
     display: flex;
@@ -19,4 +24,22 @@
     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;
+    }
+  }
 }

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

@@ -5,9 +5,13 @@ export declare namespace ModulesPageTypes {
     interface Props {
         value?: Value;
         onClickWarn?: () => void;
+        onChange?: (data: Value) => void;
     }
     interface Value extends SearchValue {
         time?: DatePickerTypes.Value;
+        appId?: number | string;
+        platform?: number;
+        module?: string;
     }
     interface Page {
         pageTitle?: string;
@@ -37,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/dist/esm/modules/home/utils.d.ts

@@ -2,6 +2,6 @@ import { ModulesPageTypes } from './types';
 import { AppInfoProps } from '@zgfe/business-lib/es/context';
 export declare const getPageList: (data: ModulesPageTypes.Params, callback: Function) => void;
 export declare const getPageGroupList: (data: ModulesPageTypes.Params, callback: Function, loadingCallback?: Function) => void;
-export declare const getPageResult: (params: ModulesPageTypes.Params & ModulesPageTypes.Value, callback: Function, loadingCallback: Function) => void;
+export declare const getPageResult: (params: ModulesPageTypes.Value, callback: Function, loadingCallback: Function, signal: AbortSignal) => void;
 export declare const getSocketSecret: () => string;
 export declare const onDownload: (params?: ModulesPageTypes.Value, currentApp?: AppInfoProps) => void;

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

@@ -4,17 +4,15 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
 function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _typeof(key) === "symbol" ? key : String(key); }
 function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (_typeof(res) !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
-import { ajax, util } from '@zgfe/business-lib';
+import { ajax, util, base64 } from '@zgfe/business-lib';
 import api from "../../constants/api";
-import base64 from "./base64";
-
 // 获取页面列表
 export var getPageList = function getPageList(data, callback) {
   ajax(api.getPageList, {
     method: 'post',
     data: data
   }).then(function (res) {
-    if (!res) {
+    if (!res || !res.data) {
       callback([{
         id: '页面概览',
         pageTitle: '页面概览',
@@ -44,7 +42,7 @@ export var getPageGroupList = function getPageGroupList(data, callback, loadingC
     method: 'post',
     data: data
   }).then(function (res) {
-    if (!res) {
+    if (!res || !res.data) {
       callback([{
         id: 0,
         name: '全部页面组'
@@ -63,16 +61,30 @@ export var getPageGroupList = function getPageGroupList(data, callback, loadingC
 };
 
 // 获取页面查询结果
-export var getPageResult = function getPageResult(params, callback, loadingCallback) {
+export var getPageResult = function getPageResult(params, callback, loadingCallback, signal) {
   loadingCallback(true);
   ajax(api.getPageResult, {
     method: 'post',
-    data: params
+    data: params,
+    signal: signal
   }).then(function (res) {
-    if (!res) return;
-    callback(res.data);
-  }).finally(function () {
+    var _res$data;
     loadingCallback(false);
+    if (!res || !res.data) {
+      callback([]);
+      return;
+    }
+    callback((_res$data = res.data) === null || _res$data === void 0 ? void 0 : _res$data.map(function (item) {
+      return _objectSpread(_objectSpread({}, item), {}, {
+        id: "".concat(item.userGroup, "-").concat(item.pageTitle, "-").concat(item.pageUrl)
+      });
+    }));
+  }).catch(function (e) {
+    if (e.isCancel) {
+      console.log('请求被取消了');
+    } else {
+      loadingCallback(false);
+    }
   });
 };
 export var getSocketSecret = function getSocketSecret() {
@@ -90,10 +102,11 @@ export var onDownload = function onDownload(params, currentApp) {
     method: 'post',
     data: _objectSpread(_objectSpread({
       appId: currentApp.appId,
-      platform: 3
+      platform: 3,
+      module: 'page'
     }, params), {}, {
       down: {
-        fname: base64.encode(title),
+        fname: base64.encode(title, false),
         titles: []
       }
     }),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zgfe/modules-page",
-  "version": "1.0.1-alpha.9",
+  "version": "1.0.2",
   "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.80-page.0",
+    "@zgfe/business-lib": "1.1.84-panel.5",
     "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": "68e794566bd35c0ac1048268f81f5a612e75ae9d"
+  "gitHead": "0dcf9a6f6d72a00a3459f9d7c9712a12b933c9a6"
 }

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

@@ -1,23 +0,0 @@
-declare const _default: {
-    _keyStr: string;
-    _utf8_encode: (string: string) => string;
-    _utf8_decode: (utftext: string) => string;
-    encode: (input: string, type?: boolean) => string;
-    decode: (input: string) => string;
-    _$: string[];
-    pw: string;
-    gString: (O6b8: {
-        [x: string]: (arg0: number) => {
-            (): any;
-            new (): any;
-            [x: string]: () => any;
-        };
-    }[], O492: {
-        [x: string]: (arg0: number) => {
-            (): any;
-            new (): any;
-            [x: string]: () => any;
-        };
-    }[]) => string;
-};
-export default _default;