From a0544de80c82442e526d97f5d6bf72d01366b75f Mon Sep 17 00:00:00 2001 From: lianmin Date: Thu, 15 Jun 2023 20:28:00 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E6=9C=80=E5=A4=A7=E6=94=AF=E6=8C=81=20?= =?UTF-8?q?24=20=E6=A0=85=E6=A0=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .eslintrc.js | 2 +- .github/workflows/publish-lastest.yml | 2 +- .gitignore | 1 + README.md | 2 +- package.json | 12 +++--------- src/scss/variable.scss | 8 ++++---- src/types.ts | 2 +- 7 files changed, 12 insertions(+), 17 deletions(-) diff --git a/.eslintrc.js b/.eslintrc.js index 1744b9b..c9ab2ce 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -1,7 +1,7 @@ module.exports = { extends: [ 'eslint-config-ali/typescript/react', - "prettier", + 'prettier', 'prettier/@typescript-eslint', 'prettier/react', ], diff --git a/.github/workflows/publish-lastest.yml b/.github/workflows/publish-lastest.yml index 675c0b2..dfd77d9 100644 --- a/.github/workflows/publish-lastest.yml +++ b/.github/workflows/publish-lastest.yml @@ -13,7 +13,7 @@ jobs: strategy: matrix: - node-version: [16.x] + node-version: [14.x] steps: - uses: actions/checkout@v3 diff --git a/.gitignore b/.gitignore index b4da2e3..f0b9d07 100644 --- a/.gitignore +++ b/.gitignore @@ -10,6 +10,7 @@ tmp/ lib/ es/ .tmp/ +.idea/ # misc .idea/ diff --git a/README.md b/README.md index ff4cd23..abf0ac7 100644 --- a/README.md +++ b/README.md @@ -169,7 +169,7 @@ interface BreakPoint { /** * 列数 */ - numberOfColumns: 1 | 2 | 4 | 8 | 12 | 16; + numberOfColumns: 1 | 2 | 4 | 8 | 12 | 16 | 24; } ``` diff --git a/package.json b/package.json index 6590e8c..8479ab1 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@alifd/layout", - "version": "2.0.11", + "version": "2.1.0", "description": "基于 Fusion 设计系统的自然布局体系", "files": [ "demo/", @@ -81,20 +81,14 @@ "name": "Layout", "title": "自然布局", "category": "Information", - "materialSchema": "https://unpkg.alibaba-inc.com/@alifd/layout@2.0.7/build/lowcode/assets-prod.json" + "materialSchema": "https://unpkg.alibaba-inc.com/@alifd/layout@2.1.0-beta.1/build/lowcode/assets-daily.json" }, "publishConfig": { "access": "public" }, "license": "MIT", - "homepage": "https://unpkg.com/@alifd/layout@2.0.7/build/index.html", + "homepage": "https://unpkg.com/@alifd/layout@2.1.0/build/index.html", "bugs": "https://gitlab.alibaba-inc.com/fusion-design/layout/issues", - "husky": { - "hooks": { - "pre-commit": "f2elint commit-file-scan", - "commit-msg": "f2elint commit-msg-scan" - } - }, "repository": "https://github.com/alibaba-fusion/layout.git", "resolutions": { "sass": "1.35.x" diff --git a/src/scss/variable.scss b/src/scss/variable.scss index 5562323..dced014 100644 --- a/src/scss/variable.scss +++ b/src/scss/variable.scss @@ -2,10 +2,10 @@ $biz-css-prefix: '.fd-layout-'; // 常用背景 $backgroundTypes: 'lining', 'surface', 'transparent'; -// 最大支持列数: 16 -$maxNumberOfColumns: 16; +// 最大支持列数: 24 +$maxNumberOfColumns: 24; // 列枚举 -$columnNumEnum: 1, 2, 4, 8, 12, 16; +$columnNumEnum: 1, 2, 4, 8, 12, 16, 24; // 尺寸 $sizes: 'small', 'medium', 'large'; // 字体类型 @@ -84,7 +84,7 @@ $fontTypes: h1, h2, h3, h4, h5, h6, body1, body2, caption, overline; */ --color-lining: #f0f0f0; - //=================== 大布局 ============== + // =================== 大布局 ============== /* page */ /* diff --git a/src/types.ts b/src/types.ts index e6c7d96..cf27a90 100644 --- a/src/types.ts +++ b/src/types.ts @@ -38,7 +38,7 @@ export interface BreakPoint { /** * 列数 */ - numberOfColumns: 1 | 2 | 4 | 8 | 12 | 16; + numberOfColumns: 1 | 2 | 4 | 8 | 12 | 16 | 24; } /**