Merge branch 'dev' into table-fixes

FalkWolsky · web-flow · commit fc8185ebe8cb · 2023-12-05T17:19:51.000+01:00
diff --git a/client/.yarnrc.yml b/client/.yarnrc.yml
@@ -1,6 +1,6 @@
 nodeLinker: node-modules
 
-npmRegistryServer: "https://registry.npmmirror.com"
+npmRegistryServer: "https://registry.npmjs.org"
 
 plugins:
   - path: .yarn/plugins/@yarnpkg/plugin-workspace-tools.cjs
diff --git a/client/config/test/jest.config.js b/client/config/test/jest.config.js
@@ -1,6 +1,6 @@
 import path from "node:path";
-import { buildVars } from "lowcoder-dev-utils/buildVars.js";
-import { currentDirName } from "lowcoder-dev-utils/util.js";
+import { buildVars } from "../../packages/lowcoder-dev-utils/buildVars.js";
+import { currentDirName } from "../../packages/lowcoder-dev-utils/util.js";
 
 const globals = {};
 buildVars.forEach(({ name, defaultValue }) => {
diff --git a/client/package.json b/client/package.json
@@ -1,10 +1,11 @@
 {
-  "name": "taco-fe",
-  "version": "0.1.0",
+  "name": "lowcoder-root",
+  "version": "2.2.0",
   "type": "module",
   "private": true,
   "workspaces": [
-    "packages/*"
+    "packages/*",
+    "packages/lowcoder-dev-utils"
   ],
   "engines": {
     "node": "^14.18.0 || >=16.0.0"
diff --git a/client/packages/create-lowcoder-plugin/index.js b/client/packages/create-lowcoder-plugin/index.js
@@ -5,7 +5,7 @@ import { spawn } from "cross-spawn";
 import { writeFileSync, existsSync } from "node:fs";
 import chalk from "chalk";
 import { createCommand } from "commander";
-import { readJson, currentDirName } from "lowcoder-dev-utils/util.js";
+import { readJson, currentDirName } from "../lowcoder-dev-utils/util.js";
 
 const currentDir = currentDirName(import.meta.url);
 const pkg = readJson(path.resolve(currentDir, "./package.json"));
diff --git a/client/packages/lowcoder-cli/config/paths.js b/client/packages/lowcoder-cli/config/paths.js
@@ -1,6 +1,6 @@
 import path from "node:path";
 import fs from "node:fs";
-import { currentDirName } from "lowcoder-dev-utils/util.js";
+import { currentDirName } from "../../lowcoder-dev-utils/util.js";
 
 const currentDir = currentDirName(import.meta.url);
 const appDirectory = fs.realpathSync(process.cwd());
diff --git a/client/packages/lowcoder-cli/config/vite.config.js b/client/packages/lowcoder-cli/config/vite.config.js
@@ -1,12 +1,12 @@
 import react from "@vitejs/plugin-react";
 import svgrPlugin from "vite-plugin-svgr";
 import global from "rollup-plugin-external-globals";
-import { buildVars } from "lowcoder-dev-utils/buildVars.js";
+import { buildVars } from "../../lowcoder-dev-utils/buildVars.js";
 import injectCss from "vite-plugin-css-injected-by-js";
-import { getLibNames, getAllLibGlobalVarNames } from "lowcoder-dev-utils/external.js";
+import { getLibNames, getAllLibGlobalVarNames } from "../../lowcoder-dev-utils/external.js";
 import paths from "./paths.js";
 import { defineConfig } from "vite";
-import { readJson } from "lowcoder-dev-utils/util.js";
+import { readJson } from "../../lowcoder-dev-utils/util.js";
 
 const isProduction = process.env.NODE_ENV === "production";
 const packageJson = readJson(paths.appPackageJson);
diff --git a/client/packages/lowcoder-dev-utils/package.json b/client/packages/lowcoder-dev-utils/package.json
@@ -3,6 +3,7 @@
   "version": "0.0.6",
   "license": "MIT",
   "type": "module",
+  "main": "external.js",
   "description": "Lowcoder dev utils for lowcoder build process and lowcoder-cli",
   "keywords": [
     "lowcoder"
diff --git a/client/packages/lowcoder-plugin-demo/index.tsx b/client/packages/lowcoder-plugin-demo/index.tsx
@@ -3,7 +3,7 @@ import { CompIDE } from "lowcoder-sdk";
 import { name, version, lowcoder } from "./package.json";
 import compMap from "./src/index";
 
-import "lowcoder-sdk/dist/style.css";
+import "../lowcoder-sdk/dist/style.css";
 
 function CompDevApp() {
   return (
diff --git a/client/packages/lowcoder-sdk/vite.config.mts b/client/packages/lowcoder-sdk/vite.config.mts
@@ -3,9 +3,9 @@ import react from "@vitejs/plugin-react";
 import viteTsconfigPaths from "vite-tsconfig-paths";
 import svgrPlugin from "vite-plugin-svgr";
 import path from "path";
-import { ensureLastSlash } from "lowcoder-dev-utils/util";
-import { buildVars } from "lowcoder-dev-utils/buildVars";
-import { globalDepPlugin } from "lowcoder-dev-utils/globalDepPlguin";
+import { ensureLastSlash } from "../lowcoder-dev-utils/util";
+import { buildVars } from "../lowcoder-dev-utils/buildVars";
+import { globalDepPlugin } from "../lowcoder-dev-utils/globalDepPlguin";
 
 const define = {};
 buildVars.forEach(({ name, defaultValue }) => {
diff --git a/client/packages/lowcoder/src/comps/comps/textInputComp/inputComp.tsx b/client/packages/lowcoder/src/comps/comps/textInputComp/inputComp.tsx
@@ -77,11 +77,11 @@ export const InputComp = new UICompBuilder(childrenMap, (props) => {
         <TextInputBasicSection {...children} />
         <FormDataPropertyView {...children} />
 
-        {useContext(EditorContext).editorModeStatus === "layout" && (
+        {["layout", "both"].includes(useContext(EditorContext).editorModeStatus) && (
           children.label.getPropertyView()
         )}
         
-        {useContext(EditorContext).editorModeStatus !== "layout" && (
+        {["logic", "both"].includes(useContext(EditorContext).editorModeStatus) && (
           <><TextInputInteractionSection {...children} />
           <Section name={sectionNames.layout}>{hiddenPropertyView(children)}</Section>
           <Section name={sectionNames.advanced}>
@@ -94,7 +94,7 @@ export const InputComp = new UICompBuilder(childrenMap, (props) => {
           <TextInputValidationSection {...children} />
           </>
         )}
-        {useContext(EditorContext).editorModeStatus === "layout" && (
+        {["layout", "both"].includes(useContext(EditorContext).editorModeStatus) && (
           <><Section name={sectionNames.style}>{children.style.getPropertyView()}</Section></>
         )}
       </>
diff --git a/client/packages/lowcoder/src/comps/comps/textInputComp/mentionComp.tsx b/client/packages/lowcoder/src/comps/comps/textInputComp/mentionComp.tsx
@@ -209,19 +209,19 @@ let MentionTmpComp = (function () {
           {children.placeholder.propertyView({
             label: trans("prop.placeholder"),
           })}
-          {useContext(EditorContext).editorModeStatus !== "layout" && (
+          {["logic", "both"].includes(useContext(EditorContext).editorModeStatus) && (
             children.mentionList.propertyView({
               label: trans("mention.mentionList"),
             })
           )}
         </Section>
         <FormDataPropertyView {...children} />
 
-        {useContext(EditorContext).editorModeStatus === "layout" && (
+        {["layout", "both"].includes(useContext(EditorContext).editorModeStatus) && (
           children.label.getPropertyView()
         )}
 
-        {useContext(EditorContext).editorModeStatus !== "layout" && (
+        {["logic", "both"].includes(useContext(EditorContext).editorModeStatus) && (
         <><Section name={sectionNames.interaction}>
             {children.onEvent.getPropertyView()}
             {disabledPropertyView(children)}
@@ -240,11 +240,11 @@ let MentionTmpComp = (function () {
             </Section></>
         )}
 
-      {useContext(EditorContext).editorModeStatus === "layout" && (
+        {["layout", "both"].includes(useContext(EditorContext).editorModeStatus) && (
         <><Section name={sectionNames.style}>
               {children.style.getPropertyView()}
             </Section></>
-      )}
+        )}
       </>
     ))
     .build();
diff --git a/client/packages/lowcoder/src/comps/comps/textInputComp/passwordComp.tsx b/client/packages/lowcoder/src/comps/comps/textInputComp/passwordComp.tsx
@@ -79,11 +79,11 @@ const PasswordTmpComp = (function () {
           <TextInputBasicSection {...children} />
           <FormDataPropertyView {...children} />
 
-          {useContext(EditorContext).editorModeStatus === "layout" && (
+          {["layout", "both"].includes(useContext(EditorContext).editorModeStatus) && (
             children.label.getPropertyView()
           )}
 
-          {useContext(EditorContext).editorModeStatus !== "layout" && (
+          {["logic", "both"].includes(useContext(EditorContext).editorModeStatus) && (
             <><TextInputInteractionSection {...children} />
             <Section name={sectionNames.layout}>{hiddenPropertyView(children)}</Section>
             <Section name={sectionNames.advanced}>
@@ -101,7 +101,7 @@ const PasswordTmpComp = (function () {
             </Section></>
           )}
 
-          {useContext(EditorContext).editorModeStatus === "layout" && (
+          {["layout", "both"].includes(useContext(EditorContext).editorModeStatus) && (
             <><Section name={sectionNames.style}>{children.style.getPropertyView()}</Section></>
           )}
         </>
diff --git a/client/packages/lowcoder/src/comps/comps/textInputComp/textAreaComp.tsx b/client/packages/lowcoder/src/comps/comps/textInputComp/textAreaComp.tsx
@@ -95,11 +95,11 @@ let TextAreaTmpComp = (function () {
         <TextInputBasicSection {...children} />
         <FormDataPropertyView {...children} />
 
-        {useContext(EditorContext).editorModeStatus === "layout" && (
+        {["layout", "both"].includes(useContext(EditorContext).editorModeStatus) && (
           children.label.getPropertyView()
         )}
 
-        {useContext(EditorContext).editorModeStatus !== "layout" && (
+        {["logic", "both"].includes(useContext(EditorContext).editorModeStatus) && (
           <><TextInputInteractionSection {...children} />
           <Section name={sectionNames.layout}>
             {children.autoHeight.getPropertyView()}
@@ -112,7 +112,7 @@ let TextAreaTmpComp = (function () {
           <TextInputValidationSection {...children} /></>
         )}
 
-        {useContext(EditorContext).editorModeStatus === "layout" && (
+        {["layout", "both"].includes(useContext(EditorContext).editorModeStatus) && (
           <><Section name={sectionNames.style}>{children.style.getPropertyView()}</Section></>
         )}
       </>
diff --git a/client/packages/lowcoder/vite.config.mts b/client/packages/lowcoder/vite.config.mts
@@ -8,9 +8,9 @@ import { visualizer } from "rollup-plugin-visualizer";
 import path from "path";
 import chalk from "chalk";
 import { createHtmlPlugin } from "vite-plugin-html";
-import { ensureLastSlash } from "lowcoder-dev-utils/util";
-import { buildVars } from "lowcoder-dev-utils/buildVars";
-import { globalDepPlugin } from "lowcoder-dev-utils/globalDepPlguin";
+import { ensureLastSlash } from "../lowcoder-dev-utils/util";
+import { buildVars } from "../lowcoder-dev-utils/buildVars";
+import { globalDepPlugin } from "../lowcoder-dev-utils/globalDepPlguin";
 
 dotenv.config();
 
diff --git a/client/yarn.lock b/client/yarn.lock
@@ -8356,9 +8356,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"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.":
+"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.":
   version: 0.0.0
-  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."
+  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."
   dependencies:
     requireindex: ~1.1.0
   checksum: 681f936c1933b0bc01e2b360df9f05a4cdb0a545a026e0311da0105a60eb3cf6f2f81145e12e5bfefd16eeff9272acfb7e41cc78a587c0487c49f311cd176a2e
@@ -11942,6 +11942,58 @@ __metadata:
   languageName: unknown
   linkType: soft
 
+"lowcoder-root@workspace:.":
+  version: 0.0.0-use.local
+  resolution: "lowcoder-root@workspace:."
+  dependencies:
+    "@babel/preset-env": ^7.20.2
+    "@babel/preset-typescript": ^7.18.6
+    "@lottiefiles/react-lottie-player": ^3.5.3
+    "@rollup/plugin-typescript": ^8.5.0
+    "@testing-library/jest-dom": ^5.16.5
+    "@testing-library/react": ^12.0.0
+    "@testing-library/user-event": ^13.2.1
+    "@types/ali-oss": ^6.16.4
+    "@types/file-saver": ^2.0.5
+    "@types/jest": ^29.2.2
+    "@types/mime": ^2.0.3
+    "@types/qrcode.react": ^1.0.2
+    "@types/react-grid-layout": ^1.3.0
+    "@types/react-helmet": ^6.1.5
+    "@types/react-resizable": ^3.0.5
+    "@types/react-router-dom": ^5.3.2
+    "@types/shelljs": ^0.8.11
+    "@types/styled-components": ^5.1.19
+    "@types/stylis": ^4.0.2
+    "@types/tern": 0.23.4
+    "@types/toposort": ^2.0.3
+    "@types/ua-parser-js": ^0.7.36
+    "@welldone-software/why-did-you-render": ^6.2.3
+    add: ^2.0.6
+    antd-mobile: ^5.28.0
+    babel-jest: ^29.3.0
+    babel-preset-react-app: ^10.0.1
+    chalk: 4
+    husky: ^8.0.1
+    jest: ^29.5.0
+    jest-environment-jsdom: ^29.5.0
+    lint-staged: ^13.0.1
+    lowcoder-dev-utils: "workspace:^"
+    mq-polyfill: ^1.1.8
+    number-precision: ^1.6.0
+    prettier: ^2.7.0
+    react-player: ^2.11.0
+    rimraf: ^3.0.2
+    rollup: ^2.79.0
+    shelljs: ^0.8.5
+    svgo: ^3.0.0
+    tui-image-editor: ^3.15.3
+    typescript: ^4.8.4
+    whatwg-fetch: ^3.6.2
+    yarn: ^1.22.19
+  languageName: unknown
+  linkType: soft
+
 "lowcoder-sdk@workspace:^, lowcoder-sdk@workspace:packages/lowcoder-sdk":
   version: 0.0.0-use.local
   resolution: "lowcoder-sdk@workspace:packages/lowcoder-sdk"
@@ -15776,9 +15828,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"react-virtualized@patch:react-virtualized@npm%3A9.22.3#./.yarn/patches/react-virtualized-npm-9.22.3-0fff3cbf64.patch::locator=taco-fe%40workspace%3A.":
+"react-virtualized@patch:react-virtualized@npm%3A9.22.3#./.yarn/patches/react-virtualized-npm-9.22.3-0fff3cbf64.patch::locator=lowcoder-root%40workspace%3A.":
   version: 9.22.3
-  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."
+  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."
   dependencies:
     "@babel/runtime": ^7.7.2
     clsx: ^1.0.4
@@ -17532,58 +17584,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"taco-fe@workspace:.":
-  version: 0.0.0-use.local
-  resolution: "taco-fe@workspace:."
-  dependencies:
-    "@babel/preset-env": ^7.20.2
-    "@babel/preset-typescript": ^7.18.6
-    "@lottiefiles/react-lottie-player": ^3.5.3
-    "@rollup/plugin-typescript": ^8.5.0
-    "@testing-library/jest-dom": ^5.16.5
-    "@testing-library/react": ^12.0.0
-    "@testing-library/user-event": ^13.2.1
-    "@types/ali-oss": ^6.16.4
-    "@types/file-saver": ^2.0.5
-    "@types/jest": ^29.2.2
-    "@types/mime": ^2.0.3
-    "@types/qrcode.react": ^1.0.2
-    "@types/react-grid-layout": ^1.3.0
-    "@types/react-helmet": ^6.1.5
-    "@types/react-resizable": ^3.0.5
-    "@types/react-router-dom": ^5.3.2
-    "@types/shelljs": ^0.8.11
-    "@types/styled-components": ^5.1.19
-    "@types/stylis": ^4.0.2
-    "@types/tern": 0.23.4
-    "@types/toposort": ^2.0.3
-    "@types/ua-parser-js": ^0.7.36
-    "@welldone-software/why-did-you-render": ^6.2.3
-    add: ^2.0.6
-    antd-mobile: ^5.28.0
-    babel-jest: ^29.3.0
-    babel-preset-react-app: ^10.0.1
-    chalk: 4
-    husky: ^8.0.1
-    jest: ^29.5.0
-    jest-environment-jsdom: ^29.5.0
-    lint-staged: ^13.0.1
-    lowcoder-dev-utils: "workspace:^"
-    mq-polyfill: ^1.1.8
-    number-precision: ^1.6.0
-    prettier: ^2.7.0
-    react-player: ^2.11.0
-    rimraf: ^3.0.2
-    rollup: ^2.79.0
-    shelljs: ^0.8.5
-    svgo: ^3.0.0
-    tui-image-editor: ^3.15.3
-    typescript: ^4.8.4
-    whatwg-fetch: ^3.6.2
-    yarn: ^1.22.19
-  languageName: unknown
-  linkType: soft
-
 "tapable@npm:^0.2.3":
   version: 0.2.9
   resolution: "tapable@npm:0.2.9"
