Skip to content

Commit 5b4af52

Browse files
sarikesarike
committed
updates: calendar comp and table column batch updates
- add calendar comp - table column batch config - optimize list view comp - .etc
1 parent efcc388 commit 5b4af52

File tree

200 files changed

+4314
-1499
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

200 files changed

+4314
-1499
lines changed

‎client/.yarn/patches/eslint-plugin-only-ascii-npm-0.0.0-29e3417685.patch

Lines changed: 69 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,69 @@
1+
diff --git a/lib/rules/only-ascii.js b/lib/rules/only-ascii.js
2+
index 7d76f9d37a99be35bab91d7a437073b112e2e985..b6ccac270f309232471d8e26ad8ec1bb782079f7 100644
3+
--- a/lib/rules/only-ascii.js
4+
+++ b/lib/rules/only-ascii.js
5+
@@ -39,7 +39,7 @@ function create (context) {
6+
7+
// Get tokens which include non-ascii characters
8+
var sourceCode = context.getSourceCode();
9+
- var tokens = sourceCode.getTokens(node);
10+
+ var tokens = sourceCode.tokensAndComments;
11+
12+
tokens.forEach(function (token) {
13+
var value = token.value;
14+
diff --git a/package.json b/package.json
15+
index b6a4e0e402ed2c934cca2124e8ab9d2b43a198a2..d781a469e7a7d502a20e0dab27fc9c8adad4ffd8 100644
16+
--- a/package.json
17+
+++ b/package.json
18+
@@ -16,11 +16,14 @@
19+
"requireindex": "~1.1.0"
20+
},
21+
"devDependencies": {
22+
- "eslint": "~3.9.1",
23+
+ "eslint": "^8.0.0",
24+
"mocha": "^3.1.2"
25+
},
26+
"engines": {
27+
"node": ">=0.10.0"
28+
},
29+
- "license": "ISC"
30+
+ "license": "ISC",
31+
+ "peerDependencies": {
32+
+ "eslint": "8"
33+
+ }
34+
}
35+
diff --git a/tests/lib/rules/only-ascii.js b/tests/lib/rules/only-ascii.js
36+
index 21cca9c932ac41804bb36ccd35787cdf121b4f16..a84c5a5dbf7ddb89637b88059432484b215ae098 100644
37+
--- a/tests/lib/rules/only-ascii.js
38+
+++ b/tests/lib/rules/only-ascii.js
39+
@@ -8,15 +8,19 @@ var ruleTester = new RuleTester();
40+
ruleTester.run('no-japanese', rule, {
41+
42+
valid : [
43+
- { code : 'console.log("hello")', options : [] },
44+
+ { code : 'console.log("hello") // ok', options : [] },
45+
{ code : 'console.log("hello☆")', options : [{ allowedChars : '☆' }] },
46+
{ code : 'console.log("☆")', filename : 'foo', options : [{ excludePaths : ['foo'] }] },
47+
],
48+
49+
- invalid : [{
50+
+ invalid : [
51+
+ {
52+
+ code : 'console.info("hello"); // console.log("ハロー")',
53+
+ errors : [{ message : 'Non-ascii character "ハロー" found' }],
54+
+ },{
55+
code : 'console.log("ハロー")',
56+
errors : [{ message : 'Non-ascii character "ハロー" found' }],
57+
- }, {
58+
+ },{
59+
code : 'console.log("ハロー☆")',
60+
options : [{ allowedChars : '☆' }],
61+
errors : [{ message : 'Non-ascii character "ハロー" found' }],
62+
@@ -25,5 +29,6 @@ ruleTester.run('no-japanese', rule, {
63+
filename : 'foo',
64+
options : [{ excludePaths : ['bar'] }],
65+
errors : [{ message : 'Non-ascii character "☆" found' }],
66+
- }],
67+
+ }
68+
+ ],
69+
});

‎client/package.json

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
"start:ee": "REACT_APP_EDITION=enterprise yarn workspace openblocks start",
1515
"start:ee-global": "REACT_APP_EDITION=enterprise-global yarn workspace openblocks start",
1616
"build": "yarn node ./scripts/build.js",
17-
"test": "jest",
17+
"test": "jest && yarn workspace openblocks-comps test",
1818
"prepare": "yarn workspace openblocks prepare",
1919
"build:core": "yarn workspace openblocks-core build",
2020
"test:core": "yarn workspace openblocks-core test"
@@ -69,7 +69,8 @@
6969
"@types/react": "^17",
7070
"moment": "2.29.2",
7171
"canvas": "https://registry.yarnpkg.com/@favware/skip-dependency/-/skip-dependency-1.2.1.tgz",
72-
"react-virtualized@^9.22.3": "patch:react-virtualized@npm%3A9.22.3#./.yarn/patches/react-virtualized-npm-9.22.3-0fff3cbf64.patch"
72+
"react-virtualized@^9.22.3": "patch:react-virtualized@npm%3A9.22.3#./.yarn/patches/react-virtualized-npm-9.22.3-0fff3cbf64.patch",
73+
"eslint-plugin-only-ascii@^0.0.0": "patch:eslint-plugin-only-ascii@npm%3A0.0.0#./.yarn/patches/eslint-plugin-only-ascii-npm-0.0.0-29e3417685.patch"
7374
},
7475
"dependencies": {
7576
"antd-mobile": "^5.28.0",

‎client/packages/openblocks-comps/icons/icon-comp-calendar.svg

Lines changed: 22 additions & 0 deletions
Loading

‎client/packages/openblocks-comps/package.json

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,13 @@
44
"type": "module",
55
"license": "MIT",
66
"dependencies": {
7+
"@fullcalendar/core": "^6.0.3",
8+
"@fullcalendar/daygrid": "^6.0.3",
9+
"@fullcalendar/interaction": "^6.0.3",
10+
"@fullcalendar/list": "^6.0.3",
11+
"@fullcalendar/moment": "^6.1.4",
12+
"@fullcalendar/react": "^6.0.3",
13+
"@fullcalendar/timegrid": "^6.0.3",
714
"@types/react": "17",
815
"@types/react-dom": "17",
916
"big.js": "^6.2.1",
@@ -32,12 +39,21 @@
3239
"w": 15,
3340
"h": 60
3441
}
42+
},
43+
"calendar": {
44+
"name": "Calendar",
45+
"icon": "./icons/icon-comp-calendar.svg",
46+
"layoutInfo": {
47+
"w": 15,
48+
"h": 60
49+
}
3550
}
3651
}
3752
},
3853
"scripts": {
3954
"start": "vite",
4055
"build": "yarn test && openblocks-cli build",
56+
"build_only": "openblocks-cli build",
4157
"test": "jest"
4258
},
4359
"devDependencies": {

0 commit comments

Comments
 (0)