Skip to content

Commit

Permalink
feat: 最大支持 24 栅栏
Browse files Browse the repository at this point in the history
  • Loading branch information
lianmin committed Jun 15, 2023
1 parent ebff898 commit a0544de
Show file tree
Hide file tree
Showing 7 changed files with 12 additions and 17 deletions.
2 changes: 1 addition & 1 deletion .eslintrc.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
module.exports = {
extends: [
'eslint-config-ali/typescript/react',
"prettier",
'prettier',
'prettier/@typescript-eslint',
'prettier/react',
],
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/publish-lastest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:

strategy:
matrix:
node-version: [16.x]
node-version: [14.x]

steps:
- uses: actions/checkout@v3
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ tmp/
lib/
es/
.tmp/
.idea/

# misc
.idea/
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,7 @@ interface BreakPoint {
/**
* 列数
*/
numberOfColumns: 1 | 2 | 4 | 8 | 12 | 16;
numberOfColumns: 1 | 2 | 4 | 8 | 12 | 16 | 24;
}
```

Expand Down
12 changes: 3 additions & 9 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@alifd/layout",
"version": "2.0.11",
"version": "2.1.0",
"description": "基于 Fusion 设计系统的自然布局体系",
"files": [
"demo/",
Expand Down Expand Up @@ -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"
Expand Down
8 changes: 4 additions & 4 deletions src/scss/variable.scss
Original file line number Diff line number Diff line change
Expand Up @@ -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';
// 字体类型
Expand Down Expand Up @@ -84,7 +84,7 @@ $fontTypes: h1, h2, h3, h4, h5, h6, body1, body2, caption, overline;
*/
--color-lining: #f0f0f0;

//=================== 大布局 ==============
// =================== 大布局 ==============

/* page */
/*
Expand Down
2 changes: 1 addition & 1 deletion src/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ export interface BreakPoint {
/**
* 列数
*/
numberOfColumns: 1 | 2 | 4 | 8 | 12 | 16;
numberOfColumns: 1 | 2 | 4 | 8 | 12 | 16 | 24;
}

/**
Expand Down

0 comments on commit a0544de

Please sign in to comment.