Merge branch 'dev' into actions_js_console

kamalqureshi · kamalqureshi · commit fe41be828a60 · 2025-07-14T11:12:08.000+05:00
diff --git a/client/packages/lowcoder-design/src/components/customSelect.tsx b/client/packages/lowcoder-design/src/components/customSelect.tsx
@@ -20,7 +20,8 @@ const SelectWrapper = styled.div<{ $border?: boolean }>`
     padding: ${(props) => (props.$border ? "0px" : "0 0 0 12px")};
     height: 100%;
     align-items: center;
-    margin-right: 8px;
+    margin-right: 10px;
+    padding-right: 5px;
     background-color: #fff;
 
     .ant-select-selection-item {
@@ -46,9 +47,9 @@ const SelectWrapper = styled.div<{ $border?: boolean }>`
   }
 
   .ant-select-arrow {
-    width: 20px;
-    height: 20px;
-    right: 8px;
+    width: 17px;
+    height: 17px;
+    right: 10px;
     top: 0;
     bottom: 0;
     margin: auto;
diff --git a/client/packages/lowcoder/src/api/userApi.ts b/client/packages/lowcoder/src/api/userApi.ts
@@ -63,10 +63,13 @@ export type GetCurrentUserResponse = GenericApiResponse<CurrentUser>;
 export interface GetMyOrgsResponse extends ApiResponse {
   data: {
     data: Array<{
-      orgId: string;
-      orgName: string;
-      createdAt?: number;
-      updatedAt?: number;
+      isCurrentOrg: boolean;
+      orgView: {
+        orgId: string;
+        orgName: string;
+        createdAt?: number;
+        updatedAt?: number;
+      };
     }>;
     pageNum: number;
     pageSize: number;
diff --git a/client/packages/lowcoder/src/components/PermissionDialog/Permission.tsx b/client/packages/lowcoder/src/components/PermissionDialog/Permission.tsx
@@ -274,7 +274,7 @@ function PermissionTagRender(props: CustomTagProps) {
       color={value}
       closable={closable}
       onClose={onClose}
-      style={{ marginRight: 3 }}
+      style={{ marginRight: 3, display: "flex", alignItems: "center" }}
     >
       {label}
     </StyledTag>
diff --git a/client/packages/lowcoder/src/comps/comps/selectInputComp/selectInputConstants.tsx b/client/packages/lowcoder/src/comps/comps/selectInputComp/selectInputConstants.tsx
@@ -128,7 +128,8 @@ export const SelectInputValidationSection = (children: ValidationComp) => (
       label: trans("prop.showEmptyValidation"),
     })}
     {children.allowCustomTags.propertyView({
-      label: trans("prop.customTags") 
+      label: trans("prop.customTags"),
+      tooltip: trans("prop.customTagsTooltip")
     })}
     {children.customRule.propertyView({})}
   </Section>
diff --git a/client/packages/lowcoder/src/comps/comps/textInputComp/textInputConstants.tsx b/client/packages/lowcoder/src/comps/comps/textInputComp/textInputConstants.tsx
@@ -179,15 +179,10 @@ export const useTextInputProps = (props: RecordConstructorToView<typeof textInpu
   const inputValue = { ...props.value }.value;
 
   useEffect(() => {
+    setLocalInputValue(defaultValue);
     props.value.onChange(defaultValue)
   }, [defaultValue]);
 
-  useEffect(() => {
-    if (inputValue !== localInputValue) {
-      setLocalInputValue(inputValue);
-    }
-  }, [inputValue]);
-
   useEffect(() => {
     if (!changeRef.current) return;
 
@@ -220,8 +215,7 @@ export const useTextInputProps = (props: RecordConstructorToView<typeof textInpu
       propsRef.current.value.onChange(value);
       propsRef.current.onEvent("change");
     }, 1000)
-  );
-  
+  );  
 
   const handleChange = (e: ChangeEvent<HTMLInputElement>) => {
     const value = e.target.value;
diff --git a/client/packages/lowcoder/src/comps/comps/timerComp.tsx b/client/packages/lowcoder/src/comps/comps/timerComp.tsx
@@ -299,6 +299,42 @@ let TimerCompBasic = (function () {
           comp.children.actionHandler.dispatch(comp.children.actionHandler.changeValueAction('reset'))
         },
       },
+      {
+        method: {
+          name: "start",
+          description: trans("timer.start"),
+          params: [],
+        },
+        execute: async (comp, params) => {
+          if (comp.children.timerState.value === 'stoped') {
+            comp.children.actionHandler.dispatch(comp.children.actionHandler.changeValueAction('start'))
+          }
+        },
+      },
+      {
+        method: {
+          name: "pause",
+          description: trans("timer.pause"),
+          params: [],
+        },
+        execute: async (comp, params) => {
+          if (comp.children.timerState.value === 'started') {
+            comp.children.actionHandler.dispatch(comp.children.actionHandler.changeValueAction('pause'))
+          }
+        },
+      },
+      {
+        method: {
+          name: "resume",
+          description: trans("timer.resume"),
+          params: [],
+        },
+        execute: async (comp, params) => {
+          if (comp.children.timerState.value === 'paused') {
+            comp.children.actionHandler.dispatch(comp.children.actionHandler.changeValueAction('resume'))
+          }
+        }
+      }
     ])
     .build();
 })();
diff --git a/client/packages/lowcoder/src/constants/orgConstants.ts b/client/packages/lowcoder/src/constants/orgConstants.ts
@@ -56,6 +56,7 @@ export type Org = {
   createTime?: string;
   createdAt?: number;
   updatedAt?: number;
+  isCurrentOrg?: boolean;
 };
 
 export type OrgAndRole = {
diff --git a/client/packages/lowcoder/src/i18n/locales/en.ts b/client/packages/lowcoder/src/i18n/locales/en.ts
@@ -235,7 +235,8 @@ export const en = {
     "verticalGridCells": "Vertical Grid Cells",
     "timeZone": "TimeZone",
     "pickerMode": "Picker Mode",
-    "customTags": "Custom Tags"
+    "customTags": "Allow Custom Tags",
+    "customTagsTooltip": "Allow users to enter custom tags that are not in the options list."
   },
   "autoHeightProp": {
     "auto": "Auto",
diff --git a/client/packages/lowcoder/src/pages/common/WorkspaceSection.tsx b/client/packages/lowcoder/src/pages/common/WorkspaceSection.tsx
@@ -242,11 +242,11 @@ export default function WorkspaceSectionComponent({
           displayWorkspaces.map((org: Org) => (
             <WorkspaceItem
               key={org.id}
-              $isActive={user.currentOrgId === org.id}
+              $isActive={org.isCurrentOrg}
               onClick={() => handleOrgSwitch(org.id)}
             >
               <WorkspaceName title={org.name}>{org.name}</WorkspaceName>
-              {user.currentOrgId === org.id && <ActiveIcon />}
+              {org.isCurrentOrg && <ActiveIcon />}
             </WorkspaceItem>
           ))
         ) : (
diff --git a/client/packages/lowcoder/src/pages/setting/organization/orgList.tsx b/client/packages/lowcoder/src/pages/setting/organization/orgList.tsx
@@ -211,6 +211,7 @@ function OrganizationSetting() {
     logoUrl: org.logoUrl || "",
     createdAt: org.createdAt,
     updatedAt: org.updatedAt,
+    isCurrentOrg: org.isCurrentOrg,
   }));
 
 
@@ -262,7 +263,7 @@ function OrganizationSetting() {
                   dataIndex: "orgName",
                   ellipsis: true,
                   render: (_, record: any) => {
-                    const isActiveOrg = record.id === user.currentOrgId;
+                    const isActiveOrg = record.isCurrentOrg;
                     return (
                       <OrgName>
                         <StyledOrgLogo source={record.logoUrl} orgName={record.orgName} />
@@ -307,7 +308,7 @@ function OrganizationSetting() {
                 key: i,
                 operation: (
                   <OperationWrapper>
-                    {item.id !== user.currentOrgId && (
+                    {!item.isCurrentOrg && (
                       <SwitchBtn
                         className={"home-datasource-edit-button"}
                         buttonType={"blue"}
diff --git a/client/packages/lowcoder/src/redux/reducers/uiReducers/usersReducer.ts b/client/packages/lowcoder/src/redux/reducers/uiReducers/usersReducer.ts
@@ -25,6 +25,8 @@ const initialState: UsersReduxState = {
   workspaces: {
     items: [],
     totalCount: 0,
+    currentOrg: null
+    
   }
 };
 
@@ -231,6 +233,7 @@ export interface UsersReduxState {
   workspaces: {
     items: Org[];           // Current page of workspaces
     totalCount: number;     // Total workspaces available
+    currentOrg: Org | null;
   };
 }
 
diff --git a/client/packages/lowcoder/src/redux/sagas/orgSagas.ts b/client/packages/lowcoder/src/redux/sagas/orgSagas.ts
@@ -368,10 +368,11 @@ export function* fetchWorkspacesSaga(action: ReduxAction<{page: number, pageSize
       
       // Transform orgId/orgName to match Org interface
       const transformedItems = apiData.data.map(item => ({
-        id: item.orgId,
-        name: item.orgName,
-        createdAt: item.createdAt,
-        updatedAt: item.updatedAt,
+        id: item.orgView.orgId,
+        name: item.orgView.orgName,
+        createdAt: item.orgView.createdAt,
+        updatedAt: item.orgView.updatedAt,
+        isCurrentOrg: item.isCurrentOrg,
       }));
         
       yield put({
diff --git a/client/packages/lowcoder/src/util/useWorkspaceManager.ts b/client/packages/lowcoder/src/util/useWorkspaceManager.ts
@@ -91,10 +91,11 @@ export function useWorkspaceManager({
         if (response.data.success) {
           const apiData = response.data.data;
           const transformedItems = apiData.data.map(item => ({
-            id: item.orgId,
-            name: item.orgName,
-            createdAt: item.createdAt,
-            updatedAt: item.updatedAt,
+            id: item.orgView.orgId,
+            name: item.orgView.orgName,
+            createdAt: item.orgView.createdAt,
+            updatedAt: item.orgView.updatedAt,
+            isCurrentOrg: item.isCurrentOrg,
           }));
 
           dispatch({
diff --git a/server/api-service/lowcoder-server/src/test/java/org/lowcoder/api/application/ApplicationHistorySnapshotEndpointsIntegrationTest.java b/server/api-service/lowcoder-server/src/test/java/org/lowcoder/api/application/ApplicationHistorySnapshotEndpointsIntegrationTest.java
diff --git a/server/api-service/lowcoder-server/src/test/java/org/lowcoder/api/application/ApplicationHistorySnapshotEndpointsTest.java b/server/api-service/lowcoder-server/src/test/java/org/lowcoder/api/application/ApplicationHistorySnapshotEndpointsTest.java

Original file line number	Diff line number	Diff line change
`@@ -274,7 +274,7 @@ function PermissionTagRender(props: CustomTagProps) {`
`274`	`274`	`color={value}`
`275`	`275`	`closable={closable}`
`276`	`276`	`onClose={onClose}`
`277`		`- style={{ marginRight: 3 }}`
	`277`	`+ style={{ marginRight: 3, display: "flex", alignItems: "center" }}`
`278`	`278`	`>`
`279`	`279`	`{label}`
`280`	`280`	`</StyledTag>`