From 891e6301ab8d1a4ce20e6d0ab448c34cf77f1f0b Mon Sep 17 00:00:00 2001 From: qinhaoyan Date: Wed, 27 Nov 2024 16:55:56 +0800 Subject: [PATCH 1/3] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8Dtheme-helper?= =?UTF-8?q?=E5=BC=95=E7=94=A8=E6=8A=A5=E9=94=99=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/amis-theme-editor-helper/rollup.config.js | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/packages/amis-theme-editor-helper/rollup.config.js b/packages/amis-theme-editor-helper/rollup.config.js index 5c652a967bf..78017f6ca72 100644 --- a/packages/amis-theme-editor-helper/rollup.config.js +++ b/packages/amis-theme-editor-helper/rollup.config.js @@ -47,10 +47,16 @@ const pkgs = []; }); } }); + +// 很多项目没装这个，所以style-inject直接打进去 +const index = pkgs.indexOf('style-inject'); +if (~index) { + pkgs.splice(index, 1); +} + const external = id => pkgs.some(pkg => id.startsWith(pkg) || ~id.indexOf(`node_modules/${pkg}`)); const input = ['./src/index.ts']; - export default [ { input, From 14201e7cbeea0d7ee4d7ea27076b9420a592ccf0 Mon Sep 17 00:00:00 2001 From: qinhaoyan Date: Thu, 28 Nov 2024 15:01:49 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=88=90=E5=8C=85?= =?UTF-8?q?=E4=BE=9D=E8=B5=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../amis-theme-editor-helper/package.json | 27 ++++++++++--------- .../amis-theme-editor-helper/rollup.config.js | 6 ----- .../amis-ui/scss/components/form/_list.scss | 4 +-- 3 files changed, 16 insertions(+), 21 deletions(-) diff --git a/packages/amis-theme-editor-helper/package.json b/packages/amis-theme-editor-helper/package.json index c04050a05fd..a820a995475 100644 --- a/packages/amis-theme-editor-helper/package.json +++ b/packages/amis-theme-editor-helper/package.json @@ -1,6 +1,6 @@ { "name": "amis-theme-editor-helper", - "version": "2.0.26", + "version": "0.0.0-alpha.8", "description": "amis主题编辑器通用方法", "main": "lib/index.js", "module": "esm/index.js", @@ -31,10 +31,14 @@ "dependencies": { "amis": "*", "amis-core": "*", - "amis-ui": "*" + "amis-ui": "*", + "style-inject": "^0.3.0" }, "devDependencies": { - "cross-env": "^7.0.3", + "@rollup/plugin-commonjs": "^22.0.0", + "@rollup/plugin-json": "^4.1.0", + "@rollup/plugin-node-resolve": "^13.3.0", + "@rollup/plugin-typescript": "^8.3.2", "@rollup/plugin-url": "^7.0.0", "@svgr/rollup": "^6.4.0", "@types/async": "^2.0.45", @@ -45,23 +49,20 @@ "@types/lodash": "^4.14.76", "@types/node": "^14.0.24", "@types/react": "^18.0.24", + "@types/react-color": "^3.0.6", "@types/react-dom": "^18.0.8", - "@rollup/plugin-commonjs": "^22.0.0", - "@rollup/plugin-json": "^4.1.0", - "@rollup/plugin-node-resolve": "^13.3.0", - "@rollup/plugin-typescript": "^8.3.2", + "cross-env": "^7.0.3", + "react": "^18.2.0", + "react-color": "^2.19.3", + "react-dom": "^18.2.0", "rollup": "^2.73.0", "rollup-plugin-auto-external": "^2.0.0", "rollup-plugin-license": "^2.7.0", - "@types/react-color": "^3.0.6", - "tslib": "^2.3.1", - "typescript": "^4.6.4", "sass": "^1.49.7", "sass-loader": "^12.5.0", "style-loader": "^3.2.1", - "react": "^18.2.0", - "react-dom": "^18.2.0", - "react-color": "^2.19.3" + "tslib": "^2.3.1", + "typescript": "^4.6.4" }, "peerDependencies": { "amis": "*", diff --git a/packages/amis-theme-editor-helper/rollup.config.js b/packages/amis-theme-editor-helper/rollup.config.js index 78017f6ca72..802bd280e7b 100644 --- a/packages/amis-theme-editor-helper/rollup.config.js +++ b/packages/amis-theme-editor-helper/rollup.config.js @@ -48,12 +48,6 @@ const pkgs = []; } }); -// 很多项目没装这个，所以style-inject直接打进去 -const index = pkgs.indexOf('style-inject'); -if (~index) { - pkgs.splice(index, 1); -} - const external = id => pkgs.some(pkg => id.startsWith(pkg) || ~id.indexOf(`node_modules/${pkg}`)); const input = ['./src/index.ts']; diff --git a/packages/amis-ui/scss/components/form/_list.scss b/packages/amis-ui/scss/components/form/_list.scss index db756503c41..45644afeb33 100644 --- a/packages/amis-ui/scss/components/form/_list.scss +++ b/packages/amis-ui/scss/components/form/_list.scss @@ -166,8 +166,8 @@ right: px2rem(2px); bottom: px2rem(6px); transform: rotate(-40deg); - width: var(--Checkbox--full-inner-size); - height: calc(var(--Checkbox--full-inner-size) / 2); + width: px2rem(8px); + height: px2rem(4px); border-color: #fff; } } From 475adb87b14cfcfa7677f4ef0ee844d253721115 Mon Sep 17 00:00:00 2001 From: qinhaoyan Date: Thu, 28 Nov 2024 15:02:35 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=88=90=E5=8C=85?= =?UTF-8?q?=E4=BE=9D=E8=B5=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/amis-theme-editor-helper/package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/amis-theme-editor-helper/package.json b/packages/amis-theme-editor-helper/package.json index a820a995475..b900d1a1040 100644 --- a/packages/amis-theme-editor-helper/package.json +++ b/packages/amis-theme-editor-helper/package.json @@ -1,6 +1,6 @@ { "name": "amis-theme-editor-helper", - "version": "0.0.0-alpha.8", + "version": "2.0.26", "description": "amis主题编辑器通用方法", "main": "lib/index.js", "module": "esm/index.js", @@ -72,4 +72,4 @@ "react": ">=16.8.6", "react-dom": ">=16.8.6" } -} +} \ No newline at end of file