@zgfe/modules-page 1.0.1-alpha.0 → 1.0.1-alpha.10

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

@@ -58,25 +58,29 @@ var ModulesPage = function ModulesPage(props) {
     _useState14 = _slicedToArray(_useState13, 2),
     loading = _useState14[0],
     setLoading = _useState14[1];
-  // 要编辑的分组
-  var _useState15 = useState(),
+  var _useState15 = useState(true),
     _useState16 = _slicedToArray(_useState15, 2),
-    editGroup = _useState16[0],
-    setEditGroup = _useState16[1];
-  // 当前页面类型 list/detail
-  var _useState17 = useState('list'),
+    pageLoading = _useState16[0],
+    setPageLoading = _useState16[1];
+  // 要编辑的分组
+  var _useState17 = useState(),
     _useState18 = _slicedToArray(_useState17, 2),
-    pageType = _useState18[0],
-    setPageType = _useState18[1];
-  var _useState19 = useState(0),
+    editGroup = _useState18[0],
+    setEditGroup = _useState18[1];
+  // 当前页面类型 list/detail
+  var _useState19 = useState('list'),
     _useState20 = _slicedToArray(_useState19, 2),
-    timer = _useState20[0],
-    setTimer = _useState20[1];
-  //当前点击内容（用于同步查询条件中的内容）
-  var _useState21 = useState(),
+    pageType = _useState20[0],
+    setPageType = _useState20[1];
+  var _useState21 = useState(0),
     _useState22 = _slicedToArray(_useState21, 2),
-    currentClickPage = _useState22[0],
-    setCurrentClickPage = _useState22[1];
+    timer = _useState22[0],
+    setTimer = _useState22[1];
+  //当前点击内容（用于同步查询条件中的内容）
+  var _useState23 = useState(),
+    _useState24 = _slicedToArray(_useState23, 2),
+    currentClickPage = _useState24[0],
+    setCurrentClickPage = _useState24[1];
   var _useContext = useContext(BizGlobalDataContext),
     eventGroupList = _useContext.eventGroupList,
     currentApp = _useContext.currentApp;
@@ -93,13 +97,12 @@ var ModulesPage = function ModulesPage(props) {
     return flag;
   }, [eventGroupList]);
   useEffect(function () {
-    if (isEmpty) return;
     var param = {
       appId: currentApp === null || currentApp === void 0 ? void 0 : currentApp.appId,
-      platform: (currentApp === null || currentApp === void 0 ? void 0 : currentApp.platform) || 0
+      platform: 3
     };
-    getPageGroupList(param, setPageGroupList);
     getPageList(param, setPageList);
+    getPageGroupList(param, setPageGroupList, setPageLoading);
   }, []);
   useEffect(function () {
     if (!showGroup) {
@@ -110,12 +113,13 @@ var ModulesPage = function ModulesPage(props) {
     if (isEmpty) return;
     if (!searchValue) return;
     console.log('searchValue:', searchValue);
-    var type = (searchValue === null || searchValue === void 0 ? void 0 : searchValue.type) || (searchValue !== null && searchValue !== void 0 && searchValue.pageGroup ? 'pageGroup' : 'page');
+    var type = searchValue !== null && searchValue !== void 0 && searchValue.pageGroup || (searchValue === null || searchValue === void 0 ? void 0 : searchValue.pageGroup) === 0 ? 'pageGroup' : 'page';
     setCurrentType(type);
     // 选择概览时，跳到列表页
     if (type === 'page' && !(searchValue !== null && searchValue !== void 0 && searchValue.pageUrl) || type === 'pageGroup' && !(searchValue !== null && searchValue !== void 0 && searchValue.pageGroup)) {
       setPageType('list');
     }
+    if (type === 'pageGroup' && !(searchValue !== null && searchValue !== void 0 && searchValue.pageGroup)) return;
     if (type === 'page' || pageType === 'detail') {
       fetch();
     }
@@ -129,7 +133,8 @@ var ModulesPage = function ModulesPage(props) {
     setTimer(setTimeout(function () {
       var param = _objectSpread({
         appId: currentApp === null || currentApp === void 0 ? void 0 : currentApp.appId,
-        platform: (currentApp === null || currentApp === void 0 ? void 0 : currentApp.platform) || 0
+        platform: 3,
+        modules: 'page'
       }, searchValue);
       getPageResult(param, setResult, setLoading);
     }, 500));
@@ -151,11 +156,12 @@ var ModulesPage = function ModulesPage(props) {
   };
   // 分组弹窗编辑回调，更新分组列表
   var onOk = function onOk() {
+    setShowGroup(false);
     var param = {
       appId: currentApp === null || currentApp === void 0 ? void 0 : currentApp.appId,
-      platform: (currentApp === null || currentApp === void 0 ? void 0 : currentApp.platform) || 0
+      platform: 3
     };
-    getPageGroupList(param, setPageGroupList);
+    getPageGroupList(param, setPageGroupList, setPageLoading);
   };
 
   // 点击表格中页面
@@ -192,7 +198,9 @@ var ModulesPage = function ModulesPage(props) {
       onChange: onChange
     }),
     topRender: props.onClickWarn ? render : null
-  }, /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(TopContent, {
+  }, /*#__PURE__*/React.createElement(Spin, {
+    spinning: pageLoading
+  }, /*#__PURE__*/React.createElement(TopContent, {
     value: searchValue === null || searchValue === void 0 ? void 0 : searchValue.time,
     type: currentType,
     disabled: !result.length,

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

@@ -29,10 +29,14 @@ export declare namespace ModulesPageTypes {
         param?: string;
         id?: string;
     }
+    interface Params {
+        appId?: number | string;
+        platform: number;
+    }
 }
 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/dist/esm/modules/home/utils.d.ts

@@ -1,7 +1,7 @@
 import { ModulesPageTypes } from './types';
 import { AppInfoProps } from '@zgfe/business-lib/es/context';
-export declare const getPageList: (data: any, callback: Function) => void;
-export declare const getPageGroupList: (data: any, callback: Function) => void;
-export declare const getPageResult: (params: any, callback: Function, loadingCallback: Function) => void;
+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 getSocketSecret: () => string;
 export declare const onDownload: (params?: ModulesPageTypes.Value, currentApp?: AppInfoProps) => void;

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

@@ -6,13 +6,22 @@ function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _ty
 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 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) return;
+    if (!res) {
+      callback([{
+        id: '页面概览',
+        pageTitle: '页面概览',
+        pageUrl: ''
+      }]);
+      return;
+    }
     var list = res.data;
     list.unshift({
       pageTitle: '页面概览',
@@ -29,18 +38,27 @@ export var getPageList = function getPageList(data, callback) {
 };
 
 // 获取页面分组列表
-export var getPageGroupList = function getPageGroupList(data, callback) {
+export var getPageGroupList = function getPageGroupList(data, callback, loadingCallback) {
+  loadingCallback && loadingCallback(true);
   ajax(api.getPageGroup, {
     method: 'post',
     data: data
   }).then(function (res) {
-    if (!res) return;
+    if (!res) {
+      callback([{
+        id: 0,
+        name: '全部页面组'
+      }]);
+      return;
+    }
     var list = res.data;
     list.unshift({
       id: 0,
       name: '全部页面组'
     });
     callback(list);
+  }).finally(function () {
+    loadingCallback && loadingCallback(false);
   });
 };
 
@@ -67,14 +85,20 @@ export var getSocketSecret = function getSocketSecret() {
 };
 export var onDownload = function onDownload(params, currentApp) {
   if (!params || !currentApp) return;
+  var title = params.pageTitle || '页面列表';
   ajax(api.download, {
     method: 'post',
-    data: _objectSpread({
+    data: _objectSpread(_objectSpread({
       appId: currentApp.appId,
-      platform: currentApp.platform
-    }, params),
+      platform: 3
+    }, params), {}, {
+      down: {
+        fname: base64.encode(title),
+        titles: []
+      }
+    }),
     responseType: 'blob',
-    fileName: '页面列表',
+    fileName: title,
     getResponse: true
   }).then(function () {});
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zgfe/modules-page",
-  "version": "1.0.1-alpha.0",
+  "version": "1.0.1-alpha.10",
   "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.76-page.0",
+    "@zgfe/business-lib": "1.1.80-page.0",
     "antd": "^4.22.6",
     "dumi": "^1.1.0",
     "father": "^4.0.0-rc.2",
@@ -49,5 +49,6 @@
     "lodash": "^4.17.21",
     "prettier": "^2.2.1",
     "yorkie": "^2.0.0"
-  }
+  },
+  "gitHead": "fdd9e45dec51d4d415d507454d257171fa2b1a5c"
 }

package/dist/esm/components/groupModal/mock.d.ts

@@ -1,5 +0,0 @@
-declare const _default: {
-    label: string;
-    value: string;
-}[];
-export default _default;

package/dist/esm/components/groupModal/mock.js

@@ -1,16 +0,0 @@
-export default [{
-  label: 'file:///C:/Program%20Files/Apache%20Software%20Foundation/Tomcat%207.0/webapps/test/test.html',
-  value: 'file:///C:/Program%20Files/Apache%20Software%20Foundation/Tomcat%207.0/webapps/test/test.html'
-}, {
-  label: 'file:///C:/Users/54451/Desktop/sign/signin.html',
-  value: 'file:///C:/Users/54451/Desktop/sign/signin.html'
-}, {
-  label: 'http://localhost:8080/sign/signup.html',
-  value: 'http://localhost:8080/sign/signup.html'
-}, {
-  label: 'http://www.yayibang.com/html/web/article/index.html',
-  value: 'http://www.yayibang.com/html/web/article/index.html'
-}, {
-  label: 'http://localhost:8080/#/login',
-  value: 'http://localhost:8080/#/login'
-}];