Oak-Team
/
oak-general-business
9
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 38 Wiki Activity

Merge branch 'dev' of codeup.aliyun.com:61c14a7efa282c88e103c23f/oak-general-business into dev

This commit is contained in:
Xu Chang 2022-10-13 16:50:46 +08:00
parent 3a51c1f3e1 b5686d6c15
commit 965eacffe7
3 changed files with 41 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/components/common/pageHeader/index.js
View File

@ -12,13 +12,13 @@ exports.default = (0, react_1.memo)(function (props) {
var _a;
var children = props.children, title = props.title, subTitle = props.subTitle, extra = props.extra, showBack = props.showBack, onBack = props.onBack, backIcon = props.backIcon, delta = props.delta, _b = props.contentMargin, contentMargin = _b === void 0 ? true : _b, tags = props.tags;
var navigate = (0, react_router_dom_1.useNavigate)();
return ((0, jsx_runtime_1.jsxs)("div", tslib_1.__assign({ className: index_module_less_1.default.pageHeader }, { children: [(0, jsx_runtime_1.jsx)("div", tslib_1.__assign({ className: index_module_less_1.default.title }, { children: (0, jsx_runtime_1.jsxs)(tdesign_react_1.Row, { children: [(0, jsx_runtime_1.jsxs)(tdesign_react_1.Col, tslib_1.__assign({ flex: "auto" }, { children: [showBack && ((0, jsx_runtime_1.jsx)(tdesign_react_1.Button, tslib_1.__assign({ shape: "square", variant: "text", className: index_module_less_1.default.back, onClick: function () {
return ((0, jsx_runtime_1.jsxs)("div", tslib_1.__assign({ className: index_module_less_1.default.pageHeader }, { children: [(title || showBack || subTitle || tags || extra) && ((0, jsx_runtime_1.jsx)("div", tslib_1.__assign({ className: index_module_less_1.default.title }, { children: (0, jsx_runtime_1.jsxs)(tdesign_react_1.Row, { children: [(0, jsx_runtime_1.jsxs)(tdesign_react_1.Col, tslib_1.__assign({ flex: "auto" }, { children: [showBack && ((0, jsx_runtime_1.jsx)(tdesign_react_1.Button, tslib_1.__assign({ shape: "square", variant: "text", className: index_module_less_1.default.back, onClick: function () {
if (typeof onBack === 'function') {
onBack();
return;
}
navigate(delta || -1);
} }, { children: backIcon || ((0, jsx_runtime_1.jsx)(tdesign_icons_react_1.ArrowLeftIcon, { className: index_module_less_1.default.backIcon })) }))), title && (0, jsx_runtime_1.jsx)("h2", tslib_1.__assign({ className: index_module_less_1.default.h2 }, { children: title })), subTitle && ((0, jsx_runtime_1.jsx)("span", tslib_1.__assign({ className: index_module_less_1.default.subTitle }, { children: subTitle }))), tags] })), (0, jsx_runtime_1.jsx)(tdesign_react_1.Col, tslib_1.__assign({ flex: "auto" }, { children: extra }))] }) })), (0, jsx_runtime_1.jsx)("div", tslib_1.__assign({ className: (0, classnames_1.default)(index_module_less_1.default.content, (_a = {},
} }, { children: backIcon || ((0, jsx_runtime_1.jsx)(tdesign_icons_react_1.ArrowLeftIcon, { className: index_module_less_1.default.backIcon })) }))), title && (0, jsx_runtime_1.jsx)("h2", tslib_1.__assign({ className: index_module_less_1.default.h2 }, { children: title })), subTitle && ((0, jsx_runtime_1.jsx)("span", tslib_1.__assign({ className: index_module_less_1.default.subTitle }, { children: subTitle }))), tags] })), (0, jsx_runtime_1.jsx)(tdesign_react_1.Col, tslib_1.__assign({ flex: "auto" }, { children: extra }))] }) }))), (0, jsx_runtime_1.jsx)("div", tslib_1.__assign({ className: (0, classnames_1.default)(index_module_less_1.default.content, (_a = {},
_a[index_module_less_1.default.contentMargin] = contentMargin,
_a)) }, { children: children }))] })));
});

5
package.json
View File

@ -20,7 +20,6 @@
"oak-external-sdk": "file:../oak-external-sdk",
"oak-frontend-base": "file:../oak-frontend-base",
"oak-memory-tree-store": "file:../oak-memory-tree-store",
"react-router-dom": "^6.3.0",
"sha1": "^1.1.1",
"tslib": "^2.4.0",
"uuid": "^8.3.2"
@ -30,7 +29,8 @@
"react-dom": ">=18.1.0",
"tdesign-icons-react": ">=0.1.4",
"tdesign-mobile-react": ">=0.2.0",
"tdesign-react": ">=0.40.5"
"tdesign-react": ">=0.40.5",
"react-router-dom": "^6.3.0"
},
"devDependencies": {
"@babel/cli": "^7.12.13",
@ -64,7 +64,6 @@
},
"scripts": {
"make:domain": "ts-node ./scripts/make.ts",
"prebuild": "npm run make:domain",
"clean": "rimraf lib/*",
"copy-files": "copyfiles -u 1 src/**/*.less lib/ & copyfiles -u 1 src/**/*.wxml lib/ & copyfiles -u 1 src/**/*.wxs lib/ & copyfiles -u 1 src/miniprogram_npm/**/*.js lib/ ",
"build": "tsc && npm run copy-files",

67
src/components/common/pageHeader/index.tsx
View File

@ -36,36 +36,43 @@ export default memo((props: PageHeaderProps) => {
return (
<div className={Style.pageHeader}>
<div className={Style.title}>
<Row>
<Col flex="auto">
{showBack && (
<Button
shape="square"
variant="text"
className={Style.back}
onClick={() => {
if (typeof onBack === 'function') {
onBack();
return;
}
navigate(delta || -1);
}}
>
{backIcon || (
<ArrowLeftIcon className={Style.backIcon} />
)}
</Button>
)}
{title && <h2 className={Style.h2}>{title}</h2>}
{subTitle && (
<span className={Style.subTitle}>{subTitle}</span>
)}
{tags}
</Col>
<Col flex="auto">{extra}</Col>
</Row>
</div>
{(title || showBack || subTitle || tags || extra) && (
<div className={Style.title}>
<Row>
<Col flex="auto">
{showBack && (
<Button
shape="square"
variant="text"
className={Style.back}
onClick={() => {
if (typeof onBack === 'function') {
onBack();
return;
}
navigate(delta || -1);
}}
>
{backIcon || (
<ArrowLeftIcon
className={Style.backIcon}
/>
)}
</Button>
)}
{title && <h2 className={Style.h2}>{title}</h2>}
{subTitle && (
<span className={Style.subTitle}>
{subTitle}
</span>
)}
{tags}
</Col>
<Col flex="auto">{extra}</Col>
</Row>
</div>
)}
<div
className={classNames(Style.content, {
[Style.contentMargin]: contentMargin,