Merge pull request #565 from lowcoder-org/dev

Dev -> Main - 2.2.0 hotfixes

Author: FalkWolsky

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

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 }) => {

client/package.json

@@ -1,6 +1,6 @@
 {
-  "name": "taco-fe",
-  "version": "0.1.0",
+  "name": "lowcoder-root",
+  "version": "2.2.0",
   "type": "module",
   "private": true,
   "workspaces": [

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"));

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());

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);

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"

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 (

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 }) => {

client/packages/lowcoder/src/components/table/EditableCell.tsx

@@ -34,6 +34,7 @@ export interface CellProps {
   size?: string;
   candidateTags?: string[];
   candidateStatus?: { text: string; status: StatusType }[];
+  textOverflow?: boolean;
 }
 
 export type CellViewReturn = (props: CellProps) => ReactNode;
@@ -43,17 +44,6 @@ export type EditViewFn<T> = (props: {
   onChangeEnd: () => void;
 }) => ReactNode;
 
-export const SizeWrapper = styled.div<{ $size?: string }>`
-  ${(props) =>
-    props.$size &&
-    `padding: ${
-      props.$size === "small" ? "8.5px 8px" : props.$size === "large" ? "16.5px 16px" : "12.5px 8px"
-    };
-    line-height: 21px;
-    min-height: ${props.$size === "small" ? "39px" : props.$size === "large" ? "55px" : "47px"};
-    `}
-`;
-
 const BorderDiv = styled.div`
   position: absolute;
   border: 1.5px solid #315efb;
@@ -127,11 +117,15 @@ export function EditableCell<T extends JSONValue>(props: EditableCellProps<T>) {
   }
 
   return (
-    <ColumnTypeView>
+    <ColumnTypeView
+      textOverflow={props.textOverflow}
+    >
       {status === "toSave" && !isEditing && <EditableChip />}
-      <SizeWrapper $size={props.size} onDoubleClick={enterEditFn}>
+      <div
+        onDoubleClick={enterEditFn}
+      >
         {normalView}
-      </SizeWrapper>
+      </div>
     </ColumnTypeView>
   );
 }