diff --git a/.claude/settings.local.json b/.claude/settings.local.json new file mode 100644 index 0000000..fabfc00 --- /dev/null +++ b/.claude/settings.local.json @@ -0,0 +1,15 @@ +{ + "permissions": { + "allow": [ + "Bash(npm install:*)", + "Bash(npm run build)", + "Bash(wait:*)", + "Bash(tree:*)", + "Bash(cat:*)", + "Bash(git rm:*)", + "Bash(git check-ignore:*)" + ], + "deny": [], + "ask": [] + } +} diff --git a/.gitignore b/.gitignore index 5cd00a3..e9a182a 100644 --- a/.gitignore +++ b/.gitignore @@ -1,7 +1,21 @@ +# 源文件测试目录 /src/test/ /target/ + +# 构建输出(根目录的构建产物) +/components/ +/hooks/ +/utils/ +/regular/ +/enum/ +/json/ +/css/ + +# IDE .idea +# 依赖 /node_modules *.local package-lock.json +yarn.lock diff --git a/.npmignore b/.npmignore index 66949b7..62ae416 100644 --- a/.npmignore +++ b/.npmignore @@ -1,3 +1,7 @@ +# 源文件目录(不要发布) +src/ +rollup.config.js + # 开发相关文件 .eslintrc.cjs .eslintignore diff --git a/README.md b/README.md index 46f8279..ff87c9f 100644 --- a/README.md +++ b/README.md @@ -11,4 +11,8 @@ yarn add zy-react-library ### v1.0.0 (2025-10-22) -- 🎉 初始版本发布 \ No newline at end of file +- 🎉 初始版本发布 + +### v1.1.2 (2025-12-25) + +- 🎉 优化编译效果 \ No newline at end of file diff --git a/package.json b/package.json index 3bde8e9..dc23ca4 100644 --- a/package.json +++ b/package.json @@ -20,6 +20,9 @@ "node": ">=18.0.0" }, "scripts": { + "build": "rollup -c", + "build:watch": "rollup -c -w", + "prepublishOnly": "npm run build", "postinstall": "echo 'Thanks for using our component library!'" }, "dependencies": { @@ -37,5 +40,15 @@ "react": "^18.3.1", "react-pdf": "^10.2.0", "react-signature-canvas": "^1.1.0-alpha.2" + }, + "devDependencies": { + "@babel/core": "^7.28.5", + "@babel/preset-react": "^7.28.5", + "@rollup/plugin-babel": "^6.1.0", + "@rollup/plugin-commonjs": "^29.0.0", + "@rollup/plugin-json": "^6.1.0", + "@rollup/plugin-node-resolve": "^16.0.3", + "glob": "^13.0.0", + "rollup": "^4.54.0" } } diff --git a/rollup.config.js b/rollup.config.js new file mode 100644 index 0000000..72bec25 --- /dev/null +++ b/rollup.config.js @@ -0,0 +1,288 @@ +import resolve from '@rollup/plugin-node-resolve'; +import commonjs from '@rollup/plugin-commonjs'; +import json from '@rollup/plugin-json'; +import babel from '@rollup/plugin-babel'; +import { readFileSync, existsSync } from 'fs'; +import path from 'path'; +import { fileURLToPath } from 'url'; +import { glob } from 'glob'; + +// 获取当前文件所在目录的绝对路径 +const __filename = fileURLToPath(import.meta.url); +const __dirname = path.dirname(__filename); + +// 读取 package.json,用于获取依赖列表 +const pkg = JSON.parse(readFileSync('./package.json', 'utf-8')); + +/** + * 收集所有的入口文件 + * + * 遍历指定目录,查找所有 .js 文件作为打包入口 + * 注意:json 目录被排除,因为 JSON 文件直接复制,不作为入口处理 + * + * @returns {Object} 入口文件对象,格式:{ 'components/Table/index.js': '/absolute/path/Table/index.js' } + */ +function getEntryFiles() { + const entries = {}; + const baseDir = __dirname; + const srcDir = path.join(baseDir, 'src'); + + // 定义需要处理的目录(排除json,json文件直接复制不转换) + const dirs = ['components', 'hooks', 'utils', 'regular', 'enum']; + + dirs.forEach(dir => { + const dirPath = path.join(srcDir, dir); + + if (existsSync(dirPath)) { + // 递归查找当前目录下所有 .js 文件 + const files = glob.sync('**/*.js', { + cwd: dirPath, // 在 src/xxx 目录中查找 + absolute: false // 返回相对路径 + }); + + // 为每个文件创建入口映射 + files.forEach(file => { + // key: 保留源文件的相对路径(包括目录和文件名),如 'components/Table/index.js' + // value: src 目录下文件的绝对路径 + const key = path.join(dir, file); + entries[key] = path.join(srcDir, dir, file); + }); + } + }); + + return entries; +} + +/** + * Babel 配置 + * + * 只转换 JSX 语法,不转译 ES6+ 语法 + * 这样可以保持代码的现代性,减少构建时间 + */ +const babelConfig = { + // 将 Babel helpers 捆绑到每个文件中(避免重复引用) + babelHelpers: 'bundled', + + // 排除 node_modules 目录,不进行处理 + exclude: 'node_modules/**', + + // 支持的文件扩展名 + extensions: ['.js', '.jsx', '.ts', '.tsx'], + + // 使用的预设和插件 + presets: [ + ['@babel/preset-react', { + // 使用新的 JSX 转换方式,自动导入 JSX + runtime: 'automatic' + }] + ], + plugins: [] +}; + +/** + * 自定义插件:复制类型声明文件和样式文件 + * + * 功能: + * 1. 复制 .d.ts 类型声明文件 + * 2. 复制 .less/.css 等样式文件(保持原始格式) + * 3. 复制 .json 数据文件(保持原始格式) + * 4. 复制 css 文件夹 + * + * 注意:所有源文件都在 src/ 目录,构建输出到根目录 + */ +const copyTypesPlugin = () => ({ + name: 'copy-types', + + // 在生成 bundle 时执行 + generateBundle() { + const srcDir = path.join(__dirname, 'src'); + const dirs = ['components', 'hooks', 'utils', 'regular', 'enum', 'json']; + const this$1 = this; + + // 处理每个目录 + dirs.forEach(dir => { + const dirPath = path.join(srcDir, dir); + + if (existsSync(dirPath)) { + // ===== 1. 复制类型声明文件 (.d.ts) ===== + const dtsFiles = glob.sync('**/*.d.ts', { + cwd: dirPath, + absolute: true + }); + + dtsFiles.forEach(file => { + const relativePath = path.relative(dirPath, file); + const content = readFileSync(file, 'utf-8'); + + // 将文件添加到根目录 + this$1.emitFile({ + type: 'asset', + fileName: path.join(dir, relativePath), + source: content + }); + }); + + // ===== 2. 复制样式文件 (.less, .css, .scss, .sass) ===== + const styleFiles = glob.sync('**/*.{less,css,scss,sass}', { + cwd: dirPath, + absolute: true + }); + + styleFiles.forEach(file => { + const relativePath = path.relative(dirPath, file); + const content = readFileSync(file, 'utf-8'); + + // 将样式文件添加到根目录,保持原始格式 + this$1.emitFile({ + type: 'asset', + fileName: path.join(dir, relativePath), + source: content + }); + }); + } + }); + + // ===== 3. 复制 json 文件夹(保持原始格式,不转换) ===== + const jsonDir = path.join(srcDir, 'json'); + if (existsSync(jsonDir)) { + const jsonFiles = glob.sync('**/*.json', { + cwd: jsonDir, + absolute: true + }); + + jsonFiles.forEach(file => { + const relativePath = path.relative(jsonDir, file); + const content = readFileSync(file, 'utf-8'); + + // 将 JSON 文件添加到根目录 + this$1.emitFile({ + type: 'asset', + fileName: path.join('json', relativePath), + source: content + }); + }); + } + + // ===== 4. 复制 css 文件夹 ===== + const cssDir = path.join(srcDir, 'css'); + if (existsSync(cssDir)) { + const cssFiles = glob.sync('**/*', { + cwd: cssDir, + absolute: true, + nodir: true // 不包括目录本身 + }); + + cssFiles.forEach(file => { + const relativePath = path.relative(cssDir, file); + const content = readFileSync(file, 'utf-8'); + + this$1.emitFile({ + type: 'asset', + fileName: path.join('css', relativePath), + source: content + }); + }); + } + } +}); + +/** + * Rollup 插件列表 + * + * 按照执行顺序排列: + * 1. resolve - 解析模块路径 + * 2. babel - 转换 JSX + * 3. commonjs - 转换 CommonJS 模块 + * 4. json - 解析 JSON 导入(但被标记为 external,不会实际转换) + * 5. copyTypesPlugin - 复制类型和样式文件 + */ +const plugins = [ + // 模块解析插件 - 解析 node_modules 中的模块 + resolve({ + extensions: ['.js', '.jsx', '.ts', '.tsx'], + browser: true // 浏览器环境优先 + }), + + // Babel 转换插件 - 只转换 JSX + babel(babelConfig), + + // CommonJS 转换插件 - 允许导入 CommonJS 模块 + commonjs({ + transformMixedEsModules: true // 转换混合的 ES 模块 + }), + + // JSON 插件 - 处理 JSON 导入(配合 external 使用) + json(), + + // 自定义插件 - 复制类型和样式文件 + copyTypesPlugin() +]; + +/** + * External 函数 + * + * 判断模块是否应该标记为"外部依赖" + * 外部依赖不会被打包进 bundle,而是保留 import 语句 + * + * @param {string} id - 模块标识符 + * @returns {boolean} - true 表示外部依赖,不打包 + */ +const external = (id) => { + // 1. 样式文件标记为外部 -> 保留 import 语句 + // 原因:样式文件需要消费者项目配置自己的加载器来处理 + // 保持 Less 变量(如 @{ant-prefix})不被替换 + if (id.endsWith('.less') || id.endsWith('.css') || id.endsWith('.scss') || id.endsWith('.sass')) { + return true; + } + + // 2. JSON 文件标记为外部 -> 直接使用原始 .json 文件 + // 原因:避免将 JSON 转换成 JS 模块,保持原始格式 + // 例如:35MB 的 area.json 不会被转换成 56MB 的 area.json.js + if (id.endsWith('.json')) { + return true; + } + + // 3. npm 依赖包标记为外部 -> 不打包到 bundle 中 + // 原因:减少 bundle 体积,避免版本冲突,让消费者项目自己管理依赖 + // 从 package.json 的 dependencies 中读取依赖列表 + const dependencies = Object.keys(pkg.dependencies || {}); + return dependencies.some(dep => id === dep || id.startsWith(dep + '/')); +}; + +/** + * 创建 Rollup 配置的辅助函数 + * + * @param {string} outputDir - 输出目录 + * @param {string} format - 输出格式('esm' 或 'cjs') + * @param {Array} plugins - 插件列表 + * @returns {Object} Rollup 配置对象 + */ +function createConfig(outputDir, format, plugins) { + return { + // 入口文件对象 + input: getEntryFiles(), + + // 输出配置 + output: { + dir: outputDir, // 输出目录 + format: format, // 输出格式:'esm' 或 'cjs' + preserveModules: true, // 保留模块结构,不打包成单个文件 + preserveModulesRoot: './', // 保留模块结构的根目录 + entryFileNames: '[name]', // 入口文件名:[name] 保留原始文件名(包括 .js 后缀) + exports: 'named' // 导出命名导出 + }, + + // 外部依赖判断函数 + external, + + // 插件列表 + plugins + }; +} + +/** + * 导出配置 + * + * 只输出 ESM 格式到根目录(components/, hooks/, utils/ 等) + */ +export default createConfig('.', 'esm', plugins); diff --git a/components/Cascader/Area/index.d.ts b/src/components/Cascader/Area/index.d.ts similarity index 100% rename from components/Cascader/Area/index.d.ts rename to src/components/Cascader/Area/index.d.ts diff --git a/components/Cascader/Area/index.js b/src/components/Cascader/Area/index.js similarity index 100% rename from components/Cascader/Area/index.js rename to src/components/Cascader/Area/index.js diff --git a/components/Cascader/Basic/index.d.ts b/src/components/Cascader/Basic/index.d.ts similarity index 100% rename from components/Cascader/Basic/index.d.ts rename to src/components/Cascader/Basic/index.d.ts diff --git a/components/Cascader/Basic/index.js b/src/components/Cascader/Basic/index.js similarity index 100% rename from components/Cascader/Basic/index.js rename to src/components/Cascader/Basic/index.js diff --git a/components/Cascader/Dictionary/index.d.ts b/src/components/Cascader/Dictionary/index.d.ts similarity index 100% rename from components/Cascader/Dictionary/index.d.ts rename to src/components/Cascader/Dictionary/index.d.ts diff --git a/components/Cascader/Dictionary/index.js b/src/components/Cascader/Dictionary/index.js similarity index 100% rename from components/Cascader/Dictionary/index.js rename to src/components/Cascader/Dictionary/index.js diff --git a/components/Cascader/Industry/index.d.ts b/src/components/Cascader/Industry/index.d.ts similarity index 100% rename from components/Cascader/Industry/index.d.ts rename to src/components/Cascader/Industry/index.d.ts diff --git a/components/Cascader/Industry/index.js b/src/components/Cascader/Industry/index.js similarity index 100% rename from components/Cascader/Industry/index.js rename to src/components/Cascader/Industry/index.js diff --git a/components/Editor/index.d.ts b/src/components/Editor/index.d.ts similarity index 100% rename from components/Editor/index.d.ts rename to src/components/Editor/index.d.ts diff --git a/components/Editor/index.js b/src/components/Editor/index.js similarity index 100% rename from components/Editor/index.js rename to src/components/Editor/index.js diff --git a/components/FormBuilder/FormBuilder.d.ts b/src/components/FormBuilder/FormBuilder.d.ts similarity index 100% rename from components/FormBuilder/FormBuilder.d.ts rename to src/components/FormBuilder/FormBuilder.d.ts diff --git a/components/FormBuilder/FormBuilder.js b/src/components/FormBuilder/FormBuilder.js similarity index 92% rename from components/FormBuilder/FormBuilder.js rename to src/components/FormBuilder/FormBuilder.js index 83d9f93..6478d1f 100644 --- a/components/FormBuilder/FormBuilder.js +++ b/src/components/FormBuilder/FormBuilder.js @@ -51,11 +51,11 @@ const FormBuilder = (props) => { /> {showActionButtons && ( - <> +
{customActionButtons || ( @@ -75,7 +75,7 @@ const FormBuilder = (props) => { )} - +
)} diff --git a/components/FormBuilder/FormItemsRenderer.d.ts b/src/components/FormBuilder/FormItemsRenderer.d.ts similarity index 100% rename from components/FormBuilder/FormItemsRenderer.d.ts rename to src/components/FormBuilder/FormItemsRenderer.d.ts diff --git a/components/FormBuilder/FormItemsRenderer.js b/src/components/FormBuilder/FormItemsRenderer.js similarity index 100% rename from components/FormBuilder/FormItemsRenderer.js rename to src/components/FormBuilder/FormItemsRenderer.js diff --git a/components/FormBuilder/index.d.ts b/src/components/FormBuilder/index.d.ts similarity index 100% rename from components/FormBuilder/index.d.ts rename to src/components/FormBuilder/index.d.ts diff --git a/components/FormBuilder/index.js b/src/components/FormBuilder/index.js similarity index 100% rename from components/FormBuilder/index.js rename to src/components/FormBuilder/index.js diff --git a/components/HeaderBack/index.d.ts b/src/components/HeaderBack/index.d.ts similarity index 100% rename from components/HeaderBack/index.d.ts rename to src/components/HeaderBack/index.d.ts diff --git a/components/HeaderBack/index.js b/src/components/HeaderBack/index.js similarity index 100% rename from components/HeaderBack/index.js rename to src/components/HeaderBack/index.js diff --git a/components/HeaderBack/index.less b/src/components/HeaderBack/index.less similarity index 100% rename from components/HeaderBack/index.less rename to src/components/HeaderBack/index.less diff --git a/components/HiddenInfo/gwj/index.d.ts b/src/components/HiddenInfo/gwj/index.d.ts similarity index 100% rename from components/HiddenInfo/gwj/index.d.ts rename to src/components/HiddenInfo/gwj/index.d.ts diff --git a/components/HiddenInfo/gwj/index.js b/src/components/HiddenInfo/gwj/index.js similarity index 100% rename from components/HiddenInfo/gwj/index.js rename to src/components/HiddenInfo/gwj/index.js diff --git a/components/Icon/AddIcon/index.d.ts b/src/components/Icon/AddIcon/index.d.ts similarity index 100% rename from components/Icon/AddIcon/index.d.ts rename to src/components/Icon/AddIcon/index.d.ts diff --git a/components/Icon/AddIcon/index.js b/src/components/Icon/AddIcon/index.js similarity index 100% rename from components/Icon/AddIcon/index.js rename to src/components/Icon/AddIcon/index.js diff --git a/components/Icon/BackIcon/index.d.ts b/src/components/Icon/BackIcon/index.d.ts similarity index 100% rename from components/Icon/BackIcon/index.d.ts rename to src/components/Icon/BackIcon/index.d.ts diff --git a/components/Icon/BackIcon/index.js b/src/components/Icon/BackIcon/index.js similarity index 100% rename from components/Icon/BackIcon/index.js rename to src/components/Icon/BackIcon/index.js diff --git a/components/Icon/DeleteIcon/index.d.ts b/src/components/Icon/DeleteIcon/index.d.ts similarity index 100% rename from components/Icon/DeleteIcon/index.d.ts rename to src/components/Icon/DeleteIcon/index.d.ts diff --git a/components/Icon/DeleteIcon/index.js b/src/components/Icon/DeleteIcon/index.js similarity index 100% rename from components/Icon/DeleteIcon/index.js rename to src/components/Icon/DeleteIcon/index.js diff --git a/components/Icon/DownloadIcon/index.d.ts b/src/components/Icon/DownloadIcon/index.d.ts similarity index 100% rename from components/Icon/DownloadIcon/index.d.ts rename to src/components/Icon/DownloadIcon/index.d.ts diff --git a/components/Icon/DownloadIcon/index.js b/src/components/Icon/DownloadIcon/index.js similarity index 100% rename from components/Icon/DownloadIcon/index.js rename to src/components/Icon/DownloadIcon/index.js diff --git a/components/Icon/EditIcon/index.d.ts b/src/components/Icon/EditIcon/index.d.ts similarity index 100% rename from components/Icon/EditIcon/index.d.ts rename to src/components/Icon/EditIcon/index.d.ts diff --git a/components/Icon/EditIcon/index.js b/src/components/Icon/EditIcon/index.js similarity index 100% rename from components/Icon/EditIcon/index.js rename to src/components/Icon/EditIcon/index.js diff --git a/components/Icon/ExportIcon/index.d.ts b/src/components/Icon/ExportIcon/index.d.ts similarity index 100% rename from components/Icon/ExportIcon/index.d.ts rename to src/components/Icon/ExportIcon/index.d.ts diff --git a/components/Icon/ExportIcon/index.js b/src/components/Icon/ExportIcon/index.js similarity index 100% rename from components/Icon/ExportIcon/index.js rename to src/components/Icon/ExportIcon/index.js diff --git a/components/Icon/ImportIcon/index.d.ts b/src/components/Icon/ImportIcon/index.d.ts similarity index 100% rename from components/Icon/ImportIcon/index.d.ts rename to src/components/Icon/ImportIcon/index.d.ts diff --git a/components/Icon/ImportIcon/index.js b/src/components/Icon/ImportIcon/index.js similarity index 100% rename from components/Icon/ImportIcon/index.js rename to src/components/Icon/ImportIcon/index.js diff --git a/components/Icon/LocationIcon/index.d.ts b/src/components/Icon/LocationIcon/index.d.ts similarity index 100% rename from components/Icon/LocationIcon/index.d.ts rename to src/components/Icon/LocationIcon/index.d.ts diff --git a/components/Icon/LocationIcon/index.js b/src/components/Icon/LocationIcon/index.js similarity index 100% rename from components/Icon/LocationIcon/index.js rename to src/components/Icon/LocationIcon/index.js diff --git a/components/Icon/PrintIcon/index.d.ts b/src/components/Icon/PrintIcon/index.d.ts similarity index 100% rename from components/Icon/PrintIcon/index.d.ts rename to src/components/Icon/PrintIcon/index.d.ts diff --git a/components/Icon/PrintIcon/index.js b/src/components/Icon/PrintIcon/index.js similarity index 100% rename from components/Icon/PrintIcon/index.js rename to src/components/Icon/PrintIcon/index.js diff --git a/components/Icon/ResetIcon/index.d.ts b/src/components/Icon/ResetIcon/index.d.ts similarity index 100% rename from components/Icon/ResetIcon/index.d.ts rename to src/components/Icon/ResetIcon/index.d.ts diff --git a/components/Icon/ResetIcon/index.js b/src/components/Icon/ResetIcon/index.js similarity index 100% rename from components/Icon/ResetIcon/index.js rename to src/components/Icon/ResetIcon/index.js diff --git a/components/Icon/SearchIcon/index.d.ts b/src/components/Icon/SearchIcon/index.d.ts similarity index 100% rename from components/Icon/SearchIcon/index.d.ts rename to src/components/Icon/SearchIcon/index.d.ts diff --git a/components/Icon/SearchIcon/index.js b/src/components/Icon/SearchIcon/index.js similarity index 100% rename from components/Icon/SearchIcon/index.js rename to src/components/Icon/SearchIcon/index.js diff --git a/components/Icon/VideoIcon/index.d.ts b/src/components/Icon/VideoIcon/index.d.ts similarity index 100% rename from components/Icon/VideoIcon/index.d.ts rename to src/components/Icon/VideoIcon/index.d.ts diff --git a/components/Icon/VideoIcon/index.js b/src/components/Icon/VideoIcon/index.js similarity index 100% rename from components/Icon/VideoIcon/index.js rename to src/components/Icon/VideoIcon/index.js diff --git a/components/Icon/ViewIcon/index.d.ts b/src/components/Icon/ViewIcon/index.d.ts similarity index 100% rename from components/Icon/ViewIcon/index.d.ts rename to src/components/Icon/ViewIcon/index.d.ts diff --git a/components/Icon/ViewIcon/index.js b/src/components/Icon/ViewIcon/index.js similarity index 100% rename from components/Icon/ViewIcon/index.js rename to src/components/Icon/ViewIcon/index.js diff --git a/components/ImportFile/index.d.ts b/src/components/ImportFile/index.d.ts similarity index 100% rename from components/ImportFile/index.d.ts rename to src/components/ImportFile/index.d.ts diff --git a/components/ImportFile/index.js b/src/components/ImportFile/index.js similarity index 100% rename from components/ImportFile/index.js rename to src/components/ImportFile/index.js diff --git a/components/LeftTree/Area/index.d.ts b/src/components/LeftTree/Area/index.d.ts similarity index 100% rename from components/LeftTree/Area/index.d.ts rename to src/components/LeftTree/Area/index.d.ts diff --git a/components/LeftTree/Area/index.js b/src/components/LeftTree/Area/index.js similarity index 100% rename from components/LeftTree/Area/index.js rename to src/components/LeftTree/Area/index.js diff --git a/components/LeftTree/Basic/index.d.ts b/src/components/LeftTree/Basic/index.d.ts similarity index 100% rename from components/LeftTree/Basic/index.d.ts rename to src/components/LeftTree/Basic/index.d.ts diff --git a/components/LeftTree/Basic/index.js b/src/components/LeftTree/Basic/index.js similarity index 100% rename from components/LeftTree/Basic/index.js rename to src/components/LeftTree/Basic/index.js diff --git a/components/LeftTree/Department/Gwj/index.d.ts b/src/components/LeftTree/Department/Gwj/index.d.ts similarity index 100% rename from components/LeftTree/Department/Gwj/index.d.ts rename to src/components/LeftTree/Department/Gwj/index.d.ts diff --git a/components/LeftTree/Department/Gwj/index.js b/src/components/LeftTree/Department/Gwj/index.js similarity index 100% rename from components/LeftTree/Department/Gwj/index.js rename to src/components/LeftTree/Department/Gwj/index.js diff --git a/components/LeftTree/Dictionary/index.d.ts b/src/components/LeftTree/Dictionary/index.d.ts similarity index 100% rename from components/LeftTree/Dictionary/index.d.ts rename to src/components/LeftTree/Dictionary/index.d.ts diff --git a/components/LeftTree/Dictionary/index.js b/src/components/LeftTree/Dictionary/index.js similarity index 100% rename from components/LeftTree/Dictionary/index.js rename to src/components/LeftTree/Dictionary/index.js diff --git a/components/Map/MapSelector.d.ts b/src/components/Map/MapSelector.d.ts similarity index 100% rename from components/Map/MapSelector.d.ts rename to src/components/Map/MapSelector.d.ts diff --git a/components/Map/MapSelector.js b/src/components/Map/MapSelector.js similarity index 94% rename from components/Map/MapSelector.js rename to src/components/Map/MapSelector.js index d2dd01b..8f161bc 100644 --- a/components/Map/MapSelector.js +++ b/src/components/Map/MapSelector.js @@ -36,7 +36,15 @@ const MapSelector = (props) => { // 初始化地图 const initMap = async () => { if (!window.BMapGL) { - await dynamicLoadJs("https://api.map.baidu.com/api?v=1.0&type=webgl&ak=OElqFYoKiAH8KFtph8ftLKF5NlNrbCUr&callback=initialize"); + if (window?.base?.loadDynamicResource) { + await window.base.loadDynamicResource({ + url: "https://api.map.baidu.com/api?v=1.0&type=webgl&ak=OElqFYoKiAH8KFtph8ftLKF5NlNrbCUr&callback=initialize", + type: "script", + }); + } + else { + await dynamicLoadJs("https://api.map.baidu.com/api?v=1.0&type=webgl&ak=OElqFYoKiAH8KFtph8ftLKF5NlNrbCUr&callback=initialize"); + } } setLoading(true); diff --git a/components/Map/index.d.ts b/src/components/Map/index.d.ts similarity index 100% rename from components/Map/index.d.ts rename to src/components/Map/index.d.ts diff --git a/components/Map/index.js b/src/components/Map/index.js similarity index 100% rename from components/Map/index.js rename to src/components/Map/index.js diff --git a/components/Page/index.d.ts b/src/components/Page/index.d.ts similarity index 100% rename from components/Page/index.d.ts rename to src/components/Page/index.d.ts diff --git a/components/Page/index.js b/src/components/Page/index.js similarity index 87% rename from components/Page/index.js rename to src/components/Page/index.js index 6decbc7..be6e024 100644 --- a/components/Page/index.js +++ b/src/components/Page/index.js @@ -26,9 +26,9 @@ function Page(props) { { (isShowAllAction && isShowFooter) && ( - <> +
-
+
{customActionButtons || ( {extraActionButtons} @@ -38,7 +38,7 @@ function Page(props) { )}
- +
) }
diff --git a/components/Pdf/index.d.ts b/src/components/Pdf/index.d.ts similarity index 100% rename from components/Pdf/index.d.ts rename to src/components/Pdf/index.d.ts diff --git a/components/Pdf/index.js b/src/components/Pdf/index.js similarity index 100% rename from components/Pdf/index.js rename to src/components/Pdf/index.js diff --git a/components/Pdf/index.less b/src/components/Pdf/index.less similarity index 100% rename from components/Pdf/index.less rename to src/components/Pdf/index.less diff --git a/components/PreviewImg/index.d.ts b/src/components/PreviewImg/index.d.ts similarity index 100% rename from components/PreviewImg/index.d.ts rename to src/components/PreviewImg/index.d.ts diff --git a/components/PreviewImg/index.js b/src/components/PreviewImg/index.js similarity index 100% rename from components/PreviewImg/index.js rename to src/components/PreviewImg/index.js diff --git a/components/PreviewPdf/index.d.ts b/src/components/PreviewPdf/index.d.ts similarity index 100% rename from components/PreviewPdf/index.d.ts rename to src/components/PreviewPdf/index.d.ts diff --git a/components/PreviewPdf/index.js b/src/components/PreviewPdf/index.js similarity index 100% rename from components/PreviewPdf/index.js rename to src/components/PreviewPdf/index.js diff --git a/components/Search/index.d.ts b/src/components/Search/index.d.ts similarity index 100% rename from components/Search/index.d.ts rename to src/components/Search/index.d.ts diff --git a/components/Search/index.js b/src/components/Search/index.js similarity index 100% rename from components/Search/index.js rename to src/components/Search/index.js diff --git a/components/Select/Basic/index.d.ts b/src/components/Select/Basic/index.d.ts similarity index 100% rename from components/Select/Basic/index.d.ts rename to src/components/Select/Basic/index.d.ts diff --git a/components/Select/Basic/index.js b/src/components/Select/Basic/index.js similarity index 100% rename from components/Select/Basic/index.js rename to src/components/Select/Basic/index.js diff --git a/components/Select/Dictionary/index.d.ts b/src/components/Select/Dictionary/index.d.ts similarity index 100% rename from components/Select/Dictionary/index.d.ts rename to src/components/Select/Dictionary/index.d.ts diff --git a/components/Select/Dictionary/index.js b/src/components/Select/Dictionary/index.js similarity index 100% rename from components/Select/Dictionary/index.js rename to src/components/Select/Dictionary/index.js diff --git a/components/Select/Personnel/Gwj/index.d.ts b/src/components/Select/Personnel/Gwj/index.d.ts similarity index 100% rename from components/Select/Personnel/Gwj/index.d.ts rename to src/components/Select/Personnel/Gwj/index.d.ts diff --git a/components/Select/Personnel/Gwj/index.js b/src/components/Select/Personnel/Gwj/index.js similarity index 100% rename from components/Select/Personnel/Gwj/index.js rename to src/components/Select/Personnel/Gwj/index.js diff --git a/components/SelectCreate/index.d.ts b/src/components/SelectCreate/index.d.ts similarity index 100% rename from components/SelectCreate/index.d.ts rename to src/components/SelectCreate/index.d.ts diff --git a/components/SelectCreate/index.js b/src/components/SelectCreate/index.js similarity index 100% rename from components/SelectCreate/index.js rename to src/components/SelectCreate/index.js diff --git a/components/SelectTree/Area/index.d.ts b/src/components/SelectTree/Area/index.d.ts similarity index 100% rename from components/SelectTree/Area/index.d.ts rename to src/components/SelectTree/Area/index.d.ts diff --git a/components/SelectTree/Area/index.js b/src/components/SelectTree/Area/index.js similarity index 100% rename from components/SelectTree/Area/index.js rename to src/components/SelectTree/Area/index.js diff --git a/components/SelectTree/Basic/index.d.ts b/src/components/SelectTree/Basic/index.d.ts similarity index 100% rename from components/SelectTree/Basic/index.d.ts rename to src/components/SelectTree/Basic/index.d.ts diff --git a/components/SelectTree/Basic/index.js b/src/components/SelectTree/Basic/index.js similarity index 100% rename from components/SelectTree/Basic/index.js rename to src/components/SelectTree/Basic/index.js diff --git a/components/SelectTree/Department/Gwj/index.d.ts b/src/components/SelectTree/Department/Gwj/index.d.ts similarity index 100% rename from components/SelectTree/Department/Gwj/index.d.ts rename to src/components/SelectTree/Department/Gwj/index.d.ts diff --git a/components/SelectTree/Department/Gwj/index.js b/src/components/SelectTree/Department/Gwj/index.js similarity index 100% rename from components/SelectTree/Department/Gwj/index.js rename to src/components/SelectTree/Department/Gwj/index.js diff --git a/components/SelectTree/Dictionary/index.d.ts b/src/components/SelectTree/Dictionary/index.d.ts similarity index 100% rename from components/SelectTree/Dictionary/index.d.ts rename to src/components/SelectTree/Dictionary/index.d.ts diff --git a/components/SelectTree/Dictionary/index.js b/src/components/SelectTree/Dictionary/index.js similarity index 100% rename from components/SelectTree/Dictionary/index.js rename to src/components/SelectTree/Dictionary/index.js diff --git a/components/SelectTree/HiddenLevel/Gwj/index.d.ts b/src/components/SelectTree/HiddenLevel/Gwj/index.d.ts similarity index 100% rename from components/SelectTree/HiddenLevel/Gwj/index.d.ts rename to src/components/SelectTree/HiddenLevel/Gwj/index.d.ts diff --git a/components/SelectTree/HiddenLevel/Gwj/index.js b/src/components/SelectTree/HiddenLevel/Gwj/index.js similarity index 100% rename from components/SelectTree/HiddenLevel/Gwj/index.js rename to src/components/SelectTree/HiddenLevel/Gwj/index.js diff --git a/components/SelectTree/HiddenPart/Gwj/index.d.ts b/src/components/SelectTree/HiddenPart/Gwj/index.d.ts similarity index 100% rename from components/SelectTree/HiddenPart/Gwj/index.d.ts rename to src/components/SelectTree/HiddenPart/Gwj/index.d.ts diff --git a/components/SelectTree/HiddenPart/Gwj/index.js b/src/components/SelectTree/HiddenPart/Gwj/index.js similarity index 100% rename from components/SelectTree/HiddenPart/Gwj/index.js rename to src/components/SelectTree/HiddenPart/Gwj/index.js diff --git a/components/SelectTree/Industry/index.d.ts b/src/components/SelectTree/Industry/index.d.ts similarity index 100% rename from components/SelectTree/Industry/index.d.ts rename to src/components/SelectTree/Industry/index.d.ts diff --git a/components/SelectTree/Industry/index.js b/src/components/SelectTree/Industry/index.js similarity index 100% rename from components/SelectTree/Industry/index.js rename to src/components/SelectTree/Industry/index.js diff --git a/components/Signature/index.d.ts b/src/components/Signature/index.d.ts similarity index 100% rename from components/Signature/index.d.ts rename to src/components/Signature/index.d.ts diff --git a/components/Signature/index.js b/src/components/Signature/index.js similarity index 100% rename from components/Signature/index.js rename to src/components/Signature/index.js diff --git a/components/Table/index.d.ts b/src/components/Table/index.d.ts similarity index 100% rename from components/Table/index.d.ts rename to src/components/Table/index.d.ts diff --git a/components/Table/index.js b/src/components/Table/index.js similarity index 100% rename from components/Table/index.js rename to src/components/Table/index.js diff --git a/components/Table/index.less b/src/components/Table/index.less similarity index 57% rename from components/Table/index.less rename to src/components/Table/index.less index d1adc46..0f73dd2 100644 --- a/components/Table/index.less +++ b/src/components/Table/index.less @@ -9,6 +9,12 @@ } .@{ant-prefix}-pro-table-list-toolbar-container { - padding-top: 26px !important; + padding-top: 0 !important; padding-bottom: 16px; } + +.search-layout { + + .table-layout .@{ant-prefix}-pro-table-list-toolbar-container { + padding-top: 26px !important; + } +} diff --git a/components/TooltipPreviewImg/index.d.ts b/src/components/TooltipPreviewImg/index.d.ts similarity index 100% rename from components/TooltipPreviewImg/index.d.ts rename to src/components/TooltipPreviewImg/index.d.ts diff --git a/components/TooltipPreviewImg/index.js b/src/components/TooltipPreviewImg/index.js similarity index 100% rename from components/TooltipPreviewImg/index.js rename to src/components/TooltipPreviewImg/index.js diff --git a/components/Upload/index.d.ts b/src/components/Upload/index.d.ts similarity index 100% rename from components/Upload/index.d.ts rename to src/components/Upload/index.d.ts diff --git a/components/Upload/index.js b/src/components/Upload/index.js similarity index 100% rename from components/Upload/index.js rename to src/components/Upload/index.js diff --git a/components/Video/AliPlayer.d.ts b/src/components/Video/AliPlayer.d.ts similarity index 100% rename from components/Video/AliPlayer.d.ts rename to src/components/Video/AliPlayer.d.ts diff --git a/components/Video/AliPlayer.js b/src/components/Video/AliPlayer.js similarity index 84% rename from components/Video/AliPlayer.js rename to src/components/Video/AliPlayer.js index be44308..379d12e 100644 --- a/components/Video/AliPlayer.js +++ b/src/components/Video/AliPlayer.js @@ -45,8 +45,20 @@ const AliPlayer = forwardRef(({ if (!containerRef.current) return; if (!window.Aliplayer) { - await dynamicLoadJs("https://g.alicdn.com/apsara-media-box/imp-web-player/2.16.3/aliplayer-min.js"); - await dynamicLoadCss("https://g.alicdn.com/apsara-media-box/imp-web-player/2.16.3/skins/default/aliplayer-min.css"); + if (window?.base?.loadDynamicResource) { + await window.base.loadDynamicResource({ + url: "https://g.alicdn.com/apsara-media-box/imp-web-player/2.16.3/aliplayer-min.js", + type: "script", + }); + await window.base.loadDynamicResource({ + url: "https://g.alicdn.com/apsara-media-box/imp-web-player/2.16.3/skins/default/aliplayer-min.css", + type: "link", + }); + } + else { + await dynamicLoadJs("https://g.alicdn.com/apsara-media-box/imp-web-player/2.16.3/aliplayer-min.js"); + await dynamicLoadCss("https://g.alicdn.com/apsara-media-box/imp-web-player/2.16.3/skins/default/aliplayer-min.css"); + } } onDisposeAliPlayer(); diff --git a/components/Video/index.d.ts b/src/components/Video/index.d.ts similarity index 100% rename from components/Video/index.d.ts rename to src/components/Video/index.d.ts diff --git a/components/Video/index.js b/src/components/Video/index.js similarity index 100% rename from components/Video/index.js rename to src/components/Video/index.js diff --git a/css/common.less b/src/css/common.less similarity index 83% rename from css/common.less rename to src/css/common.less index 3928ae3..7319419 100644 --- a/css/common.less +++ b/src/css/common.less @@ -20,6 +20,10 @@ height: 10px; background-color: rgb(241, 241, 242); } + + + .table-layout .@{ant-prefix}-pro-table-list-toolbar-container { + padding-top: 26px !important; + } } .table-layout { diff --git a/enum/dictionary/index.js b/src/enum/dictionary/index.js similarity index 100% rename from enum/dictionary/index.js rename to src/enum/dictionary/index.js diff --git a/enum/formItemRender/index.d.ts b/src/enum/formItemRender/index.d.ts similarity index 100% rename from enum/formItemRender/index.d.ts rename to src/enum/formItemRender/index.d.ts diff --git a/enum/formItemRender/index.js b/src/enum/formItemRender/index.js similarity index 100% rename from enum/formItemRender/index.js rename to src/enum/formItemRender/index.js diff --git a/enum/hidden/gwj/index.js b/src/enum/hidden/gwj/index.js similarity index 100% rename from enum/hidden/gwj/index.js rename to src/enum/hidden/gwj/index.js diff --git a/enum/uploadFile/gwj/index.js b/src/enum/uploadFile/gwj/index.js similarity index 100% rename from enum/uploadFile/gwj/index.js rename to src/enum/uploadFile/gwj/index.js diff --git a/hooks/useDeleteFile/index.d.ts b/src/hooks/useDeleteFile/index.d.ts similarity index 100% rename from hooks/useDeleteFile/index.d.ts rename to src/hooks/useDeleteFile/index.d.ts diff --git a/hooks/useDeleteFile/index.js b/src/hooks/useDeleteFile/index.js similarity index 100% rename from hooks/useDeleteFile/index.js rename to src/hooks/useDeleteFile/index.js diff --git a/hooks/useDictionary/index.d.ts b/src/hooks/useDictionary/index.d.ts similarity index 100% rename from hooks/useDictionary/index.d.ts rename to src/hooks/useDictionary/index.d.ts diff --git a/hooks/useDictionary/index.js b/src/hooks/useDictionary/index.js similarity index 100% rename from hooks/useDictionary/index.js rename to src/hooks/useDictionary/index.js diff --git a/hooks/useDownloadBlob/index.d.ts b/src/hooks/useDownloadBlob/index.d.ts similarity index 100% rename from hooks/useDownloadBlob/index.d.ts rename to src/hooks/useDownloadBlob/index.d.ts diff --git a/hooks/useDownloadBlob/index.js b/src/hooks/useDownloadBlob/index.js similarity index 100% rename from hooks/useDownloadBlob/index.js rename to src/hooks/useDownloadBlob/index.js diff --git a/hooks/useDownloadFile/index.d.ts b/src/hooks/useDownloadFile/index.d.ts similarity index 100% rename from hooks/useDownloadFile/index.d.ts rename to src/hooks/useDownloadFile/index.d.ts diff --git a/hooks/useDownloadFile/index.js b/src/hooks/useDownloadFile/index.js similarity index 100% rename from hooks/useDownloadFile/index.js rename to src/hooks/useDownloadFile/index.js diff --git a/hooks/useGetFile/index.d.ts b/src/hooks/useGetFile/index.d.ts similarity index 100% rename from hooks/useGetFile/index.d.ts rename to src/hooks/useGetFile/index.d.ts diff --git a/hooks/useGetFile/index.js b/src/hooks/useGetFile/index.js similarity index 100% rename from hooks/useGetFile/index.js rename to src/hooks/useGetFile/index.js diff --git a/hooks/useGetUrlQuery/index.d.ts b/src/hooks/useGetUrlQuery/index.d.ts similarity index 100% rename from hooks/useGetUrlQuery/index.d.ts rename to src/hooks/useGetUrlQuery/index.d.ts diff --git a/hooks/useGetUrlQuery/index.js b/src/hooks/useGetUrlQuery/index.js similarity index 100% rename from hooks/useGetUrlQuery/index.js rename to src/hooks/useGetUrlQuery/index.js diff --git a/hooks/useGetUserInfo/index.d.ts b/src/hooks/useGetUserInfo/index.d.ts similarity index 100% rename from hooks/useGetUserInfo/index.d.ts rename to src/hooks/useGetUserInfo/index.d.ts diff --git a/hooks/useGetUserInfo/index.js b/src/hooks/useGetUserInfo/index.js similarity index 100% rename from hooks/useGetUserInfo/index.js rename to src/hooks/useGetUserInfo/index.js diff --git a/hooks/useIdle/index.d.ts b/src/hooks/useIdle/index.d.ts similarity index 100% rename from hooks/useIdle/index.d.ts rename to src/hooks/useIdle/index.d.ts diff --git a/hooks/useIdle/index.js b/src/hooks/useIdle/index.js similarity index 100% rename from hooks/useIdle/index.js rename to src/hooks/useIdle/index.js diff --git a/hooks/useImportFile/index.d.ts b/src/hooks/useImportFile/index.d.ts similarity index 100% rename from hooks/useImportFile/index.d.ts rename to src/hooks/useImportFile/index.d.ts diff --git a/hooks/useImportFile/index.js b/src/hooks/useImportFile/index.js similarity index 100% rename from hooks/useImportFile/index.js rename to src/hooks/useImportFile/index.js diff --git a/hooks/useIsExistenceDuplicateSelection/index.d.ts b/src/hooks/useIsExistenceDuplicateSelection/index.d.ts similarity index 100% rename from hooks/useIsExistenceDuplicateSelection/index.d.ts rename to src/hooks/useIsExistenceDuplicateSelection/index.d.ts diff --git a/hooks/useIsExistenceDuplicateSelection/index.js b/src/hooks/useIsExistenceDuplicateSelection/index.js similarity index 100% rename from hooks/useIsExistenceDuplicateSelection/index.js rename to src/hooks/useIsExistenceDuplicateSelection/index.js diff --git a/hooks/useTable/index.d.ts b/src/hooks/useTable/index.d.ts similarity index 100% rename from hooks/useTable/index.d.ts rename to src/hooks/useTable/index.d.ts diff --git a/hooks/useTable/index.js b/src/hooks/useTable/index.js similarity index 100% rename from hooks/useTable/index.js rename to src/hooks/useTable/index.js diff --git a/hooks/useUploadFile/index.d.ts b/src/hooks/useUploadFile/index.d.ts similarity index 100% rename from hooks/useUploadFile/index.d.ts rename to src/hooks/useUploadFile/index.d.ts diff --git a/hooks/useUploadFile/index.js b/src/hooks/useUploadFile/index.js similarity index 100% rename from hooks/useUploadFile/index.js rename to src/hooks/useUploadFile/index.js diff --git a/hooks/useUrlQueryCriteria/index.d.ts b/src/hooks/useUrlQueryCriteria/index.d.ts similarity index 100% rename from hooks/useUrlQueryCriteria/index.d.ts rename to src/hooks/useUrlQueryCriteria/index.d.ts diff --git a/hooks/useUrlQueryCriteria/index.js b/src/hooks/useUrlQueryCriteria/index.js similarity index 100% rename from hooks/useUrlQueryCriteria/index.js rename to src/hooks/useUrlQueryCriteria/index.js diff --git a/json/area.json b/src/json/area.json similarity index 100% rename from json/area.json rename to src/json/area.json diff --git a/json/industry.json b/src/json/industry.json similarity index 100% rename from json/industry.json rename to src/json/industry.json diff --git a/json/nation.json b/src/json/nation.json similarity index 100% rename from json/nation.json rename to src/json/nation.json diff --git a/regular/index.d.ts b/src/regular/index.d.ts similarity index 100% rename from regular/index.d.ts rename to src/regular/index.d.ts diff --git a/regular/index.js b/src/regular/index.js similarity index 100% rename from regular/index.js rename to src/regular/index.js diff --git a/utils/index.d.ts b/src/utils/index.d.ts similarity index 100% rename from utils/index.d.ts rename to src/utils/index.d.ts diff --git a/utils/index.js b/src/utils/index.js similarity index 100% rename from utils/index.js rename to src/utils/index.js