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

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

@@ -11,7 +11,7 @@ function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len
 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 { BizDialog, BizGlobalDataContext, IconFont, ajax } from '@zgfe/business-lib';
-import { Button, Form, Input } from 'antd';
+import { Button, Form, Input, Spin } from 'antd';
 import React, { useContext, useEffect, useRef, useState } from 'react';
 import "./index.less";
 import PageItem from "./pageItem";
@@ -24,29 +24,25 @@ var GroupModal = function GroupModal(props) {
     _useState2 = _slicedToArray(_useState, 2),
     loading = _useState2[0],
     setLoading = _useState2[1];
-  var _useState3 = useState(false),
-    _useState4 = _slicedToArray(_useState3, 2),
-    delLoading = _useState4[0],
-    setDelLoading = _useState4[1];
   var _useContext = useContext(BizGlobalDataContext),
     currentApp = _useContext.currentApp,
     isDemo = _useContext.isDemo;
   var refForm = useRef();
   // 默认的url数组
-  var _useState5 = useState(mockData),
-    _useState6 = _slicedToArray(_useState5, 2),
-    defaultOption = _useState6[0],
-    setDefaultOption = _useState6[1];
+  var _useState3 = useState(mockData),
+    _useState4 = _slicedToArray(_useState3, 2),
+    defaultOption = _useState4[0],
+    setDefaultOption = _useState4[1];
   // 是否校验
-  var _useState7 = useState(false),
-    _useState8 = _slicedToArray(_useState7, 2),
-    validate = _useState8[0],
-    setValidate = _useState8[1];
+  var _useState5 = useState(false),
+    _useState6 = _slicedToArray(_useState5, 2),
+    validate = _useState6[0],
+    setValidate = _useState6[1];
   // 按钮组
-  var _useState9 = useState([]),
-    _useState10 = _slicedToArray(_useState9, 2),
-    btnList = _useState10[0],
-    setBtnList = _useState10[1];
+  var _useState7 = useState([]),
+    _useState8 = _slicedToArray(_useState7, 2),
+    btnList = _useState8[0],
+    setBtnList = _useState8[1];
   useEffect(function () {
     getPageEsData('', setDefaultOption, currentApp === null || currentApp === void 0 ? void 0 : currentApp.appId, currentApp === null || currentApp === void 0 ? void 0 : currentApp.platform);
     setBtnList(function () {
@@ -57,7 +53,6 @@ var GroupModal = function GroupModal(props) {
       }, "\u53D6\u6D88"), /*#__PURE__*/React.createElement(Button, {
         key: "submit",
         type: "primary",
-        loading: loading,
         onClick: onOk
       }, "\u786E\u5B9A")];
       if (props.value) {
@@ -66,7 +61,6 @@ var GroupModal = function GroupModal(props) {
           type: "text",
           className: "".concat(classPrefix, "-footer-del"),
           onClick: onDelete,
-          loading: delLoading,
           icon: /*#__PURE__*/React.createElement(IconFont, {
             type: "shanchu2"
           })
@@ -76,7 +70,7 @@ var GroupModal = function GroupModal(props) {
     });
   }, []);
   var onDelete = function onDelete() {
-    setDelLoading(true);
+    setLoading(true);
     ajax(api.deletePageGroup, {
       method: 'post',
       data: {
@@ -84,9 +78,11 @@ var GroupModal = function GroupModal(props) {
         platform: (currentApp === null || currentApp === void 0 ? void 0 : currentApp.platform) || 0,
         id: props.value.id
       }
-    }).then(function () {
-      setDelLoading(false);
+    }).then(function (res) {
+      if (!res) return;
       props.onOk && props.onOk();
+    }).finally(function () {
+      setLoading(false);
     });
   };
   var onOk = function onOk() {
@@ -97,7 +93,7 @@ var GroupModal = function GroupModal(props) {
     var _props$value;
     setValidate(true);
     var flag = true;
-    data.filter.forEach(function (item) {
+    data.filters.forEach(function (item) {
       if (!item.param) {
         flag = false;
       }
@@ -106,11 +102,15 @@ var GroupModal = function GroupModal(props) {
     setLoading(true);
     var url = props.value ? api.updatePageGroup : api.addPageGroup;
     ajax(url, {
+      method: 'post',
       data: _objectSpread({
         id: (_props$value = props.value) === null || _props$value === void 0 ? void 0 : _props$value.id
       }, data)
-    }).then(function () {
+    }).then(function (res) {
+      if (!res) return;
       props.onOk && props.onOk();
+    }).finally(function () {
+      setLoading(false);
     });
   };
   return /*#__PURE__*/React.createElement(BizDialog, {
@@ -123,7 +123,9 @@ var GroupModal = function GroupModal(props) {
       disabled: isDemo
     },
     footer: btnList
-  }, /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Form, {
+  }, /*#__PURE__*/React.createElement(Spin, {
+    spinning: loading
+  }, /*#__PURE__*/React.createElement(Form, {
     ref: refForm,
     onFinish: onSubmit,
     initialValues: props.value,

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

@@ -2,11 +2,14 @@ import { ajax } from '@zgfe/business-lib';
 import API from "../../constants/api";
 export var getPageEsData = function getPageEsData(searchValue, callback, appId, platform) {
   ajax(API.getPageEsData, {
-    appId: appId,
-    platform: platform || 0,
-    limit: 10000,
-    attr: 0,
-    v: searchValue
+    method: 'post',
+    data: {
+      appId: appId,
+      platform: platform || 0,
+      limit: 10000,
+      attr: 0,
+      v: searchValue
+    }
   }).then(function (res) {
     if (!res || !res.data) return;
     var list = res.data.sources;

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

@@ -94,7 +94,7 @@ var PageSelect = function PageSelect(props) {
     options: options,
     labelField: currentType.value === 'page' ? 'pageTitle' : 'name',
     popupContainer: true,
-    enableSearch: true,
+    enableSearch: options.length > 5,
     onChange: setCurrentValue,
     customLabel: getCustomLabel
   }), /*#__PURE__*/React.createElement(IconFont, {

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

@@ -11,22 +11,22 @@
   &-content {
     width: 400px;
     margin-left: 136px;
-    &-title {
-      margin-bottom: 24px;
-      font-weight: 500;
-      font-size: 28px;
-    }
-    &-title-secondary {
-      margin-top: 24px;
-      margin-bottom: 8px;
-      font-weight: 500;
-      font-size: 16px;
-    }
     p {
       color: #9aa1a9;
       font-size: 14px;
     }
   }
+  &-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;

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

@@ -93,7 +93,6 @@ 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

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

@@ -33,6 +33,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/dist/esm/modules/home/utils.js

@@ -12,7 +12,14 @@ export var getPageList = function getPageList(data, callback) {
     method: 'post',
     data: data
   }).then(function (res) {
-    if (!res) return;
+    if (!res) {
+      callback([{
+        id: '页面概览',
+        pageTitle: '页面概览',
+        pageUrl: ''
+      }]);
+      return;
+    }
     var list = res.data;
     list.unshift({
       pageTitle: '页面概览',
@@ -34,7 +41,13 @@ export var getPageGroupList = function getPageGroupList(data, callback) {
     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,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zgfe/modules-page",
-  "version": "1.0.1-alpha.0",
+  "version": "1.0.1-alpha.1",
   "scripts": {
     "start": "dumi dev",
     "docs:build": "dumi build",
@@ -49,5 +49,6 @@
     "lodash": "^4.17.21",
     "prettier": "^2.2.1",
     "yorkie": "^2.0.0"
-  }
+  },
+  "gitHead": "83eb5d8859328ab65d78573352b4bcd5a23d1d31"
 }