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

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

@@ -15,6 +15,7 @@ import { pageTypes } from "../../constants";
 import React, { useContext, useEffect, useState } from 'react';
 import "./index.less";
 import { ModulesPageContext } from "../../modules/home/types";
+import { Tooltip } from 'antd';
 var PageSelect = function PageSelect(props) {
   // 根据类型展示的列表
   var _useState = useState([]),
@@ -37,7 +38,27 @@ var PageSelect = function PageSelect(props) {
     pageGroupList = _useContext.pageGroupList,
     currentClickPage = _useContext.currentClickPage;
   useEffect(function () {
-    console.log('currentClickPage;', currentClickPage);
+    var _props$value, _props$value2;
+    if (!props.value) return;
+    var type = (_props$value = props.value) !== null && _props$value !== void 0 && _props$value.pageGroup || ((_props$value2 = props.value) === null || _props$value2 === void 0 ? void 0 : _props$value2.pageGroup) === 0 ? 1 : 0;
+    setCurrentType(pageTypes[type]);
+    setCurrentValue(function () {
+      if (type === 1) {
+        var data = props.value;
+        return {
+          id: "".concat(data.pageTitle ? data.pageTitle + '-' : '').concat(data.pageUrl),
+          pageTitle: data.pageTitle,
+          pageUrl: data.pageUrl
+        };
+      }
+      return pageGroupList.filter(function (item) {
+        var _props$value3;
+        return item.id === ((_props$value3 = props.value) === null || _props$value3 === void 0 ? void 0 : _props$value3.pageGroup);
+      })[0];
+    });
+  }, []);
+  useEffect(function () {
+    if (!currentClickPage) return;
     setCurrentValue(function () {
       if (currentClickPage && currentClickPage.pageUrl) {
         var _ref = currentClickPage,
@@ -94,13 +115,15 @@ 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, {
+  }), /*#__PURE__*/React.createElement(Tooltip, {
+    title: "\u6DFB\u52A0\u5C5E\u6027\u7B5B\u9009"
+  }, /*#__PURE__*/React.createElement(IconFont, {
     className: "".concat(classPrefix, "-panel-icon").concat(!props.enableAdd ? ' disabled' : ''),
     type: "shaixuan",
     onClick: props.onAdd
-  })));
+  }))));
 };
 export default PageSelect;

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

@@ -12,7 +12,7 @@ import { BizAttrConditionGroup, BizGlobalDataContext, BizUserGroup, IconFont } f
 import PageSelect from "../pageSelect";
 import { formValue, formatValue } from "./util";
 var SearchPanel = function SearchPanel(props) {
-  var classPrefix = 'search-panel';
+  var classPrefix = 'page-search-panel';
   // form 值
   var _Form$useForm = Form.useForm(),
     _Form$useForm2 = _slicedToArray(_Form$useForm, 1),

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

@@ -1,6 +1,6 @@
 @import '~@zgfe/business-lib/es/assets/styles/inner.less';
 
-.search-panel {
+.page-search-panel {
   &-title.ant-form-item {
     margin-bottom: 12px;
     padding-left: 24px;
@@ -21,7 +21,7 @@
     &:hover {
       background: #e8efff;
     }
-    .search-panel-item.ant-form-item {
+    .page-search-panel-item.ant-form-item {
       margin-bottom: 0;
       padding: 4px 0;
     }
@@ -39,7 +39,7 @@
     }
   }
 
-  &-item3:not(.search-panel-hidden) {
+  &-item3:not(.page-search-panel-hidden) {
     margin-bottom: 20px;
     padding: 4px 24px;
     &:hover {
@@ -49,8 +49,6 @@
 
   &-item2 {
     margin-bottom: 4px;
-    .page-select-panel {
-    }
   }
 
   &-hidden.ant-form-item {

package/dist/esm/components/searchPanel/util.d.ts

@@ -2,17 +2,9 @@ import { BizSelectTypes } from '@zgfe/business-lib';
 import { FormValue, SearchValue } from './types';
 export declare const formValue: (source?: SearchValue, userGroupList?: BizSelectTypes.Option[]) => FormValue;
 export declare const formatValue: (source: FormValue) => {
-    filters: import("@zgfe/business-lib").AttrConditionTypes.GroupValue | undefined;
-    userGroup: number[];
-} | {
-    filters: import("@zgfe/business-lib").AttrConditionTypes.GroupValue | undefined;
-    type?: string | undefined;
-    pageUrl?: string | undefined;
-    pageTitle?: string | undefined;
     userGroup: number[];
-} | {
+    pageTitle: string | undefined;
+    pageUrl: string | undefined;
+    pageGroup: number | undefined;
     filters: import("@zgfe/business-lib").AttrConditionTypes.GroupValue | undefined;
-    type?: string | undefined;
-    pageGroup?: number | undefined;
-    userGroup: number[];
 };

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

@@ -1,9 +1,3 @@
-function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
-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 _ from 'lodash';
 export var formValue = function formValue(source, userGroupList) {
   var data = _.cloneDeep(source) || {};
@@ -35,7 +29,7 @@ export var formValue = function formValue(source, userGroupList) {
   };
 };
 export var formatValue = function formatValue(source) {
-  var _data$userGroup2;
+  var _data$userGroup2, _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) {
@@ -43,9 +37,11 @@ export var formatValue = function formatValue(source) {
       group.push(item.id);
     }
   });
-  return _objectSpread(_objectSpread({
-    userGroup: group
-  }, data.page), {}, {
+  return {
+    userGroup: group,
+    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
-  });
+  };
 };

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
@@ -110,7 +109,7 @@ 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)) {

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.2",
   "scripts": {
     "start": "dumi dev",
     "docs:build": "dumi build",