@zgfe/modules-page 1.0.1-alpha.20 → 1.0.1-alpha.22

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

@@ -15,7 +15,7 @@ import "./index.less";
 import { BizGlobalDataContext, IconFont, SocketClient, ajax } from '@zgfe/business-lib';
 import { Tooltip } from 'antd';
 import { getNumPer, toThousands } from "../content/utils";
-import percentImg from "./images/color_pallete_percent.png";
+import percentImg from "./images/percent.png";
 import renderImg from "./images/empty.png";
 import { ModulesPageContext } from "../../modules/home/types";
 import { getSocketSecret } from "../../modules/home/utils";

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

@@ -11,6 +11,7 @@
     justify-content: space-between;
     padding: 16px;
     background: #fafafb;
+    border-radius: 8px 8px 0 0;
     &-title {
       display: flex;
       flex: 1;
@@ -18,7 +19,7 @@
     }
     &-value {
       display: inline-block;
-      width: calc(100% - 100px);
+      max-width: calc(100% - 100px);
       .__default-overflow();
     }
     &-label {
@@ -43,6 +44,9 @@
         color: #9aa1a9;
         font-size: 16px !important;
         cursor: pointer;
+        &:hover {
+          color: @primary-color;
+        }
       }
     }
   }
@@ -53,8 +57,10 @@
     min-height: 422px;
     padding: 16px;
     &-img {
-      height: 22px;
       text-align: right;
+      img {
+        height: 22px;
+      }
     }
     &-panel {
       display: flex;

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

@@ -120,6 +120,7 @@ var GroupModal = function GroupModal(props) {
   };
   return /*#__PURE__*/React.createElement(BizDialog, {
     open: true,
+    closable: true,
     className: classPrefix,
     width: 720,
     title: props.value ? '修改分组' : '创建分组',
@@ -127,7 +128,8 @@ var GroupModal = function GroupModal(props) {
     okButtonProps: {
       disabled: isDemo
     },
-    footer: btnList
+    footer: btnList,
+    onCancel: props.onCancel
   }, /*#__PURE__*/React.createElement(Spin, {
     spinning: loading
   }, /*#__PURE__*/React.createElement(Form, {
@@ -160,12 +162,13 @@ var GroupModal = function GroupModal(props) {
   }, /*#__PURE__*/React.createElement(Input, {
     className: "".concat(classPrefix, "-form-input"),
     placeholder: "\u8BF7\u8F93\u5165\u5728\u67E5\u770B\u70B9\u51FB\u56FE\u65F6\u7684\u80CC\u666F\u9875\u9762"
-  })), /*#__PURE__*/React.createElement(Form.Item, {
+  })), /*#__PURE__*/React.createElement("div", {
     className: "".concat(classPrefix, "-form-title")
   }, " \u6DFB\u52A0\u9875\u9762"), /*#__PURE__*/React.createElement(Form.Item, {
-    name: "filters"
+    name: "filters",
+    className: "".concat(classPrefix, "-form-item-filter")
   }, /*#__PURE__*/React.createElement(PageItem, {
     validate: validate
-  }))), /*#__PURE__*/React.createElement(Button, null)));
+  })))));
 };
 export default GroupModal;

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

@@ -5,8 +5,8 @@
     border-color: #fafafb;
   }
   &-form-title {
-    margin-bottom: 12px;
     color: @text-color-secondary;
+    line-height: 1;
   }
 
   &-item {
@@ -109,6 +109,7 @@
       align-items: center;
       width: fit-content;
       height: 32px;
+      margin-bottom: 12px;
       color: @primary-color;
       cursor: pointer;
 
@@ -137,6 +138,9 @@
     }
   }
 
+  &-form-item-filter.ant-form-item {
+    margin-bottom: 12px;
+  }
   &-dropdown {
     width: 300px;
     &-handle {
@@ -153,9 +157,14 @@
     &:not([disabled]):focus {
       border-color: @primary-color;
     }
+    &[disabled] {
+      color: #ccd0d4;
+      background: @background-color-gray;
+    }
   }
   .ant-modal-content {
     .ant-modal-body {
+      padding-top: 8px;
       padding-bottom: 0;
     }
     .ant-modal-footer {
@@ -164,8 +173,19 @@
 
       .group-modal-footer-del {
         float: left;
+        background: #f2f3f4 !important;
         .bsicon {
           margin-right: 8px;
+          font-size: 16px !important;
+          line-height: 1;
+        }
+        &.ant-btn-text:hover {
+          color: #fb5547 !important;
+          background: #f2f3f4 !important;
+        }
+        &.ant-btn-text:focus {
+          color: #e24c40 !important;
+          background: #f2f3f4 !important;
         }
       }
     }

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

@@ -52,6 +52,7 @@ var InputSelect = function InputSelect(props) {
       }, "\u6682\u65E0\u6570\u636E");
     }
   }, /*#__PURE__*/React.createElement(Input, {
+    placeholder: "\u8BF7\u9009\u62E9",
     className: "".concat(classPrefix, "-dropdown-handle"),
     value: searchValue,
     allowClear: true,

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

@@ -39,23 +39,24 @@ var PageSelect = function PageSelect(props) {
     currentClickPage = _useContext.currentClickPage;
   useEffect(function () {
     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 === 0) {
-        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];
-    });
+    if (props.value) {
+      setCurrentValue(function () {
+        if (type === 0) {
+          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];
+      });
+    }
     setTimeout(function () {
       setIsFirst(false);
     }, 0);
@@ -80,9 +81,13 @@ var PageSelect = function PageSelect(props) {
     setCurrentValue(list[0]);
   }, [currentType]);
   useEffect(function () {
-    props.onChange && props.onChange(_objectSpread(_objectSpread({}, currentValue || {}), {}, {
-      pageGroup: currentType.value === 'pageGroup' ? currentValue === null || currentValue === void 0 ? void 0 : currentValue.id : undefined,
-      type: currentType.value
+    if (props.value) return;
+    setCurrentValue(pageList[0]);
+  }, [pageList.length]);
+  useEffect(function () {
+    if (!currentValue) return;
+    props.onChange && props.onChange(_objectSpread(_objectSpread({}, currentValue), {}, {
+      pageGroup: currentType.value === 'pageGroup' ? currentValue === null || currentValue === void 0 ? void 0 : currentValue.id : undefined
     }));
   }, [currentType, currentValue]);
   var getCustomLabel = function getCustomLabel(node, option) {

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

@@ -2,9 +2,7 @@ import _ from 'lodash';
 import { OperateTypes } from '@zgfe/business-lib/es/attrConditions/types';
 export var formValue = function formValue(source) {
   var data = _.cloneDeep(source) || {};
-  var type = data !== null && data !== void 0 && data.pageGroup || (data === null || data === void 0 ? void 0 : data.pageGroup) === 0 ? 'pageGroup' : 'page';
-  var page = {
-    type: type,
+  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

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,16 @@
   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;
+  }
   &-title {
     margin-bottom: 24px;
     font-weight: 500;
@@ -32,7 +35,7 @@
     position: relative;
     height: 200px;
     padding: 16px;
-    background: #fff;
+    background: #fafafb;
     border-radius: 8px;
 
     &:hover {
@@ -57,12 +60,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/index.js

@@ -132,13 +132,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') {
-      props.onChange && props.onChange(_objectSpread({
+      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));
+      }, searchValue), {}, {
+        pageUrl: undefined,
+        pageTitle: undefined
+      }));
     }
   }, [searchValue]);
   // 查询结果
@@ -148,17 +153,17 @@ var ModulesPage = function ModulesPage(props) {
     }
     setLoading(true);
     setTimer(setTimeout(function () {
-      if (_.isEqual(originSearchValue, searchValue)) {
-        setLoading(false);
-        return;
-      }
-      setOriginSearchValue(_.cloneDeep(searchValue));
       var param = _objectSpread({
         appId: currentApp === null || currentApp === void 0 ? void 0 : currentApp.appId,
         platform: 3,
         module: 'page'
       }, searchValue);
       props.onChange && props.onChange(param);
+      if (_.isEqual(originSearchValue, searchValue)) {
+        setLoading(false);
+        return;
+      }
+      setOriginSearchValue(_.cloneDeep(searchValue));
       getPageResult(param, setResult, setLoading);
     }, 500));
   };
@@ -215,6 +220,7 @@ var ModulesPage = function ModulesPage(props) {
       setCurrentClickPage: setCurrentClickPage
     }
   }, /*#__PURE__*/React.createElement(BizLayout, {
+    className: classPrefix,
     title: "\u9875\u9762\u5206\u6790",
     hasCollapse: true,
     topPanel: /*#__PURE__*/React.createElement(Skeleton, {

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

@@ -29,4 +29,10 @@
     margin-top: 60px;
     background-color: #fff;
   }
+  .ant-btn {
+    .bsicon {
+      font-size: 16px !important;
+      line-height: 1;
+    }
+  }
 }

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

@@ -41,6 +41,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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zgfe/modules-page",
-  "version": "1.0.1-alpha.20",
+  "version": "1.0.1-alpha.22",
   "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.81-page.10",
+    "@zgfe/business-lib": "1.1.81-page.16",
     "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": "ec25eecbfc957817643b49e2df5d8f03e14463e4"
+  "gitHead": "521427cd3566eba3e8d0dad2bcd9c266cc627545"
 }