From 1e1ac401e566d2a118007982352d7aa72b5d0cea Mon Sep 17 00:00:00 2001 From: jiangzhixiong <710328466@qq.com> Date: Fri, 10 May 2024 10:17:47 +0800 Subject: [PATCH] =?UTF-8?q?feat(all):=20=E6=8B=86=E9=99=A4=E5=86=85?= =?UTF-8?q?=E8=81=94=E6=A0=B7=E5=BC=8F=E3=80=81request=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docs/index.md | 159 ------------------ packages/biz/CHANGELOG.md | 14 ++ packages/biz/package.json | 2 +- .../biz/src/boxSelectTree/boxSelectTree.tsx | 18 +- .../components/boxPanel/index.less | 19 +++ .../components/boxPanel/index.tsx | 28 ++- packages/biz/src/boxSelectTree/index.less | 5 + .../infiniteList/components/SearchCard.tsx | 4 +- .../src/infiniteList/components/index.less | 5 + packages/biz/src/odModal/OdModal.tsx | 8 +- packages/biz/src/odModal/index.less | 9 + .../biz/src/treeTransfer/TreeTransfer.tsx | 6 +- packages/biz/src/treeTransfer/index.less | 7 +- packages/func/CHANGELOG.md | 11 ++ packages/func/package.json | 2 +- packages/func/src/string/demo/pxTorem.tsx | 2 +- packages/hooks/CHANGELOG.md | 11 ++ packages/hooks/package.json | 2 +- packages/icon/CHANGELOG.md | 6 + packages/icon/es/demo/basic.js | 8 - packages/icon/es/demo/demo.js | 33 ---- packages/icon/es/demo/index.less | 20 --- packages/icon/package.json | 2 +- packages/material/CHANGELOG.md | 14 ++ packages/material/package.json | 2 +- .../src/algorithmConfig/algorithmConfig.tsx | 29 ++-- .../algorithmTable/AlgorithmTable.tsx | 22 ++- .../components/algorithmTable/index.less | 13 ++ .../material/src/algorithmConfig/index.less | 21 +++ packages/meta/CHANGELOG.md | 14 ++ packages/meta/es/CompareImage/CompareImage.js | 6 +- packages/meta/es/CompareImage/index.less | 2 + packages/meta/package.json | 2 +- .../meta/src/CompareImage/CompareImage.tsx | 4 +- packages/meta/src/CompareImage/index.less | 2 + packages/request/CHANGELOG.md | 11 ++ packages/request/es/index.js | 2 +- packages/request/lib/index.js | 2 +- packages/request/package.json | 2 +- packages/request/src/code.ts | 1 + packages/slave/CHANGELOG.md | 11 ++ packages/slave/package.json | 2 +- 42 files changed, 264 insertions(+), 279 deletions(-) delete mode 100644 docs/index.md create mode 100644 packages/biz/src/boxSelectTree/components/boxPanel/index.less create mode 100644 packages/biz/src/boxSelectTree/index.less create mode 100644 packages/biz/src/odModal/index.less delete mode 100644 packages/icon/es/demo/basic.js delete mode 100644 packages/icon/es/demo/demo.js delete mode 100644 packages/icon/es/demo/index.less create mode 100644 packages/material/src/algorithmConfig/components/algorithmTable/index.less create mode 100644 packages/material/src/algorithmConfig/index.less diff --git a/docs/index.md b/docs/index.md deleted file mode 100644 index 3255e9f..0000000 --- a/docs/index.md +++ /dev/null @@ -1,159 +0,0 @@ ---- -hero: - title: lambo - description: 致力于提升前端开发效率与规范 - actions: - - text: 快速上手 - link: /bizs -features: - - title: biz - emoji: 🍑 - description: 业务库 - - title: hooks - emoji: 💎 - description: hooks - - title: func - emoji: 🌈 - description: 常用函数库 - - title: meta - emoji: ☀️ - description: 原子组件库 - - title: constants - emoji: 🈶️ - description: 静态定义库 - - title: request - emoji: 🥣 - description: 网络请求库 - - title: types - emoji: 🈸 - description: typescript 声明库 - - title: material - emoji: 🥱 - description: 物料库 - - title: cli - emoji: 🐔 - description: 脚手架 ---- - -## 目录结构 - - - - - -## 本文档食用说明 - -目前在进行中的项目为：@zhst/bizs、@zhst/hooks、@zhst/meta、@zhst/func.. - -bizs: 基于@zhst/hooks、@zhst/meta、@zhst/func 开发，基本贴近于业务。doing - -meta：基于 antd 开发，作为公司的定制化原子组件。doing - -hooks：基于 ahooks、@zhst/func 定制化二次开发。doing - -func：基于 lodash-es 定制化二次开发 (由于 utils 包名被使用了)doing - -## 后续构思 - -想做一个，基于智慧视通开发场景和业务场景的前端技术流程化方案，希望它能渗透到整个研发的所有流程中。 - -比如：代码规范、git 提交规范、物料库、基于 electron 的前端工具客户端（可集成物料库、图片上传小工具）、api 自动生成... - -:::info{title=@zhst/lint} -lint 工具库，包含：eslint-config、eslint-plugin、commit-lint -::: - -:::info{title=@zhst/metarial} -物料库，可以直接通过 clone npm 仓库的形式生成模板页面，页面没有任何依赖，一个页面就是一个项目。 -::: - -:::info{title=@zhst/app} -基于 electron 的前端客户端工具，初期功能构思方案有：文件上传、git 仓库管理、物料库可视化页面一键生成 -::: - -:::info{title=@zhst/autoapi} -接口一键生成工具 -::: - -:::info{title=@types/zhst} -类型定义库 -::: - -:::info{title=@zhst/constants} -静态变量枚举库 -::: - -:::info{title=@zhst/cli} -基于物料库的脚手架，可以直接通过可视化界面搭建项目，偏向于 lowcode+ 思维 -::: diff --git a/packages/biz/CHANGELOG.md b/packages/biz/CHANGELOG.md index 4ddf2fb..fd2d102 100644 --- a/packages/biz/CHANGELOG.md +++ b/packages/biz/CHANGELOG.md @@ -1,5 +1,19 @@ # @zhst/biz +## 0.19.0 + +### Minor Changes + +- fix: 修复适配问题 + +### Patch Changes + +- Updated dependencies + - @zhst/hooks@0.11.0 + - @zhst/func@0.13.0 + - @zhst/icon@0.3.0 + - @zhst/meta@0.17.0 + ## 0.18.8 ### Patch Changes diff --git a/packages/biz/package.json b/packages/biz/package.json index b897fe3..b132448 100644 --- a/packages/biz/package.json +++ b/packages/biz/package.json @@ -1,6 +1,6 @@ { "name": "@zhst/biz", - "version": "0.18.8", + "version": "0.19.0", "description": "业务库", "keywords": [ "business", diff --git a/packages/biz/src/boxSelectTree/boxSelectTree.tsx b/packages/biz/src/boxSelectTree/boxSelectTree.tsx index 0566db4..b8b7484 100644 --- a/packages/biz/src/boxSelectTree/boxSelectTree.tsx +++ b/packages/biz/src/boxSelectTree/boxSelectTree.tsx @@ -1,13 +1,18 @@ -import React, { FC } from 'react'; +import React, { FC, useContext } from 'react'; import { Tabs, TabsProps } from 'antd' +import { ConfigProvider } from '@zhst/meta'; import BoxPanel from './components/boxPanel'; import type { BoxPanelProps } from './components/boxPanel'; - +import './index.less' +import classNames from 'classnames'; export interface BoxSelectTreeProps extends BoxPanelProps { onTabChange?: (e: any) => void tabsProps?: TabsProps + prefixCls?: string; } +const { ConfigContext } = ConfigProvider + const BoxSelectTree: FC = (props) => { const { data, @@ -28,21 +33,24 @@ const BoxSelectTree: FC = (props) => { customImport, showOptions, extraBtns, + prefixCls: customizePrefixCls } = props + const { getPrefixCls } = useContext(ConfigContext); + const componentName = getPrefixCls('biz-box-select-tree', customizePrefixCls); const items: TabsProps['items'] = [ { key: '1', - label:
盒子
, + label:
盒子
, }, { key: '2', - label:
盒子组
, + label:
盒子组
, }, ]; return ( -
+
void customImport?: any extraBtns?: any + prefixCls?: string; } +const { ConfigContext } = ConfigProvider + const BoxPanel: FC = (props) => { const { searchInputProps, @@ -46,8 +52,12 @@ const BoxPanel: FC = (props) => { onBatch, onCreate, boxDataSource, + prefixCls: customizePrefixCls, customImport } = props + + const { getPrefixCls } = useContext(ConfigContext); + const componentName = getPrefixCls('biz-box-select-tree-panel', customizePrefixCls); const [isTreeCheckable, setIsTreeCheckable] = useState(false) const [targetItems, setTargetItems] = useState([]); const [boxChoiceOpen, setBoxChoiceOpen] = useState(false) @@ -104,7 +114,7 @@ const BoxPanel: FC = (props) => { } return ( -
+
{/* 盒子选择弹框 */} = (props) => { {showOptions && ( <> - - + + {onCreate ? ( - + ) : ( - width={'600px'} + className={classNames(componentName + '-create-modal')} open={onCreate ? false : undefined} formRef={createFormRef} title="新建组" @@ -150,7 +160,7 @@ const BoxPanel: FC = (props) => { layout='horizontal' labelCol={{ span: 6 }} wrapperCol={{ span: 18 }} - trigger={} + trigger={} submitter={{ searchConfig: { submitText: '确定', @@ -197,9 +207,9 @@ const BoxPanel: FC = (props) => { ) } - + {/* @ts-ignore */} - + diff --git a/packages/biz/src/boxSelectTree/index.less b/packages/biz/src/boxSelectTree/index.less new file mode 100644 index 0000000..0637642 --- /dev/null +++ b/packages/biz/src/boxSelectTree/index.less @@ -0,0 +1,5 @@ +.zhst-biz-box-select-tree { + &-tab { + width: 160px; + } +} diff --git a/packages/biz/src/infiniteList/components/SearchCard.tsx b/packages/biz/src/infiniteList/components/SearchCard.tsx index 3a86118..af4f9e2 100644 --- a/packages/biz/src/infiniteList/components/SearchCard.tsx +++ b/packages/biz/src/infiniteList/components/SearchCard.tsx @@ -76,10 +76,10 @@ const SearchCard = forwardRef((props, ref)
{id || sort} diff --git a/packages/biz/src/infiniteList/components/index.less b/packages/biz/src/infiniteList/components/index.less index 8e6b179..c9c413d 100644 --- a/packages/biz/src/infiniteList/components/index.less +++ b/packages/biz/src/infiniteList/components/index.less @@ -30,6 +30,11 @@ border-radius: 3px; } + &-img { + width: 100%; + height: 240px; + } + &-opt { display: none; position: absolute; diff --git a/packages/biz/src/odModal/OdModal.tsx b/packages/biz/src/odModal/OdModal.tsx index 9cd2053..8122017 100644 --- a/packages/biz/src/odModal/OdModal.tsx +++ b/packages/biz/src/odModal/OdModal.tsx @@ -2,6 +2,8 @@ import React, { forwardRef, useContext, useImperativeHandle, useRef } from 'reac import { Button, Modal, ModalProps, Select, SelectProps, Space, theme } from 'antd'; import { ConfigProvider, CropperImage, Scanner, CropperImageProps, CropperImageRefProps } from '@zhst/meta' import { IconFont } from '@zhst/icon' +import classNames from 'classnames'; +import './index.less' export interface ODModalProps extends ModalProps { prefixCls?: string; @@ -95,7 +97,7 @@ const ODModal = forwardRef((props, ref) => { onCancel={onCancel} onOk={onOk} {...modalProps} - className={componentName} + rootClassName={componentName} > @@ -118,7 +120,7 @@ const ODModal = forwardRef((props, ref) => {
选中类型： } onChange={e => setKeyWords(e.target.value)} placeholder='请输入设备名称' {...searchInputProps} /> = ({ }} > = ({ 已选择的范围
} - bodyStyle={{ padding: 0 }} - >
{targetItems.map(item => (
{ const [outputVal, setOutPutVal ] = useState(null) - const handleChange = (e) => { + const handleChange = (e: { target: { value: string } }) => { const value = pxToRem(e.target.value) setOutPutVal(value) } diff --git a/packages/hooks/CHANGELOG.md b/packages/hooks/CHANGELOG.md index 0768a9d..ccdafca 100644 --- a/packages/hooks/CHANGELOG.md +++ b/packages/hooks/CHANGELOG.md @@ -1,5 +1,16 @@ # @zhst/hooks +## 0.11.0 + +### Minor Changes + +- fix: 修复适配问题 + +### Patch Changes + +- Updated dependencies + - @zhst/func@0.13.0 + ## 0.10.4 ### Patch Changes diff --git a/packages/hooks/package.json b/packages/hooks/package.json index b6e3f6c..d865ff9 100644 --- a/packages/hooks/package.json +++ b/packages/hooks/package.json @@ -1,6 +1,6 @@ { "name": "@zhst/hooks", - "version": "0.10.4", + "version": "0.11.0", "description": "hooks合集", "keywords": [ "hooks" diff --git a/packages/icon/CHANGELOG.md b/packages/icon/CHANGELOG.md index 5b91928..9dd7d97 100644 --- a/packages/icon/CHANGELOG.md +++ b/packages/icon/CHANGELOG.md @@ -1,5 +1,11 @@ # @zhst/icon +## 0.3.0 + +### Minor Changes + +- fix: 修复适配问题 + ## 0.2.0 ### Minor Changes diff --git a/packages/icon/es/demo/basic.js b/packages/icon/es/demo/basic.js deleted file mode 100644 index 10131a8..0000000 --- a/packages/icon/es/demo/basic.js +++ /dev/null @@ -1,8 +0,0 @@ -import React from 'react'; -import { IconFont } from '@zhst/icon'; -var demo = function demo() { - return /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(IconFont, { - icon: "icon-daoru1" - })); -}; -export default demo; \ No newline at end of file diff --git a/packages/icon/es/demo/demo.js b/packages/icon/es/demo/demo.js deleted file mode 100644 index b6dc50b..0000000 --- a/packages/icon/es/demo/demo.js +++ /dev/null @@ -1,33 +0,0 @@ -import React from 'react'; -var iconJson = require("../font/iconfont.json"); -import { IconFont } from '@zhst/icon'; -import "./index.less"; -import { message } from '@zhst/meta'; -var demo = function demo() { - var iconArr = iconJson['glyphs']; - return /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement("ul", { - className: 'demo-ul' - }, iconArr.map(function (item) { - var font_class = item.font_class, - name = item.name; - var fontName = "icon-".concat(font_class); - return /*#__PURE__*/React.createElement("li", { - className: 'demo-li' - }, /*#__PURE__*/React.createElement(IconFont, { - styles: { - marginBottom: 20 - }, - icon: fontName, - size: 32, - onIconClick: function onIconClick() { - navigator.clipboard.writeText(fontName); - message.success("\u590D\u5236".concat(fontName, "\u6210\u529F")); - } - }), /*#__PURE__*/React.createElement("div", { - className: "demo-li-name" - }, name), /*#__PURE__*/React.createElement("div", { - className: "demo-li-name" - }, fontName)); - }))); -}; -export default demo; \ No newline at end of file diff --git a/packages/icon/es/demo/index.less b/packages/icon/es/demo/index.less deleted file mode 100644 index 70b6c9d..0000000 --- a/packages/icon/es/demo/index.less +++ /dev/null @@ -1,20 +0,0 @@ -.demo { - &-ul { - list-style-type: none; - display: flex; - flex-wrap: wrap; - } - - &-li { - display: flex; - flex-direction: column; - align-items: center; - height: 150px; - width: 150px; - - &-name { - color: #666; - font-size: 12px; - } - } -} \ No newline at end of file diff --git a/packages/icon/package.json b/packages/icon/package.json index 959dcb5..bb5b2ff 100644 --- a/packages/icon/package.json +++ b/packages/icon/package.json @@ -1,6 +1,6 @@ { "name": "@zhst/icon", - "version": "0.2.0", + "version": "0.3.0", "description": "图标库", "keywords": [ "icon", diff --git a/packages/material/CHANGELOG.md b/packages/material/CHANGELOG.md index 57a4c5c..18e4ffa 100644 --- a/packages/material/CHANGELOG.md +++ b/packages/material/CHANGELOG.md @@ -1,5 +1,19 @@ # @zhst/material +## 0.14.0 + +### Minor Changes + +- fix: 修复适配问题 + +### Patch Changes + +- Updated dependencies + - @zhst/hooks@0.11.0 + - @zhst/func@0.13.0 + - @zhst/meta@0.17.0 + - @zhst/biz@0.19.0 + ## 0.13.4 ### Patch Changes diff --git a/packages/material/package.json b/packages/material/package.json index 2040332..f5564b0 100644 --- a/packages/material/package.json +++ b/packages/material/package.json @@ -1,6 +1,6 @@ { "name": "@zhst/material", - "version": "0.13.4", + "version": "0.14.0", "description": "物料库", "keywords": [ "business", diff --git a/packages/material/src/algorithmConfig/algorithmConfig.tsx b/packages/material/src/algorithmConfig/algorithmConfig.tsx index d94c442..951b878 100644 --- a/packages/material/src/algorithmConfig/algorithmConfig.tsx +++ b/packages/material/src/algorithmConfig/algorithmConfig.tsx @@ -1,17 +1,19 @@ -import React, { forwardRef, ReactNode, useImperativeHandle } from 'react'; +import React, { forwardRef, ReactNode, useContext, useImperativeHandle } from 'react'; import { Button, Flex, Image } from "antd"; import theme from 'antd/es/theme' -import { CropperImage } from '@zhst/meta' +import { CropperImage, ConfigProvider } from '@zhst/meta' import type { CropperImageProps } from '@zhst/meta' import { AlgorithmConfigImg, ErrorImage } from '../utils/base64Images' import AlgorithmTable from './components/algorithmTable' import TimeTemplateTable from './components/timeTemplateTable'; import { AlgorithmTableProps } from './components/algorithmTable/AlgorithmTable'; import { TimeTemplateTableProps } from './components/timeTemplateTable/TimeTemplateTable'; +import classNames from 'classnames'; +import './index.less' const { useToken } = theme -const Title = (props: any) =>

{props.children}

+const Title = (props: any) =>

{props.children}

export interface AlgorithmConfigProps { onAddAlgorithm?: () => void @@ -65,11 +67,14 @@ export interface AlgorithmConfigProps { * 自定义批量中间文案 */ customBatchCenterContent: ReactNode + prefixCls?: string; } export interface AlgorithmConfigRef { } +const { ConfigContext } = ConfigProvider + const AlgorithmConfig = forwardRef((props, ref) => { const { algorithmTableDataSource = [], @@ -87,7 +92,11 @@ const AlgorithmConfig = forwardRef((pr onLoadMoreButtonClick, customBatchCenterContent, customLoadMoreButton, + prefixCls: customizePrefixCls } = props + const { getPrefixCls } = useContext(ConfigContext); + const componentName = getPrefixCls('material-algo', customizePrefixCls); + const { token } = useToken() // @ts-ignore const { type: cropType } = cropperImageProps @@ -96,10 +105,10 @@ const AlgorithmConfig = forwardRef((pr })) return ( - -
- {title} -
+ +
+ {title} +
{boxList.map(item => { return (

((pr {...cropperImageProps} /> ) : ( -

+
((pr
- 时间模板 + 时间模板
((pr
- 算法应用 + 算法应用
extends ProTableProps { onAddAlgorithm?: (id?: string, record?: any) => void @@ -40,7 +44,11 @@ const AlgorithmTable= ( onDraw, tableType = 'multiple', sortList = [], + prefixCls: customizePrefixCls } = props + const { getPrefixCls } = useContext(ConfigContext); + const componentName = getPrefixCls('material-algo-algoTable', customizePrefixCls); + const { token } = useToken() @@ -53,7 +61,6 @@ const AlgorithmTable= ( title: '运行周期', dataIndex: 'runCycle', valueType: 'select', - width: 80, valueEnum: { 1: { text: '黑夜' }, 0: { text: '白天' }, @@ -67,7 +74,8 @@ const AlgorithmTable= ( title: '操作', key: 'option', valueType: 'option', - fixed: true, + fixed: 'right', + width: '120px', render: (_DOM, record) => [ onItemSwitch?.(_status, record.id, record)} />, onDraw?.(record.id, record)} style={{ display: tableType === 'single' ? 'block' : 'none' }} href="#">, @@ -88,15 +96,15 @@ const AlgorithmTable= ( ]; return ( -
- +
+