diff --git a/src/layouts/PageEmptyLayout/index.tsx b/src/layouts/PageEmptyLayout/index.tsx
new file mode 100644
index 0000000..5028345
--- /dev/null
+++ b/src/layouts/PageEmptyLayout/index.tsx
@@ -0,0 +1,9 @@
+import * as React from "react";
+import { useEffect } from "react";
+
+export default ({ children }: any) => {
+ useEffect(() => {
+ return () => {};
+ }, []);
+ return
{children}
;
+};
diff --git a/src/layouts/index.tsx b/src/layouts/index.tsx
index 8b5dc47..1285af1 100644
--- a/src/layouts/index.tsx
+++ b/src/layouts/index.tsx
@@ -7,9 +7,10 @@ import { Provider } from "mobx-react";
import zhCN from "antd/lib/locale/zh_CN";
import { HTML5Backend } from "react-dnd-html5-backend";
import { connect, IRouteComponentProps, useModel } from "umi";
-import BaseLayout from "./BaseLayout";
+// import BaseLayout from "./BaseLayout";
import BlankLayout from "./BlankLayout";
-import UserLayout from "./UserLayout";
+// import UserLayout from "./UserLayout";
+import PageEmptyLayout from "./PageEmptyLayout";
import { IRouterProps, RouterContext } from "./RouterContext";
import { layoutConfig } from "@/layouts/config";
import stores from "@/store";
@@ -64,18 +65,18 @@ const Layout = ({ children, location, route, history, match }: IRouteComponentPr
if (type) {
switch (type) {
- case "user":
- layout = ;
- break;
+ // case "user":
+ // layout = ;
+ // break;
case "blank":
layout = ;
break;
default:
- layout = ;
+ layout = ;
break;
}
} else {
- layout = ;
+ layout = ;
}
}
diff --git a/src/pages/calcTable/index.tsx b/src/pages/calcTable/index.tsx
index 30b32fd..fb4520c 100644
--- a/src/pages/calcTable/index.tsx
+++ b/src/pages/calcTable/index.tsx
@@ -86,6 +86,32 @@ const index: FunctionComponent = (props) => {
+ {optWidth && (
+ <>
+
+
+ >
+ )}
{record?.lockTime && {record?.lockTime}}
)
@@ -106,7 +132,7 @@ const index: FunctionComponent = (props) => {
i18n: item.i18n,
onCell: (record: any) => ({
onContextMenu: (e: any) => {
- record.lockItems && e.preventDefault();
+ !item.calcDetail && e.preventDefault();
}
}),
render: (text: string, record: any) => {
@@ -135,7 +161,7 @@ const index: FunctionComponent = (props) => {
}
];
return (
-
+
{text}
diff --git a/src/pages/unitTable/index.tsx b/src/pages/unitTable/index.tsx
index cfcb283..63419e6 100644
--- a/src/pages/unitTable/index.tsx
+++ b/src/pages/unitTable/index.tsx
@@ -15,6 +15,7 @@ export type extraType = {
rowKey: string;
showTotalCell: boolean;
isSpecial: boolean;
+ showRowSelection: boolean;
};
const UnitTable: FC = (props) => {
const [unitTableType, setUnitTableType] = useState("");
@@ -48,7 +49,8 @@ const UnitTable: FC = (props) => {
rowKey,
showTotalCell = false,
sumDataSource = {},
- isSpecial = false
+ isSpecial = false,
+ showRowSelection = true
} = data;
setI18n(i18n);
setColumns(columns);
@@ -63,6 +65,7 @@ const UnitTable: FC = (props) => {
rowKey,
showTotalCell,
isSpecial,
+ showRowSelection,
selectedRowKeys: [...(extraParams.selectedRowKeys as string[] | number[]), ...rowKeys]
});
}
@@ -99,15 +102,8 @@ const UnitTable: FC = (props) => {
columns={renderCols(columns, unitTableType, i18n, extraParams)}
scroll={{ x: 1200, y: `calc(100vh - ${extraParams?.scrollHeight || 109}px)` }}
bordered={_.some(columns, (k) => k.children)}
- rowSelection={!_.isNil(extraParams?.selectedRowKeys) ? rowSelection : undefined}
- pagination={
- !_.isNil(pageInfo)
- ? {
- ...paginationAction(pageInfo, i18n, onChange),
- size: "default"
- }
- : false
- }
+ rowSelection={extraParams?.showRowSelection ? rowSelection : undefined}
+ pagination={!_.isNil(pageInfo) ? { ...paginationAction(pageInfo, i18n, onChange), size: "default" } : false}
summary={() =>
!extraParams.showTotalCell ? (
<>>
@@ -117,7 +113,7 @@ const UnitTable: FC = (props) => {
{i18n["总计"]}
-
+
)
diff --git a/src/pages/unitTable/renderColsOpts.tsx b/src/pages/unitTable/renderColsOpts.tsx
index a587a57..784233f 100644
--- a/src/pages/unitTable/renderColsOpts.tsx
+++ b/src/pages/unitTable/renderColsOpts.tsx
@@ -69,7 +69,7 @@ export function renderCols(initialState: any[], type: string, i18n?: AnyObject,
width: 185,
fixed: "right",
render: (__: string, record: any) => {
- const { billStatus } = record;
+ const { billStatus, customOptAuth } = record;
const items: MenuProps["items"] = [
{
key: "DeleteList",
@@ -111,9 +111,11 @@ export function renderCols(initialState: any[], type: string, i18n?: AnyObject,
-
+ {(_.isEmpty(customOptAuth) || customOptAuth.FILE) && (
+
+ )}
} />
@@ -124,9 +126,11 @@ export function renderCols(initialState: any[], type: string, i18n?: AnyObject,
-
+ {(_.isEmpty(customOptAuth) || customOptAuth.RECALC) && (
+
+ )}