Dev -> Main

.gitignore

@@ -9,3 +9,4 @@ client/node_modules/
 client/packages/lowcoder-plugin-demo/.yarn/install-state.gz
 client/packages/lowcoder-plugin-demo/yarn.lock
 client/packages/lowcoder-plugin-demo/.yarn/cache/@types-node-npm-16.18.68-56f72825c0-094ae9ed80.zip
+application-dev.yml

client/config/test/jest.config.js

@@ -6,14 +6,10 @@ export function currentDirName(importMetaUrl) {
   return dirname(fileURLToPath(importMetaUrl));
 }
 
-
 const globals = {};
 buildVars.forEach(({ name, defaultValue }) => {
   globals[name] = process.env[name] || defaultValue;
 });
-const edition = process.env.REACT_APP_EDITION;
-const isEEGlobal = edition === "enterprise-global";
-const isEE = edition === "enterprise" || isEEGlobal;
 const currentDir = currentDirName(import.meta.url);
 
 export default {
@@ -22,8 +18,7 @@ export default {
     "react-markdown": path.resolve(currentDir, "./mocks/react-markdown.js"),
     "\\.md\\?url$": path.resolve(currentDir, "./mocks/markdown-url-module.js"),
     "^@lowcoder-ee(.*)$": path.resolve(
-      currentDir,
-      isEE ? "../../packages/lowcoder/src/ee/$1" : "../../packages/lowcoder/src/$1"
+      currentDir, "../../packages/lowcoder/src/$1"
     ),
     "lowcoder-sdk": path.resolve(currentDir, "../../packages/lowcoder/src/index.sdk"),
   },

client/package.json

@@ -13,7 +13,6 @@
     "start": "yarn workspace lowcoder start",
     "start-win": "LOWCODER_API_SERVICE_URL=http://localhost:3000 yarn start",
     "start:ee": "REACT_APP_EDITION=enterprise yarn workspace lowcoder start",
-    "start:ee-global": "REACT_APP_EDITION=enterprise-global yarn workspace lowcoder start",
     "build": "yarn node ./scripts/build.js",
     "test": "jest && yarn workspace lowcoder-comps test",
     "prepare": "yarn workspace lowcoder prepare",

client/packages/lowcoder-comps/package.json

@@ -1,6 +1,6 @@
 {
   "name": "lowcoder-comps",
-  "version": "0.0.26",
+  "version": "0.0.27",
   "type": "module",
   "license": "MIT",
   "dependencies": {

client/packages/lowcoder-design/src/components/Label.tsx

@@ -5,7 +5,6 @@ export const labelCss: any = css`
   user-select: none;
 
   font-size: 13px;
-  color: #222222;
 
   &:hover {
     cursor: default;

client/packages/lowcoder-design/src/components/Section.tsx

@@ -75,6 +75,7 @@ const ShowChildren = styled.div<{ $show?: string; $noMargin?: boolean }>`
 
 interface ISectionConfig<T> {
   name?: string;
+  open?: boolean;
   width?: number;
   noMargin?: boolean;
   style?: React.CSSProperties;
@@ -103,7 +104,9 @@ export const PropertySectionContext = React.createContext<PropertySectionContext
 export const BaseSection = (props: ISectionConfig<ReactNode>) => {
   const { name } = props;
   const { compName, state, toggle } = useContext(PropertySectionContext);
-  const open = name ? state[compName]?.[name] !== false : true;
+  const open = props.open !== undefined ? props.open : name ? state[compName]?.[name] !== false : true;
+
+  console.log("open", open, props.open);
 
   const handleToggle = () => {
     if (!name) {
@@ -142,6 +145,7 @@ export const sectionNames = {
   validation: trans("prop.validation"),
   layout: trans("prop.layout"),
   style: trans("prop.style"),
+  labelStyle:trans("prop.labelStyle"),
   data: trans("prop.data"),
   meetings : trans("prop.meetings"), // added by Falk Wolsky
 };

client/packages/lowcoder-design/src/i18n/design/locales/en.ts

@@ -22,6 +22,7 @@ export const en = {
     advanced: "Advanced",
     validation: "Validation",
     layout: "Layout",
+    labelStyle:"Label Style",
     style: "Style",
     meetings : "Meeting Settings",
     data: "Data",

client/packages/lowcoder-design/src/i18n/design/locales/zh.ts

@@ -22,6 +22,7 @@ export const zh = {
       advanced: "高级",
       validation: "验证",
       layout: "布局",
+      labelStyle:"标签样式",
       style: "样式",
       meetings: "会议",
       data: "数据",

client/packages/lowcoder-design/src/icons/index.ts

@@ -315,6 +315,7 @@ export { ReactComponent as RecyclerIcon } from "./remix/delete-bin-line.svg";
 export { ReactComponent as MarketplaceIcon } from "./icon-application-marketplace.svg";
 export { ReactComponent as FavoritesIcon } from "./icon-application-favorites.svg";
 export { ReactComponent as HomeSettingIcon } from "./remix/settings-4-line.svg";
+export { ReactComponent as EnterpriseIcon } from "./remix/earth-line.svg";
 
 
 // new

client/packages/lowcoder/src/app.tsx

@@ -14,15 +14,16 @@ import {
   IMPORT_APP_FROM_TEMPLATE_URL,
   INVITE_LANDING_URL,
   isAuthUnRequired,
-  MARKETPLACE_TYPE_URL,
   MARKETPLACE_URL,
   ORG_AUTH_LOGIN_URL,
   ORG_AUTH_REGISTER_URL,
   QUERY_LIBRARY_URL,
   SETTING,
   TRASH_URL,
   USER_AUTH_URL,
+  ADMIN_APP_URL,
 } from "constants/routesURL";
+
 import React from "react";
 import { createRoot } from "react-dom/client";
 import { Helmet } from "react-helmet";
@@ -38,7 +39,7 @@ import LazyRoute from "components/LazyRoute";
 import AppFromTemplate from "pages/ApplicationV2/AppFromTemplate";
 import AppEditor from "pages/editor/AppEditor";
 import { getAntdLocale } from "i18n/antdLocale";
-import { CodeEditorTooltipContainer } from "base/codeEditor/codeEditor";
+// import { CodeEditorTooltipContainer } from "base/codeEditor/codeEditor";
 import { ProductLoading } from "components/ProductLoading";
 import { language, trans } from "i18n";
 import { loadComps } from "comps";
@@ -111,21 +112,16 @@ class AppIndex extends React.Component<AppIndexProps, any> {
           {<title>{this.props.brandName}</title>}
           {<link rel="icon" href={this.props.favicon} />}
           <meta name="description" content={trans("productDesc")} />
-
-          {isLowCoderDomain && (
-            <>
-              {/* setting Meta Attributes to be able for embedding via iframely */}
-              <meta property="iframely:title" content="Lowcoder" />
-              <meta property="iframely:description" content="Lowcoder | rapid App & VideoMeeting builder for everyone." />
-
-              <link rel="preconnect" href="https://fonts.googleapis.com"/>
-              <link rel="preconnect" href="https://fonts.gstatic.com" crossOrigin="anonymous"/>
-              <link href="https://fonts.googleapis.com/css2?family=Ubuntu:ital,wght@0,300;0,400;0,700;1,400&display=swap" rel="stylesheet"/>
-              {/* embedding analytics of Cleabits */}
-              <script src="https://tag.clearbitscripts.com/v1/pk_931b51e405557300e6a7c470e8247d5f/tags.js" referrerPolicy="strict-origin-when-cross-origin"></script>
-            </>
-          )}
-
+          {isLowCoderDomain && [
+            // Adding Support for iframely to be able to embedd the component explorer in the docu
+            <meta key="iframely:title" property="iframely:title" content="Lowcoder" />,
+            <meta key="iframely:description" property="iframely:description" content="Lowcoder | rapid App & VideoMeeting builder for everyone." />,
+            <link key="preconnect-googleapis" rel="preconnect" href="https://fonts.googleapis.com" />,
+            <link key="preconnect-gstatic" rel="preconnect" href="https://fonts.gstatic.com" crossOrigin="anonymous" />,
+            <link key="font-ubuntu" href="https://fonts.googleapis.com/css2?family=Ubuntu:ital,wght@0,300;0,400;0,700;1,400&display=swap" rel="stylesheet" />,
+            // adding Clearbit Support for Analytics
+            <script key="clearbit-script" src="https://tag.clearbitscripts.com/v1/pk_931b51e405557300e6a7c470e8247d5f/tags.js" referrerPolicy="strict-origin-when-cross-origin" type="text/javascript"></script>
+          ]}
         </Helmet>
         <SystemWarning />
         <Router history={history}>
@@ -160,6 +156,7 @@ class AppIndex extends React.Component<AppIndexProps, any> {
                 TRASH_URL,
                 SETTING,
                 MARKETPLACE_URL,
+                ADMIN_APP_URL,
               ]}
               // component={ApplicationListPage}
               component={ApplicationHome}

client/packages/lowcoder/src/components/CompName.tsx

@@ -83,6 +83,7 @@ export const CompName = (props: Iprops) => {
 
   const items: EditPopoverItemType[] = [];
 
+  // Falk: TODO - Implement upgrade for individual Version functionality
   const handleUpgrade = async () => {
     if (upgrading) {
       return;
@@ -112,6 +113,13 @@ export const CompName = (props: Iprops) => {
 
 
   if (compInfo.isRemote) {
+    items.push({
+      text: trans("history.currentVersion") + ": " + compInfo.packageVersion,
+      onClick: () => {
+
+      },
+    });
+
     items.push({
       text: trans("comp.menuUpgradeToLatest"),
       onClick: () => {

client/packages/lowcoder/src/comps/comps/autoCompleteComp/autoCompleteComp.tsx

@@ -5,6 +5,7 @@ import { styleControl } from "comps/controls/styleControl";
 import {
   InputLikeStyle,
   InputLikeStyleType,
+  LabelStyle,
 } from "comps/controls/styleControlConstants";
 import {
   NameConfig,
@@ -73,6 +74,7 @@ const childrenMap = {
   viewRef: RefControl<InputRef>,
   allowClear: BoolControl.DEFAULT_TRUE,
   style: styleControl(InputLikeStyle),
+  labelStyle:styleControl(LabelStyle),
   prefixIcon: IconControl,
   suffixIcon: IconControl,
   items: jsonControl(convertAutoCompleteData, autoCompleteDate),
@@ -276,8 +278,9 @@ let AutoCompleteCompBase = (function () {
           </ConfigProvider>
         </>
       ),
-      // style: props.style,
-      // ...validateState,
+      style: props.style,
+      labelStyle:props.labelStyle,
+      ...validateState,
     });
   })
     .setPropertyViewFn((children) => {
@@ -335,6 +338,9 @@ let AutoCompleteCompBase = (function () {
           <Section name={sectionNames.style}>
             {children.style.getPropertyView()}
           </Section>
+          <Section name={sectionNames.labelStyle}>
+            {children.labelStyle.getPropertyView()}
+          </Section>
         </>
       );
     })

client/packages/lowcoder/src/comps/comps/containerComp/textContainerComp.tsx

@@ -0,0 +1,164 @@
+import { BoolCodeControl, StringControl } from "comps/controls/codeControl";
+import { stringExposingStateControl } from "comps/controls/codeStateControl";
+import { ToDataType } from "comps/generators/multi";
+import {
+  NameConfigHidden,
+  withExposingConfigs,
+} from "comps/generators/withExposing";
+import { NameGenerator } from "comps/utils/nameGenerator";
+import { hiddenPropertyView } from "comps/utils/propertyUtils";
+import { trans } from "i18n";
+import { CompParams } from "lowcoder-core";
+import { Section, sectionNames } from "lowcoder-design";
+import { oldContainerParamsToNew } from "../containerBase";
+import { toSimpleContainerData } from "../containerBase/simpleContainerComp";
+import {
+  ContainerChildren,
+  ContainerCompBuilder,
+} from "../triContainerComp/triContainerCompBuilder";
+import { TriContainer } from "../triContainerComp/triFloatTextContainer";
+import { dropdownControl } from "comps/controls/dropdownControl";
+import { withDefault } from "@lowcoder-ee/index.sdk";
+
+const typeOptions = [
+  {
+    label: "Markdown",
+    value: "markdown",
+  },
+  {
+    label: trans("text"),
+    value: "text",
+  },
+] as const;
+
+const floatOptions = [
+  {
+    label: "None",
+    value: "none",
+  },
+  {
+    label: "Right",
+    value: "right",
+  },
+  {
+    label: "Left",
+    value: "left",
+  },
+] as const;
+
+export const ContainerBaseComp = (function () {
+  const childrenMap = {
+    disabled: BoolCodeControl,
+    text: stringExposingStateControl(
+      "text",
+      trans("textShow.text", { name: "{{currentUser.name}}" })
+    ),
+    type: dropdownControl(typeOptions, "markdown"),
+    float: dropdownControl(floatOptions, "none"),
+    width: withDefault(StringControl, "60"),
+  };
+  return new ContainerCompBuilder(childrenMap, (props, dispatch) => {
+    return <TriContainer {...props} />;
+  })
+    .setPropertyViewFn((children) => {
+      return (
+        <>
+          <Section name={sectionNames.basic}>
+            {children.type.propertyView({
+              label: trans("value"),
+              tooltip: trans("textShow.valueTooltip"),
+              radioButton: true,
+            })}
+            {children.text.propertyView({})}
+            {children.width.propertyView({
+              label: trans("container.flowWidth"),
+            })}
+          </Section>
+          <Section name={sectionNames.layout}>
+            {children.container.getPropertyView()}
+            {children.float.propertyView({
+              label: trans("container.floatType"),
+              tooltip: trans("textShow.valueTooltip"),
+              radioButton: true,
+            })}
+
+            {hiddenPropertyView(children)}
+          </Section>
+          <Section name={sectionNames.style}>
+            {children.container.stylePropertyView()}
+          </Section>
+        </>
+      );
+    })
+    .build();
+})();
+
+// Compatible with old data
+function convertOldContainerParams(params: CompParams<any>) {
+  // convert older params to old params
+  let tempParams = oldContainerParamsToNew(params);
+
+  if (tempParams.value) {
+    const container = tempParams.value.container;
+    // old params
+    if (
+      container &&
+      (container.hasOwnProperty("layout") || container.hasOwnProperty("items"))
+    ) {
+      const autoHeight = tempParams.value.autoHeight;
+      return {
+        ...tempParams,
+        value: {
+          container: {
+            showHeader: false,
+            body: { 0: { view: container } },
+            showBody: true,
+            showFooter: false,
+            autoHeight: autoHeight,
+          },
+        },
+      };
+    }
+  }
+  return tempParams;
+}
+
+class ContainerTmpComp extends ContainerBaseComp {
+  constructor(params: CompParams<any>) {
+    super(convertOldContainerParams(params));
+  }
+}
+
+export const ContainerComp = withExposingConfigs(ContainerTmpComp, [
+  NameConfigHidden,
+]);
+
+type ContainerDataType = ToDataType<ContainerChildren<{}>>;
+
+export function defaultContainerData(
+  compName: string,
+  nameGenerator: NameGenerator
+): ContainerDataType {
+  return {
+    container: {
+      header: toSimpleContainerData([
+        {
+          item: {
+            compType: "text",
+            name: nameGenerator.genItemName("containerTitle"),
+            comp: {
+              text: "### " + trans("container.title"),
+            },
+          },
+          layoutItem: {
+            i: "",
+            h: 5,
+            w: 24,
+            x: 0,
+            y: 0,
+          },
+        },
+      ]),
+    },
+  };
+}