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

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,
@@ -97,10 +118,12 @@ var PageSelect = function PageSelect(props) {
     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/home/index.js

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

package/package.json

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