Skip to content

Commit cb8fee7

Browse files
author
FalkWolsky
committed
Fixing 2.2.0 bugs
1 parent eb24329 commit cb8fee7

File tree

15 files changed

+90
-88
lines changed

15 files changed

+90
-88
lines changed

‎client/.yarnrc.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
nodeLinker: node-modules
22

3-
npmRegistryServer: "https://registry.npmmirror.com"
3+
npmRegistryServer: "https://registry.npmjs.org"
44

55
plugins:
66
- path: .yarn/plugins/@yarnpkg/plugin-workspace-tools.cjs

‎client/config/test/jest.config.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import path from "node:path";
2-
import { buildVars } from "lowcoder-dev-utils/buildVars.js";
3-
import { currentDirName } from "lowcoder-dev-utils/util.js";
2+
import { buildVars } from "../../packages/lowcoder-dev-utils/buildVars.js";
3+
import { currentDirName } from "../../packages/lowcoder-dev-utils/util.js";
44

55
const globals = {};
66
buildVars.forEach(({ name, defaultValue }) => {

‎client/package.json

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
{
2-
"name": "taco-fe",
3-
"version": "0.1.0",
2+
"name": "lowcoder-root",
3+
"version": "2.2.0",
44
"type": "module",
55
"private": true,
66
"workspaces": [
7-
"packages/*"
7+
"packages/*",
8+
"packages/lowcoder-dev-utils"
89
],
910
"engines": {
1011
"node": "^14.18.0 || >=16.0.0"

‎client/packages/create-lowcoder-plugin/index.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import { spawn } from "cross-spawn";
55
import { writeFileSync, existsSync } from "node:fs";
66
import chalk from "chalk";
77
import { createCommand } from "commander";
8-
import { readJson, currentDirName } from "lowcoder-dev-utils/util.js";
8+
import { readJson, currentDirName } from "../lowcoder-dev-utils/util.js";
99

1010
const currentDir = currentDirName(import.meta.url);
1111
const pkg = readJson(path.resolve(currentDir, "./package.json"));

‎client/packages/lowcoder-cli/config/paths.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import path from "node:path";
22
import fs from "node:fs";
3-
import { currentDirName } from "lowcoder-dev-utils/util.js";
3+
import { currentDirName } from "../../lowcoder-dev-utils/util.js";
44

55
const currentDir = currentDirName(import.meta.url);
66
const appDirectory = fs.realpathSync(process.cwd());

‎client/packages/lowcoder-cli/config/vite.config.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
import react from "@vitejs/plugin-react";
22
import svgrPlugin from "vite-plugin-svgr";
33
import global from "rollup-plugin-external-globals";
4-
import { buildVars } from "lowcoder-dev-utils/buildVars.js";
4+
import { buildVars } from "../../lowcoder-dev-utils/buildVars.js";
55
import injectCss from "vite-plugin-css-injected-by-js";
6-
import { getLibNames, getAllLibGlobalVarNames } from "lowcoder-dev-utils/external.js";
6+
import { getLibNames, getAllLibGlobalVarNames } from "../../lowcoder-dev-utils/external.js";
77
import paths from "./paths.js";
88
import { defineConfig } from "vite";
9-
import { readJson } from "lowcoder-dev-utils/util.js";
9+
import { readJson } from "../../lowcoder-dev-utils/util.js";
1010

1111
const isProduction = process.env.NODE_ENV === "production";
1212
const packageJson = readJson(paths.appPackageJson);

‎client/packages/lowcoder-dev-utils/package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
"version": "0.0.6",
44
"license": "MIT",
55
"type": "module",
6+
"main": "external.js",
67
"description": "Lowcoder dev utils for lowcoder build process and lowcoder-cli",
78
"keywords": [
89
"lowcoder"

‎client/packages/lowcoder-plugin-demo/index.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import { CompIDE } from "lowcoder-sdk";
33
import { name, version, lowcoder } from "./package.json";
44
import compMap from "./src/index";
55

6-
import "lowcoder-sdk/dist/style.css";
6+
import "../lowcoder-sdk/dist/style.css";
77

88
function CompDevApp() {
99
return (

‎client/packages/lowcoder-sdk/vite.config.mts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@ import react from "@vitejs/plugin-react";
33
import viteTsconfigPaths from "vite-tsconfig-paths";
44
import svgrPlugin from "vite-plugin-svgr";
55
import path from "path";
6-
import { ensureLastSlash } from "lowcoder-dev-utils/util";
7-
import { buildVars } from "lowcoder-dev-utils/buildVars";
8-
import { globalDepPlugin } from "lowcoder-dev-utils/globalDepPlguin";
6+
import { ensureLastSlash } from "../lowcoder-dev-utils/util";
7+
import { buildVars } from "../lowcoder-dev-utils/buildVars";
8+
import { globalDepPlugin } from "../lowcoder-dev-utils/globalDepPlguin";
99

1010
const define = {};
1111
buildVars.forEach(({ name, defaultValue }) => {

‎client/packages/lowcoder/src/comps/comps/textInputComp/inputComp.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -77,11 +77,11 @@ export const InputComp = new UICompBuilder(childrenMap, (props) => {
7777
<TextInputBasicSection {...children} />
7878
<FormDataPropertyView {...children} />
7979

80-
{useContext(EditorContext).editorModeStatus === "layout" && (
80+
{["layout", "both"].includes(useContext(EditorContext).editorModeStatus) && (
8181
children.label.getPropertyView()
8282
)}
8383

84-
{useContext(EditorContext).editorModeStatus !== "layout" && (
84+
{["logic", "both"].includes(useContext(EditorContext).editorModeStatus) && (
8585
<><TextInputInteractionSection {...children} />
8686
<Section name={sectionNames.layout}>{hiddenPropertyView(children)}</Section>
8787
<Section name={sectionNames.advanced}>
@@ -94,7 +94,7 @@ export const InputComp = new UICompBuilder(childrenMap, (props) => {
9494
<TextInputValidationSection {...children} />
9595
</>
9696
)}
97-
{useContext(EditorContext).editorModeStatus === "layout" && (
97+
{["layout", "both"].includes(useContext(EditorContext).editorModeStatus) && (
9898
<><Section name={sectionNames.style}>{children.style.getPropertyView()}</Section></>
9999
)}
100100
</>

‎client/packages/lowcoder/src/comps/comps/textInputComp/mentionComp.tsx

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -209,19 +209,19 @@ let MentionTmpComp = (function () {
209209
{children.placeholder.propertyView({
210210
label: trans("prop.placeholder"),
211211
})}
212-
{useContext(EditorContext).editorModeStatus !== "layout" && (
212+
{["logic", "both"].includes(useContext(EditorContext).editorModeStatus) && (
213213
children.mentionList.propertyView({
214214
label: trans("mention.mentionList"),
215215
})
216216
)}
217217
</Section>
218218
<FormDataPropertyView {...children} />
219219

220-
{useContext(EditorContext).editorModeStatus === "layout" && (
220+
{["layout", "both"].includes(useContext(EditorContext).editorModeStatus) && (
221221
children.label.getPropertyView()
222222
)}
223223

224-
{useContext(EditorContext).editorModeStatus !== "layout" && (
224+
{["logic", "both"].includes(useContext(EditorContext).editorModeStatus) && (
225225
<><Section name={sectionNames.interaction}>
226226
{children.onEvent.getPropertyView()}
227227
{disabledPropertyView(children)}
@@ -240,11 +240,11 @@ let MentionTmpComp = (function () {
240240
</Section></>
241241
)}
242242

243-
{useContext(EditorContext).editorModeStatus === "layout" && (
243+
{["layout", "both"].includes(useContext(EditorContext).editorModeStatus) && (
244244
<><Section name={sectionNames.style}>
245245
{children.style.getPropertyView()}
246246
</Section></>
247-
)}
247+
)}
248248
</>
249249
))
250250
.build();

‎client/packages/lowcoder/src/comps/comps/textInputComp/passwordComp.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -79,11 +79,11 @@ const PasswordTmpComp = (function () {
7979
<TextInputBasicSection {...children} />
8080
<FormDataPropertyView {...children} />
8181

82-
{useContext(EditorContext).editorModeStatus === "layout" && (
82+
{["layout", "both"].includes(useContext(EditorContext).editorModeStatus) && (
8383
children.label.getPropertyView()
8484
)}
8585

86-
{useContext(EditorContext).editorModeStatus !== "layout" && (
86+
{["logic", "both"].includes(useContext(EditorContext).editorModeStatus) && (
8787
<><TextInputInteractionSection {...children} />
8888
<Section name={sectionNames.layout}>{hiddenPropertyView(children)}</Section>
8989
<Section name={sectionNames.advanced}>
@@ -101,7 +101,7 @@ const PasswordTmpComp = (function () {
101101
</Section></>
102102
)}
103103

104-
{useContext(EditorContext).editorModeStatus === "layout" && (
104+
{["layout", "both"].includes(useContext(EditorContext).editorModeStatus) && (
105105
<><Section name={sectionNames.style}>{children.style.getPropertyView()}</Section></>
106106
)}
107107
</>

‎client/packages/lowcoder/src/comps/comps/textInputComp/textAreaComp.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -95,11 +95,11 @@ let TextAreaTmpComp = (function () {
9595
<TextInputBasicSection {...children} />
9696
<FormDataPropertyView {...children} />
9797

98-
{useContext(EditorContext).editorModeStatus === "layout" && (
98+
{["layout", "both"].includes(useContext(EditorContext).editorModeStatus) && (
9999
children.label.getPropertyView()
100100
)}
101101

102-
{useContext(EditorContext).editorModeStatus !== "layout" && (
102+
{["logic", "both"].includes(useContext(EditorContext).editorModeStatus) && (
103103
<><TextInputInteractionSection {...children} />
104104
<Section name={sectionNames.layout}>
105105
{children.autoHeight.getPropertyView()}
@@ -112,7 +112,7 @@ let TextAreaTmpComp = (function () {
112112
<TextInputValidationSection {...children} /></>
113113
)}
114114

115-
{useContext(EditorContext).editorModeStatus === "layout" && (
115+
{["layout", "both"].includes(useContext(EditorContext).editorModeStatus) && (
116116
<><Section name={sectionNames.style}>{children.style.getPropertyView()}</Section></>
117117
)}
118118
</>

‎client/packages/lowcoder/vite.config.mts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@ import { visualizer } from "rollup-plugin-visualizer";
88
import path from "path";
99
import chalk from "chalk";
1010
import { createHtmlPlugin } from "vite-plugin-html";
11-
import { ensureLastSlash } from "lowcoder-dev-utils/util";
12-
import { buildVars } from "lowcoder-dev-utils/buildVars";
13-
import { globalDepPlugin } from "lowcoder-dev-utils/globalDepPlguin";
11+
import { ensureLastSlash } from "../lowcoder-dev-utils/util";
12+
import { buildVars } from "../lowcoder-dev-utils/buildVars";
13+
import { globalDepPlugin } from "../lowcoder-dev-utils/globalDepPlguin";
1414

1515
dotenv.config();
1616

‎client/yarn.lock

Lines changed: 56 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -8356,9 +8356,9 @@ __metadata:
83568356
languageName: node
83578357
linkType: hard
83588358

8359-
"eslint-plugin-only-ascii@patch:eslint-plugin-only-ascii@npm%3A0.0.0#./.yarn/patches/eslint-plugin-only-ascii-npm-0.0.0-29e3417685.patch::locator=taco-fe%40workspace%3A.":
8359+
"eslint-plugin-only-ascii@patch:eslint-plugin-only-ascii@npm%3A0.0.0#./.yarn/patches/eslint-plugin-only-ascii-npm-0.0.0-29e3417685.patch::locator=lowcoder-root%40workspace%3A.":
83608360
version: 0.0.0
8361-
resolution: "eslint-plugin-only-ascii@patch:eslint-plugin-only-ascii@npm%3A0.0.0#./.yarn/patches/eslint-plugin-only-ascii-npm-0.0.0-29e3417685.patch::version=0.0.0&hash=2893de&locator=taco-fe%40workspace%3A."
8361+
resolution: "eslint-plugin-only-ascii@patch:eslint-plugin-only-ascii@npm%3A0.0.0#./.yarn/patches/eslint-plugin-only-ascii-npm-0.0.0-29e3417685.patch::version=0.0.0&hash=2893de&locator=lowcoder-root%40workspace%3A."
83628362
dependencies:
83638363
requireindex: ~1.1.0
83648364
checksum: 681f936c1933b0bc01e2b360df9f05a4cdb0a545a026e0311da0105a60eb3cf6f2f81145e12e5bfefd16eeff9272acfb7e41cc78a587c0487c49f311cd176a2e
@@ -11942,6 +11942,58 @@ __metadata:
1194211942
languageName: unknown
1194311943
linkType: soft
1194411944

11945+
"lowcoder-root@workspace:.":
11946+
version: 0.0.0-use.local
11947+
resolution: "lowcoder-root@workspace:."
11948+
dependencies:
11949+
"@babel/preset-env": ^7.20.2
11950+
"@babel/preset-typescript": ^7.18.6
11951+
"@lottiefiles/react-lottie-player": ^3.5.3
11952+
"@rollup/plugin-typescript": ^8.5.0
11953+
"@testing-library/jest-dom": ^5.16.5
11954+
"@testing-library/react": ^12.0.0
11955+
"@testing-library/user-event": ^13.2.1
11956+
"@types/ali-oss": ^6.16.4
11957+
"@types/file-saver": ^2.0.5
11958+
"@types/jest": ^29.2.2
11959+
"@types/mime": ^2.0.3
11960+
"@types/qrcode.react": ^1.0.2
11961+
"@types/react-grid-layout": ^1.3.0
11962+
"@types/react-helmet": ^6.1.5
11963+
"@types/react-resizable": ^3.0.5
11964+
"@types/react-router-dom": ^5.3.2
11965+
"@types/shelljs": ^0.8.11
11966+
"@types/styled-components": ^5.1.19
11967+
"@types/stylis": ^4.0.2
11968+
"@types/tern": 0.23.4
11969+
"@types/toposort": ^2.0.3
11970+
"@types/ua-parser-js": ^0.7.36
11971+
"@welldone-software/why-did-you-render": ^6.2.3
11972+
add: ^2.0.6
11973+
antd-mobile: ^5.28.0
11974+
babel-jest: ^29.3.0
11975+
babel-preset-react-app: ^10.0.1
11976+
chalk: 4
11977+
husky: ^8.0.1
11978+
jest: ^29.5.0
11979+
jest-environment-jsdom: ^29.5.0
11980+
lint-staged: ^13.0.1
11981+
lowcoder-dev-utils: "workspace:^"
11982+
mq-polyfill: ^1.1.8
11983+
number-precision: ^1.6.0
11984+
prettier: ^2.7.0
11985+
react-player: ^2.11.0
11986+
rimraf: ^3.0.2
11987+
rollup: ^2.79.0
11988+
shelljs: ^0.8.5
11989+
svgo: ^3.0.0
11990+
tui-image-editor: ^3.15.3
11991+
typescript: ^4.8.4
11992+
whatwg-fetch: ^3.6.2
11993+
yarn: ^1.22.19
11994+
languageName: unknown
11995+
linkType: soft
11996+
1194511997
"lowcoder-sdk@workspace:^, lowcoder-sdk@workspace:packages/lowcoder-sdk":
1194611998
version: 0.0.0-use.local
1194711999
resolution: "lowcoder-sdk@workspace:packages/lowcoder-sdk"
@@ -15776,9 +15828,9 @@ __metadata:
1577615828
languageName: node
1577715829
linkType: hard
1577815830

15779-
"react-virtualized@patch:react-virtualized@npm%3A9.22.3#./.yarn/patches/react-virtualized-npm-9.22.3-0fff3cbf64.patch::locator=taco-fe%40workspace%3A.":
15831+
"react-virtualized@patch:react-virtualized@npm%3A9.22.3#./.yarn/patches/react-virtualized-npm-9.22.3-0fff3cbf64.patch::locator=lowcoder-root%40workspace%3A.":
1578015832
version: 9.22.3
15781-
resolution: "react-virtualized@patch:react-virtualized@npm%3A9.22.3#./.yarn/patches/react-virtualized-npm-9.22.3-0fff3cbf64.patch::version=9.22.3&hash=36eda7&locator=taco-fe%40workspace%3A."
15833+
resolution: "react-virtualized@patch:react-virtualized@npm%3A9.22.3#./.yarn/patches/react-virtualized-npm-9.22.3-0fff3cbf64.patch::version=9.22.3&hash=36eda7&locator=lowcoder-root%40workspace%3A."
1578215834
dependencies:
1578315835
"@babel/runtime": ^7.7.2
1578415836
clsx: ^1.0.4
@@ -17532,58 +17584,6 @@ __metadata:
1753217584
languageName: node
1753317585
linkType: hard
1753417586

17535-
"taco-fe@workspace:.":
17536-
version: 0.0.0-use.local
17537-
resolution: "taco-fe@workspace:."
17538-
dependencies:
17539-
"@babel/preset-env": ^7.20.2
17540-
"@babel/preset-typescript": ^7.18.6
17541-
"@lottiefiles/react-lottie-player": ^3.5.3
17542-
"@rollup/plugin-typescript": ^8.5.0
17543-
"@testing-library/jest-dom": ^5.16.5
17544-
"@testing-library/react": ^12.0.0
17545-
"@testing-library/user-event": ^13.2.1
17546-
"@types/ali-oss": ^6.16.4
17547-
"@types/file-saver": ^2.0.5
17548-
"@types/jest": ^29.2.2
17549-
"@types/mime": ^2.0.3
17550-
"@types/qrcode.react": ^1.0.2
17551-
"@types/react-grid-layout": ^1.3.0
17552-
"@types/react-helmet": ^6.1.5
17553-
"@types/react-resizable": ^3.0.5
17554-
"@types/react-router-dom": ^5.3.2
17555-
"@types/shelljs": ^0.8.11
17556-
"@types/styled-components": ^5.1.19
17557-
"@types/stylis": ^4.0.2
17558-
"@types/tern": 0.23.4
17559-
"@types/toposort": ^2.0.3
17560-
"@types/ua-parser-js": ^0.7.36
17561-
"@welldone-software/why-did-you-render": ^6.2.3
17562-
add: ^2.0.6
17563-
antd-mobile: ^5.28.0
17564-
babel-jest: ^29.3.0
17565-
babel-preset-react-app: ^10.0.1
17566-
chalk: 4
17567-
husky: ^8.0.1
17568-
jest: ^29.5.0
17569-
jest-environment-jsdom: ^29.5.0
17570-
lint-staged: ^13.0.1
17571-
lowcoder-dev-utils: "workspace:^"
17572-
mq-polyfill: ^1.1.8
17573-
number-precision: ^1.6.0
17574-
prettier: ^2.7.0
17575-
react-player: ^2.11.0
17576-
rimraf: ^3.0.2
17577-
rollup: ^2.79.0
17578-
shelljs: ^0.8.5
17579-
svgo: ^3.0.0
17580-
tui-image-editor: ^3.15.3
17581-
typescript: ^4.8.4
17582-
whatwg-fetch: ^3.6.2
17583-
yarn: ^1.22.19
17584-
languageName: unknown
17585-
linkType: soft
17586-
1758717587
"tapable@npm:^0.2.3":
1758817588
version: 0.2.9
1758917589
resolution: "tapable@npm:0.2.9"

0 commit comments

Comments
 (0)