Merge pull request #632 from lowcoder-org/dev

Dev -> Main for 2.2.2

Author: FalkWolsky

.github/workflows/publish-lowcoder-cli.yml

@@ -9,6 +9,7 @@ on:
 
 jobs:
   publish-package:
+    if: ${{ github.repositoryUrl == 'git://github.com/lowcoder/lowcoder.git'}}
     runs-on: ubuntu-latest
     steps:
       - name: Checkout repository
@@ -19,7 +20,9 @@ jobs:
         id: check
         with:
           diff-search: true
+          static-checking: localIsNew
           file-name: client/packages/lowcoder-cli/package.json
+          file-url: https://unpkg.com/lowcoder-cli@latest/package.json
 
       - name: Version update detected
         if: steps.check.outputs.changed == 'true'

.github/workflows/publish-lowcoder-comps.yml

@@ -9,6 +9,7 @@ on:
 
 jobs:
   publish-package:
+    if: ${{ github.repositoryUrl == 'git://github.com/lowcoder/lowcoder.git'}}
     runs-on: ubuntu-latest
     steps:
       - name: Checkout repository
@@ -19,7 +20,9 @@ jobs:
         id: check
         with:
           diff-search: true
+          static-checking: localIsNew
           file-name: client/packages/lowcoder-comps/package.json
+          file-url: https://unpkg.com/lowcoder-comps@latest/package.json
 
       - name: Version update detected
         if: steps.check.outputs.changed == 'true'

.github/workflows/publish-lowcoder-core.yml

@@ -9,6 +9,7 @@ on:
 
 jobs:
   publish-package:
+    if: ${{ github.repositoryUrl == 'git://github.com/lowcoder/lowcoder.git'}}
     runs-on: ubuntu-latest
     steps:
       - name: Checkout repository
@@ -19,7 +20,9 @@ jobs:
         id: check
         with:
           diff-search: true
+          static-checking: localIsNew
           file-name: client/packages/lowcoder-core/package.json
+          file-url: https://unpkg.com/lowcoder-core@latest/package.json
 
       - name: Version update detected
         if: steps.check.outputs.changed == 'true'

.github/workflows/publish-lowcoder-sdk.yml

@@ -9,6 +9,7 @@ on:
 
 jobs:
   publish-package:
+    if: ${{ github.repositoryUrl == 'git://github.com/lowcoder/lowcoder.git'}}
     runs-on: ubuntu-latest
     steps:
       - name: Checkout repository
@@ -19,7 +20,9 @@ jobs:
         id: check
         with:
           diff-search: true
+          static-checking: localIsNew
           file-name: client/packages/lowcoder-sdk/package.json
+          file-url: https://unpkg.com/lowcoder-sdk@latest/package.json
 
       - name: Version update detected
         if: steps.check.outputs.changed == 'true'

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

@@ -35,6 +35,7 @@ export interface CellProps {
   candidateTags?: string[];
   candidateStatus?: { text: string; status: StatusType }[];
   textOverflow?: boolean;
+  onTableEvent?: (eventName: any) => void;
 }
 
 export type CellViewReturn = (props: CellProps) => ReactNode;
@@ -71,6 +72,7 @@ export function EditableCell<T extends JSONValue>(props: EditableCellProps<T>) {
     baseValue,
     candidateTags,
     candidateStatus,
+    onTableEvent,
   } = props;
   const status = _.isNil(changeValue) ? "normal" : "toSave";
   const editable = editViewFn ? props.editable : false;
@@ -96,6 +98,9 @@ export function EditableCell<T extends JSONValue>(props: EditableCellProps<T>) {
         false
       )
     );
+    if(!_.isEqual(tmpValue, value)) {
+      onTableEvent?.('columnEdited');
+    }
   }, [dispatch, baseValue, tmpValue]);
   const editView = useMemo(
     () => editViewFn?.({ value, onChange, onChangeEnd }) ?? <></>,

client/packages/lowcoder/src/comps/comps/tableComp/column/columnTypeComps/ColumnNumberComp.tsx

@@ -1,18 +1,40 @@
-  import { default as Input } from "antd/es/input";
-import { NumberControl, StringControl } from "comps/controls/codeControl";
+  import { default as InputNumber } from "antd/es/input-number";
+import { NumberControl, RangeControl, StringControl } from "comps/controls/codeControl";
 import { BoolControl } from "comps/controls/boolControl";
 import { trans } from "i18n";
 import { ColumnTypeCompBuilder, ColumnTypeViewFn } from "../columnTypeCompBuilder";
 import { ColumnValueTooltip } from "../simpleColumnTypeComps";
+import { withDefault } from "comps/generators";
+import styled from "styled-components";
+
+const InputNumberWrapper = styled.div`
+  .ant-input-number  {
+    width: 100%;
+    border-radius: 0;
+    background: transparent !important;
+    padding: 0 !important;
+    box-shadow: none;
+
+    input {
+      padding: 0;
+      border-radius: 0;
+    }
+  }
+`;
 
 const childrenMap = {
   text: NumberControl,
+  step: withDefault(NumberControl, 1),
+  precision: RangeControl.closed(0, 20, 0),
   float: BoolControl,
   prefix: StringControl,
   suffix: StringControl,
 };
 
 let float = false;
+let step = 1;
+let precision = 0;
+
 const getBaseValue: ColumnTypeViewFn<typeof childrenMap, number, number> = (
   props
 ) => {
@@ -24,26 +46,35 @@ export const ColumnNumberComp = (function () {
     childrenMap,
     (props, dispatch) => {
       float = props.float;
-      const value = !float ? Math.floor(props.changeValue ?? getBaseValue(props, dispatch)) : props.changeValue ?? getBaseValue(props, dispatch);
-      return props.prefix + value + props.suffix;
+      step = props.step;
+      precision = props.precision;
+      const value = props.changeValue ?? getBaseValue(props, dispatch);
+      let formattedValue: string | number = !float ? Math.floor(value) : value;
+      if(float) {
+        formattedValue = formattedValue.toPrecision(precision + 1);
+      }
+      return props.prefix + formattedValue + props.suffix;
     },
     (nodeValue) => nodeValue.text.value,
     getBaseValue,
   )
     .setEditViewFn((props) => {
       return (
-      <Input
-        type="number"
-        step={float?"0.01": "1"}
-        defaultValue={props.value}
-        autoFocus
-        bordered={false}
-        onChange={(e) => {
-          props.onChange(!float ? Math.floor(e.target.valueAsNumber) : e.target.valueAsNumber);
-        }}
-        onBlur={props.onChangeEnd}
-        onPressEnter={props.onChangeEnd}
-      />
+      <InputNumberWrapper>
+        <InputNumber
+          step={step}
+          defaultValue={props.value}
+          autoFocus
+          bordered={false}
+          onChange={(value) => {
+            value = value ?? 0;
+            props.onChange(!float ? Math.floor(value) : value);
+          }}
+          precision={float ? precision : 0}
+          onBlur={props.onChangeEnd}
+          onPressEnter={props.onChangeEnd}
+        />
+      </InputNumberWrapper>
     )})
     .setPropertyViewFn((children) => {
       return (
@@ -52,17 +83,36 @@ export const ColumnNumberComp = (function () {
             label: trans("table.columnValue"),
             tooltip: ColumnValueTooltip,
           })}
+          {children.step.propertyView({
+            label: trans("table.numberStep"),
+            tooltip: trans("table.numberStepTooltip"),
+            onFocus: (focused) => {
+              if(!focused) {
+                const value = children.step.getView();
+                const isFloat = children.float.getView();
+                const newValue = !isFloat ? Math.floor(value) : value;
+                children.step.dispatchChangeValueAction(String(newValue));
+              }
+            }
+          })}
+          {float && (
+            children.precision.propertyView({
+              label: trans("table.precision"),
+            })
+          )}
           {children.prefix.propertyView({
             label: trans("table.prefix"),
-            // tooltip: ColumnValueTooltip,
           })}
           {children.suffix.propertyView({
             label: trans("table.suffix"),
-            // tooltip: ColumnValueTooltip,
           })}
           {children.float.propertyView({
             label: trans("table.float"),
-            // tooltip: ColumnValueTooltip,
+            onChange: (isFloat) => {
+              const value = children.step.getView();
+              const newValue = !isFloat ? Math.floor(value) : value;
+              children.step.dispatchChangeValueAction(String(newValue));
+            }
           })}
         </>
       );

client/packages/lowcoder/src/comps/comps/tableComp/column/columnTypeComps/columnLinksComp.tsx

@@ -1,5 +1,3 @@
-import { EllipsisOutlined } from "@ant-design/icons";
-import { default as Dropdown} from "antd/es/dropdown";
 import { default as Menu } from "antd/es/menu";
 import { ColumnTypeCompBuilder } from "comps/comps/tableComp/column/columnTypeCompBuilder";
 import { ActionSelectorControlInContext } from "comps/controls/actionSelector/actionSelectorControl";
@@ -12,18 +10,6 @@ import styled from "styled-components";
 import { ColumnLink } from "comps/comps/tableComp/column/columnTypeComps/columnLinkComp";
 import { LightActiveTextColor, PrimaryColor } from "constants/style";
 
-const LinksWrapper = styled.div`
-  white-space: nowrap;
-
-  > a {
-    margin-right: 8px;
-  }
-
-  > a:last-child {
-    margin-right: 0;
-  }
-`;
-
 const MenuLinkWrapper = styled.div`
   > a {
     color: ${PrimaryColor} !important;
@@ -34,6 +20,22 @@ const MenuLinkWrapper = styled.div`
   }
 `;
 
+const MenuWrapper = styled.div`
+  ul {
+    background: transparent !important;
+    border-bottom: 0;
+
+    li {
+      padding: 0 10px 0 0 !important;
+      line-height: normal !important;
+
+      &::after {
+        content: none !important;
+      }
+    }
+  }  
+`;
+
 const OptionItem = new MultiCompBuilder(
   {
     label: StringControl,
@@ -69,48 +71,28 @@ export const ColumnLinksComp = (function () {
   return new ColumnTypeCompBuilder(
     childrenMap,
     (props) => {
-      const menu = props.options.length > 3 && (
-        <Menu>
-          {props.options
-            .filter((o) => !o.hidden)
-            .slice(3)
-            .map((option, index) => (
-              <Menu.Item key={index}>
-                <MenuLinkWrapper>
-                  <ColumnLink
-                    disabled={option.disabled}
-                    label={option.label}
-                    onClick={option.onClick}
-                  />
-                </MenuLinkWrapper>
-              </Menu.Item>
-            ))}
-        </Menu>
-      );
+      const menuItems = props.options
+        .filter((o) => !o.hidden)
+        .map((option, index) => (
+          {
+            key: index,
+            label: (
+              <MenuLinkWrapper>
+                <ColumnLink
+                  disabled={option.disabled}
+                  label={option.label}
+                  onClick={option.onClick}
+                />
+              </MenuLinkWrapper>
+            )
+          }
+        ));
 
       return (
-        <LinksWrapper>
-          {props.options
-            .filter((o) => !o.hidden)
-            .slice(0, 3)
-            .map((option, i) => (
-              <ColumnLink
-                key={i}
-                disabled={option.disabled}
-                label={option.label}
-                onClick={option.onClick}
-              />
-            ))}
-          {menu && (
-            <Dropdown
-              trigger={["hover"]}
-              dropdownRender={() => menu}
-            >
-              <EllipsisOutlined onClick={(e) => e.preventDefault()} />
-            </Dropdown>
-          )}
-        </LinksWrapper>
-      );
+        <MenuWrapper>
+          <Menu mode="horizontal" items={menuItems}  />
+        </MenuWrapper>
+      )
     },
     () => ""
   )