diff --git a/.gitignore b/.gitignore index 2235335..96c84a7 100644 --- a/.gitignore +++ b/.gitignore @@ -7,8 +7,8 @@ node_modules /docs-dist vueuse /temp -# packages/**/es -# packages/**/lib -# /es -# /lib +packages/**/es +packages/**/lib +/es +/lib pnpm-lock.yaml diff --git a/packages/biz/es/boxSelectTree/components/boxPanel/index.d.ts b/packages/biz/es/boxSelectTree/components/boxPanel/index.d.ts deleted file mode 100644 index 21a551f..0000000 --- a/packages/biz/es/boxSelectTree/components/boxPanel/index.d.ts +++ /dev/null @@ -1,27 +0,0 @@ -import { FC } from 'react'; -import { TreeDataNode } from 'antd'; -import { ModalFormProps } from '@ant-design/pro-components'; -import type { TreeProps, InputProps } from 'antd'; -import type { BoxTreeProps } from '../../../tree'; -export interface BoxPanelProps { - searchInputProps?: InputProps; - showOptions?: boolean; - treeProps?: Partial; - data: TreeDataNode[]; - boxDataSource: TreeDataNode[]; - handleImport?: () => void; - onSearch?: (e: any) => void; - onItemCheck?: TreeProps['onCheck']; - onItemSelect?: TreeProps['onSelect']; - onBoxBatchDelete?: (data?: any) => void; - onBoxDelete?: (data?: any) => void; - onCreateSubmit?: ModalFormProps['onFinish']; - onClockClick?: () => void; - onImport?: () => void; - onBatch?: () => void; - onCreate?: () => void; - customImport?: any; - extraBtns?: any; -} -declare const BoxPanel: FC; -export default BoxPanel; diff --git a/packages/biz/es/boxSelectTree/components/boxPanel/index.js b/packages/biz/es/boxSelectTree/components/boxPanel/index.js index 4e4a5fa..fa2318c 100644 --- a/packages/biz/es/boxSelectTree/components/boxPanel/index.js +++ b/packages/biz/es/boxSelectTree/components/boxPanel/index.js @@ -15,8 +15,6 @@ import { ModalForm, ProFormText } from '@ant-design/pro-components'; import { ClockCircleOutlined, CloseCircleOutlined, DiffOutlined, FolderAddOutlined, ImportOutlined, SwitcherOutlined } from '@ant-design/icons'; import TreeTransferModal from "../../../treeTransferModal"; import BoxTree from "../../../tree"; -// import './index.less' - var BoxPanel = function BoxPanel(props) { var _createFormRef$curren4, _treeProps$checkedKey; var searchInputProps = props.searchInputProps, diff --git a/packages/biz/lib/boxSelectTree/components/boxPanel/index.d.ts b/packages/biz/lib/boxSelectTree/components/boxPanel/index.d.ts deleted file mode 100644 index 21a551f..0000000 --- a/packages/biz/lib/boxSelectTree/components/boxPanel/index.d.ts +++ /dev/null @@ -1,27 +0,0 @@ -import { FC } from 'react'; -import { TreeDataNode } from 'antd'; -import { ModalFormProps } from '@ant-design/pro-components'; -import type { TreeProps, InputProps } from 'antd'; -import type { BoxTreeProps } from '../../../tree'; -export interface BoxPanelProps { - searchInputProps?: InputProps; - showOptions?: boolean; - treeProps?: Partial; - data: TreeDataNode[]; - boxDataSource: TreeDataNode[]; - handleImport?: () => void; - onSearch?: (e: any) => void; - onItemCheck?: TreeProps['onCheck']; - onItemSelect?: TreeProps['onSelect']; - onBoxBatchDelete?: (data?: any) => void; - onBoxDelete?: (data?: any) => void; - onCreateSubmit?: ModalFormProps['onFinish']; - onClockClick?: () => void; - onImport?: () => void; - onBatch?: () => void; - onCreate?: () => void; - customImport?: any; - extraBtns?: any; -} -declare const BoxPanel: FC; -export default BoxPanel; diff --git a/packages/icon/es/demo/basic.d.ts b/packages/icon/es/demo/basic.d.ts deleted file mode 100644 index 279358a..0000000 --- a/packages/icon/es/demo/basic.d.ts +++ /dev/null @@ -1,3 +0,0 @@ -import React from 'react'; -declare const demo: () => React.JSX.Element; -export default demo; diff --git a/packages/icon/lib/demo/basic.d.ts b/packages/icon/lib/demo/basic.d.ts deleted file mode 100644 index 279358a..0000000 --- a/packages/icon/lib/demo/basic.d.ts +++ /dev/null @@ -1,3 +0,0 @@ -import React from 'react'; -declare const demo: () => React.JSX.Element; -export default demo; diff --git a/packages/material/es/login/Login.d.ts b/packages/material/es/login/Login.d.ts deleted file mode 100644 index cd9701d..0000000 --- a/packages/material/es/login/Login.d.ts +++ /dev/null @@ -1,14 +0,0 @@ -/** - * Created by jiangzhixiong on 2024/03/18 - */ -import { FC } from 'react'; -import { FormProps } from 'antd'; -interface LoginProps { - title: string; - onIconClick?: () => void; - rememberPassword?: boolean; - imageUrl: string; - onFinish: FormProps['onFinish']; -} -declare const Login: FC; -export default Login; diff --git a/packages/material/es/login/Login.js b/packages/material/es/login/Login.js index aa3a20c..66e1f6e 100644 --- a/packages/material/es/login/Login.js +++ b/packages/material/es/login/Login.js @@ -11,6 +11,9 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; } import React from 'react'; import { Button, Checkbox, Flex, Form, Image, Input, theme } from 'antd'; import { HomeOutlined } from '@ant-design/icons'; +import { isNumber } from '@zhst/func'; +import "./index.less"; +var materialName = 'zhst-material-login'; var useToken = theme.useToken; var Login = function Login(props) { var title = props.title, @@ -18,13 +21,22 @@ var Login = function Login(props) { _props$rememberPasswo = props.rememberPassword, rememberPassword = _props$rememberPasswo === void 0 ? true : _props$rememberPasswo, imageUrl = props.imageUrl, + width = props.width, + height = props.height, onFinish = props.onFinish; var _Form$useForm = Form.useForm(), _Form$useForm2 = _slicedToArray(_Form$useForm, 1), form = _Form$useForm2[0]; var _useToken = useToken(), token = _useToken.token; - return /*#__PURE__*/React.createElement(Flex, null, /*#__PURE__*/React.createElement(Flex, { + console.log('width', width); + return /*#__PURE__*/React.createElement(Flex, { + className: materialName, + style: { + width: isNumber(width) ? "".concat(width, "px") : width, + height: isNumber(height) ? "".concat(height, "px") : height + } + }, /*#__PURE__*/React.createElement(Flex, { align: "center", justify: "center", style: { @@ -96,7 +108,8 @@ var Login = function Login(props) { htmlType: "submit" }, "\u767B\u5F55"))))), /*#__PURE__*/React.createElement("div", { style: { - width: '60%' + width: '60%', + height: '100%' } }, /*#__PURE__*/React.createElement(Image, { style: { @@ -104,6 +117,7 @@ var Login = function Login(props) { }, src: imageUrl, width: '100%', + height: '100%', preview: false, fallback: "data:image/png;base64,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" }))); diff --git a/packages/material/lib/login/Login.d.ts b/packages/material/lib/login/Login.d.ts deleted file mode 100644 index cd9701d..0000000 --- a/packages/material/lib/login/Login.d.ts +++ /dev/null @@ -1,14 +0,0 @@ -/** - * Created by jiangzhixiong on 2024/03/18 - */ -import { FC } from 'react'; -import { FormProps } from 'antd'; -interface LoginProps { - title: string; - onIconClick?: () => void; - rememberPassword?: boolean; - imageUrl: string; - onFinish: FormProps['onFinish']; -} -declare const Login: FC; -export default Login; diff --git a/packages/material/lib/login/Login.js b/packages/material/lib/login/Login.js index 86e9497..d0ad60a 100644 --- a/packages/material/lib/login/Login.js +++ b/packages/material/lib/login/Login.js @@ -35,6 +35,9 @@ module.exports = __toCommonJS(Login_exports); var import_react = __toESM(require("react")); var import_antd = require("antd"); var import_icons = require("@ant-design/icons"); +var import_func = require("@zhst/func"); +var import_index = require("./index.less"); +var materialName = "zhst-material-login"; var { useToken } = import_antd.theme; var Login = (props) => { const { @@ -42,11 +45,14 @@ var Login = (props) => { onIconClick, rememberPassword = true, imageUrl, + width, + height, onFinish } = props; const [form] = import_antd.Form.useForm(); const { token } = useToken(); - return /* @__PURE__ */ import_react.default.createElement(import_antd.Flex, null, /* @__PURE__ */ import_react.default.createElement(import_antd.Flex, { align: "center", justify: "center", style: { position: "relative", width: "40%", padding: `30px` } }, /* @__PURE__ */ import_react.default.createElement( + console.log("width", width); + return /* @__PURE__ */ import_react.default.createElement(import_antd.Flex, { className: materialName, style: { width: (0, import_func.isNumber)(width) ? `${width}px` : width, height: (0, import_func.isNumber)(height) ? `${height}px` : height } }, /* @__PURE__ */ import_react.default.createElement(import_antd.Flex, { align: "center", justify: "center", style: { position: "relative", width: "40%", padding: `30px` } }, /* @__PURE__ */ import_react.default.createElement( import_icons.HomeOutlined, { onClick: onIconClick, @@ -89,12 +95,13 @@ var Login = (props) => { ), /* @__PURE__ */ import_react.default.createElement(import_antd.Form.Item, { style: { display: rememberPassword ? "block" : "none" } }, /* @__PURE__ */ import_react.default.createElement(import_antd.Form.Item, { name: "remember", valuePropName: "checked", noStyle: true }, /* @__PURE__ */ import_react.default.createElement(import_antd.Checkbox, null, "记住密码"))), /* @__PURE__ */ import_react.default.createElement(import_antd.Form.Item, null, /* @__PURE__ */ import_react.default.createElement(import_antd.Button, { block: true, type: "primary", htmlType: "submit" }, "登录")) - ))), /* @__PURE__ */ import_react.default.createElement("div", { style: { width: "60%" } }, /* @__PURE__ */ import_react.default.createElement( + ))), /* @__PURE__ */ import_react.default.createElement("div", { style: { width: "60%", height: "100%" } }, /* @__PURE__ */ import_react.default.createElement( import_antd.Image, { style: { width: "100%" }, src: imageUrl, width: "100%", + height: "100%", preview: false, fallback: "data:image/png;base64,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" } diff --git a/packages/slave/es/index.js b/packages/slave/es/index.js index bbbcda4..3334301 100644 --- a/packages/slave/es/index.js +++ b/packages/slave/es/index.js @@ -31,6 +31,7 @@ var Slave = /*#__PURE__*/function () { tokenKey, _opt$showMsg, showMsg, + msgText, _token, jumpUrlObj, _args = arguments; @@ -38,16 +39,16 @@ var Slave = /*#__PURE__*/function () { while (1) switch (_context.prev = _context.next) { case 0: opt = _args.length > 0 && _args[0] !== undefined ? _args[0] : {}; - _opt$jumpToLogin = opt.jumpToLogin, jumpToLogin = _opt$jumpToLogin === void 0 ? true : _opt$jumpToLogin, jumpUrl = opt.jumpUrl, tokenKey = opt.tokenKey, _opt$showMsg = opt.showMsg, showMsg = _opt$showMsg === void 0 ? true : _opt$showMsg; // eslint-disable-next-line @typescript-eslint/no-unused-expressions + _opt$jumpToLogin = opt.jumpToLogin, jumpToLogin = _opt$jumpToLogin === void 0 ? true : _opt$jumpToLogin, jumpUrl = opt.jumpUrl, tokenKey = opt.tokenKey, _opt$showMsg = opt.showMsg, showMsg = _opt$showMsg === void 0 ? true : _opt$showMsg, msgText = opt.msgText; // eslint-disable-next-line @typescript-eslint/no-unused-expressions _token = getValueByUrl(tokenKey || 'token', location.href) || localStorage.getItem('ZHST_AUTH_TOKEN'); this.token = _token; localStorage.setItem('ZHST_AUTH_TOKEN', _token); this.checkEnv({ - showMsg: showMsg + showMsg: showMsg, + msgText: msgText }); if (jumpToLogin && jumpUrl && !_token) { - jumpUrlObj = new URL(jumpUrl); - console.log('jumpUrlObj', jumpUrlObj, jumpUrl); + jumpUrlObj = new URL(jumpUrl); // 判断是否为同一个域，采用不同的跳转方式 if (jumpUrlObj.origin === location.origin) { history.pushState('', '', jumpUrl); } else { @@ -69,7 +70,7 @@ var Slave = /*#__PURE__*/function () { key: "checkEnv", value: function checkEnv(_opt) { if (!this.token && _opt.showMsg) { - message.error('请先登录！'); + message.error(_opt.msgText || '请先登录！'); return; } } diff --git a/packages/slave/lib/index.js b/packages/slave/lib/index.js index d34fb36..9e79cbd 100644 --- a/packages/slave/lib/index.js +++ b/packages/slave/lib/index.js @@ -35,15 +35,15 @@ var Slave = class { jumpToLogin = true, jumpUrl, tokenKey, - showMsg = true + showMsg = true, + msgText } = opt; let _token = (0, import_func.getValueByUrl)(tokenKey || "token", location.href) || localStorage.getItem("ZHST_AUTH_TOKEN"); this.token = _token; localStorage.setItem("ZHST_AUTH_TOKEN", _token); - this.checkEnv({ showMsg }); + this.checkEnv({ showMsg, msgText }); if (jumpToLogin && jumpUrl && !_token) { let jumpUrlObj = new URL(jumpUrl); - console.log("jumpUrlObj", jumpUrlObj, jumpUrl); if (jumpUrlObj.origin === location.origin) { history.pushState("", "", jumpUrl); } else { @@ -54,7 +54,7 @@ var Slave = class { // 判端是否登录 checkEnv(_opt) { if (!this.token && _opt.showMsg) { - import_antd.message.error("请先登录！"); + import_antd.message.error(_opt.msgText || "请先登录！"); return; } } diff --git a/packages/slave/package.json b/packages/slave/package.json index 094b82e..43c48d9 100644 --- a/packages/slave/package.json +++ b/packages/slave/package.json @@ -27,6 +27,7 @@ "registry": "http://10.0.0.77:4874" }, "dependencies": { - "@zhst/func": "workspace:^" + "@zhst/func": "workspace:^", + "antd": "^5.15.3" } } diff --git a/packages/slave/src/index.tsx b/packages/slave/src/index.tsx index 77e2ffd..eba0e5f 100644 --- a/packages/slave/src/index.tsx +++ b/packages/slave/src/index.tsx @@ -37,12 +37,11 @@ class Slave { tokenKey, showMsg = true, msgText, - from, - to, } = opt // eslint-disable-next-line @typescript-eslint/no-unused-expressions let _token = getValueByUrl(tokenKey || 'token', location.href) || localStorage.getItem('ZHST_AUTH_TOKEN') + this.token = _token localStorage.setItem('ZHST_AUTH_TOKEN', _token as string) diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 028d8f6..bdb73b0 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -512,6 +512,9 @@ importers: '@zhst/func': specifier: workspace:^ version: link:../func + antd: + specifier: ^5.15.3 + version: 5.15.3(react-dom@18.2.0)(react@18.2.0) packages/types: {} @@ -15551,7 +15554,7 @@ packages: array-tree-filter: 2.1.0 classnames: 2.5.1 rc-select: 14.11.0(react-dom@18.2.0)(react@18.2.0) - rc-tree: 5.8.2(react-dom@18.2.0)(react@18.2.0) + rc-tree: 5.8.5(react-dom@18.2.0)(react@18.2.0) rc-util: 5.39.1(react-dom@18.2.0)(react@18.2.0) react: 18.2.0 react-dom: 18.2.0(react@18.2.0) @@ -15799,7 +15802,7 @@ packages: '@babel/runtime': 7.24.1 '@rc-component/mini-decimal': 1.1.0 classnames: 2.5.1 - rc-input: 1.4.3(react-dom@18.2.0)(react@18.2.0) + rc-input: 1.4.5(react-dom@18.2.0)(react@18.2.0) rc-util: 5.39.1(react-dom@18.2.0)(react@18.2.0) react: 18.2.0 react-dom: 18.2.0(react@18.2.0) @@ -15868,7 +15871,7 @@ packages: '@babel/runtime': 7.24.1 '@rc-component/trigger': 1.18.2(react-dom@18.2.0)(react@18.2.0) classnames: 2.5.1 - rc-input: 1.4.3(react-dom@18.2.0)(react@18.2.0) + rc-input: 1.4.5(react-dom@18.2.0)(react@18.2.0) rc-menu: 9.12.4(react-dom@18.2.0)(react@18.2.0) rc-textarea: 1.6.3(react-dom@18.2.0)(react@18.2.0) rc-util: 5.39.1(react-dom@18.2.0)(react@18.2.0) @@ -16358,7 +16361,7 @@ packages: dependencies: '@babel/runtime': 7.24.1 classnames: 2.5.1 - rc-input: 1.4.3(react-dom@18.2.0)(react@18.2.0) + rc-input: 1.4.5(react-dom@18.2.0)(react@18.2.0) rc-resize-observer: 1.4.0(react-dom@18.2.0)(react@18.2.0) rc-util: 5.39.1(react-dom@18.2.0)(react@18.2.0) react: 18.2.0 @@ -16415,7 +16418,7 @@ packages: '@babel/runtime': 7.24.1 classnames: 2.5.1 rc-select: 14.11.0(react-dom@18.2.0)(react@18.2.0) - rc-tree: 5.8.2(react-dom@18.2.0)(react@18.2.0) + rc-tree: 5.8.5(react-dom@18.2.0)(react@18.2.0) rc-util: 5.39.1(react-dom@18.2.0)(react@18.2.0) react: 18.2.0 react-dom: 18.2.0(react@18.2.0)