@zgfe/modules-page 1.0.17-zhongyuan.5 → 1.0.17-zhongyuan.9

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

@@ -9,7 +9,8 @@ import emptyImg from "../detail/images/empty.png";
 var PageContent = function PageContent(props) {
   var classPrefix = 'page-content';
   var _useContext = useContext(ModulesPageContext),
-    pageGroupList = _useContext.pageGroupList;
+    pageGroupList = _useContext.pageGroupList,
+    isAppAnalysis = _useContext.isAppAnalysis;
   var groupList = useMemo(function () {
     if (!pageGroupList) return [];
     var data = _.cloneDeep(pageGroupList);
@@ -45,7 +46,11 @@ var PageContent = function PageContent(props) {
   }
   return /*#__PURE__*/React.createElement("div", {
     className: classPrefix
-  }, /*#__PURE__*/React.createElement(BizTable, {
+  }, isAppAnalysis && /*#__PURE__*/React.createElement("div", null, [1, 2].map(function (o, index) {
+    return /*#__PURE__*/React.createElement("div", {
+      key: index
+    }, /*#__PURE__*/React.createElement("span", null, "\u6240\u6709\u7528\u6237\u300B"), /*#__PURE__*/React.createElement("span", null, "\u6D4F\u89C8\u6B21\u6570\uFF1A159", o), /*#__PURE__*/React.createElement("span", null, "\u6D4F\u89C8\u4EBA\u6570\uFF1A159"), /*#__PURE__*/React.createElement("span", null, "\u70B9\u51FB\u6B21\u6570\uFF1A159"), /*#__PURE__*/React.createElement("span", null, "\u70B9\u51FB\u4EBA\u6570\uFF1A159"));
+  })), /*#__PURE__*/React.createElement(BizTable, {
     rowKey: "id",
     dataSource: props.type === 'pageGroup' ? groupList : props.value,
     columns: columns

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

@@ -5,11 +5,12 @@ function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len
 function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 import { Form, Skeleton } from 'antd';
-import React, { useEffect, useRef, useState } from 'react';
+import React, { useContext, useEffect, useRef, useState } from 'react';
 import "./index.less";
 import { BizAttrConditionGroup, BizUserGroupHeader } from '@zgfe/business-lib';
 import PageSelect from "../pageSelect";
 import { formValue, formatValue } from "./util";
+import { ModulesPageContext } from "../../modules/home/types";
 var SearchPanel = /*#__PURE__*/React.forwardRef(function (props, ref) {
   var classPrefix = 'page-search-panel';
   // form 值
@@ -41,12 +42,14 @@ var SearchPanel = /*#__PURE__*/React.forwardRef(function (props, ref) {
       setLoading(false);
     }, 0);
   }, []);
+  var _useContext = useContext(ModulesPageContext),
+    isAppAnalysis = _useContext.isAppAnalysis;
 
-  /**
-   * 筛选值发生改变
-   * @param _changedValues 当前表单项改变后的值
-   * @param allValues 当前表单值
-   * @returns
+  /**
+   * 筛选值发生改变
+   * @param _changedValues 当前表单项改变后的值
+   * @param allValues 当前表单值
+   * @returns
    */
   var onChange = function onChange(_changedValues, allValues) {
     setFormData(allValues);
@@ -79,7 +82,15 @@ var SearchPanel = /*#__PURE__*/React.forwardRef(function (props, ref) {
     enableTags: true
   })), /*#__PURE__*/React.createElement("div", {
     ref: ref
-  }, /*#__PURE__*/React.createElement(Form.Item, {
+  }, isAppAnalysis ? /*#__PURE__*/React.createElement(Form.Item, {
+    className: "".concat(classPrefix, "-item3 ").concat(!count ? classPrefix + '-hidden' : ''),
+    name: "filters"
+  }, /*#__PURE__*/React.createElement(BizAttrConditionGroup, {
+    ref: groupRef,
+    onlyAnd: true,
+    enableDelete: true,
+    onConditionsCount: setCount
+  })) : /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(Form.Item, {
     className: "".concat(classPrefix, "-title")
   }, " \u9875\u9762 "), /*#__PURE__*/React.createElement(Form.Item, {
     className: "".concat(classPrefix, "-item2"),
@@ -95,6 +106,6 @@ var SearchPanel = /*#__PURE__*/React.forwardRef(function (props, ref) {
     onlyAnd: true,
     enableDelete: true,
     onConditionsCount: setCount
-  }))))));
+  })))))));
 });
 export default SearchPanel;

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

@@ -93,6 +93,11 @@ var ModulesPage = function ModulesPage(props) {
     controller = _React$useState2[0],
     setController = _React$useState2[1];
 
+  // 是否是下级分析页
+  var _useState27 = useState(props.isAppAnalysis || false),
+    _useState28 = _slicedToArray(_useState27, 1),
+    isAppAnalysis = _useState28[0];
+
   // 查询条件ref
   var selectRef = useRef(null);
   var _useContext = useContext(BizGlobalDataContext),
@@ -246,7 +251,8 @@ var ModulesPage = function ModulesPage(props) {
       pageList: pageList,
       pageGroupList: pageGroupList,
       currentClickPage: currentClickPage,
-      setCurrentClickPage: setCurrentClickPage
+      setCurrentClickPage: setCurrentClickPage,
+      isAppAnalysis: isAppAnalysis
     }
   }, /*#__PURE__*/React.createElement(BizLayout, {
     className: classPrefix
@@ -264,7 +270,7 @@ var ModulesPage = function ModulesPage(props) {
       value: searchValue,
       onChange: onChange
     })),
-    topRender: props.onClickWarn ? render : props.titleVisible && renderApp,
+    topRender: props.onClickWarn ? render : props.isAppAnalysis || renderApp,
     collapseRef: selectRef
   }, /*#__PURE__*/React.createElement(Spin, {
     spinning: pageLoading

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

@@ -6,7 +6,7 @@ export declare namespace ModulesPageTypes {
         value?: Value;
         onClickWarn?: () => void;
         onChange?: (data: Value) => void;
-        titleVisible?: boolean;
+        isAppAnalysis?: boolean;
     }
     interface Value extends SearchValue {
         time?: DatePickerTypes.Value;
@@ -44,4 +44,5 @@ export declare const ModulesPageContext: import("react").Context<{
     pageGroupList: ModulesPageTypes.PageGroup[];
     currentClickPage?: ModulesPageTypes.Page | ModulesPageTypes.PageGroup | undefined;
     setCurrentClickPage?: ((data: ModulesPageTypes.Page) => void) | undefined;
+    isAppAnalysis: boolean;
 }>;

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

@@ -2,5 +2,6 @@ import { createContext } from 'react';
 export var ModulesPageTypes;
 export var ModulesPageContext = /*#__PURE__*/createContext({
   pageList: [],
-  pageGroupList: []
+  pageGroupList: [],
+  isAppAnalysis: false
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zgfe/modules-page",
-  "version": "1.0.17-zhongyuan.5",
+  "version": "1.0.17-zhongyuan.9",
   "private": false,
   "publishConfig": {
     "access": "public"
@@ -57,5 +57,5 @@
     "rc-virtual-list": "^3.14.2",
     "yorkie": "^2.0.0"
   },
-  "gitHead": "89433145fd9a8cfbc9e01b3f9669d2c9a347d6f0"
+  "gitHead": "87d732d9187a94d7c35cf9929e23d46b657ff215"
 }