@coding-flow/flow-design 0.0.11 → 0.0.13

package/dist/components/design-editor/components/branch-adder/index.js

@@ -17,7 +17,9 @@ const BranchAdderRender = (props)=>{
     const presenter = context.getPresenter();
     const handleAddBranch = ()=>{
         presenter.createNode(node.id, props.addType).then((block)=>{
-            operation.addBlock(node, block);
+            operation.addBlock(node, block, {
+                index: block.data.order - 1
+            });
             setTimeout(()=>{
                 handleClose();
             }, 10);

package/dist/components/design-editor/components/node-icon/index.js

@@ -21,6 +21,9 @@ const NodeIcon = (props)=>{
     if ('CONDITION_BRANCH' === icon) return /*#__PURE__*/ jsx(BranchesOutlined, {
         style: style
     });
+    if ('CONDITION_ELSE_BRANCH' === icon) return /*#__PURE__*/ jsx(BranchesOutlined, {
+        style: style
+    });
     if ('DELAY' === icon) return /*#__PURE__*/ jsx(ClockCircleOutlined, {
         style: style
     });
@@ -42,6 +45,9 @@ const NodeIcon = (props)=>{
     if ('INCLUSIVE_BRANCH' === icon) return /*#__PURE__*/ jsx(MergeOutlined, {
         style: style
     });
+    if ('INCLUSIVE_ELSE_BRANCH' === icon) return /*#__PURE__*/ jsx(MergeOutlined, {
+        style: style
+    });
     if ('NOTIFY' === icon) return /*#__PURE__*/ jsx(BellOutlined, {
         style: style
     });

package/dist/components/design-editor/nodes/condition-else-branch/form-meta.d.ts

@@ -0,0 +1,4 @@
+import { FormMeta, FormRenderProps } from '@flowgram.ai/fixed-layout-editor';
+import { FlowNodeJSON } from '../../typings';
+export declare const renderForm: (data: FormRenderProps<FlowNodeJSON["data"]>) => import("react/jsx-runtime").JSX.Element;
+export declare const formMeta: FormMeta<FlowNodeJSON['data']>;

package/dist/components/design-editor/nodes/condition-else-branch/form-meta.js

@@ -0,0 +1,37 @@
+import { jsx, jsxs } from "react/jsx-runtime";
+import { provideJsonSchemaOutputs, syncVariableTitle } from "@flowgram.ai/form-materials";
+import { ValidateTrigger } from "@flowgram.ai/fixed-layout-editor";
+import { NodePanel } from "../../node-components/panel/index.js";
+import "react";
+import { NodeIcon } from "../../components/node-icon/index.js";
+import { Space } from "antd";
+const renderForm = (data)=>/*#__PURE__*/ jsx(NodePanel, {
+        data: data,
+        children: /*#__PURE__*/ jsxs(Space, {
+            style: {
+                width: 100,
+                textAlign: 'center',
+                padding: 5
+            },
+            children: [
+                /*#__PURE__*/ jsx(NodeIcon, {
+                    type: "CONDITION_ELSE_BRANCH"
+                }),
+                /*#__PURE__*/ jsx("span", {
+                    children: "其他情况"
+                })
+            ]
+        })
+    });
+const formMeta = {
+    render: renderForm,
+    validateTrigger: ValidateTrigger.onChange,
+    validate: {
+        title: ({ value })=>value ? void 0 : 'Title is required'
+    },
+    effect: {
+        title: syncVariableTitle,
+        outputs: provideJsonSchemaOutputs
+    }
+};
+export { formMeta, renderForm };

package/dist/components/design-editor/nodes/condition-else-branch/index.d.ts

@@ -0,0 +1,2 @@
+import { FlowNodeRegistry } from '../../typings';
+export declare const ConditionElseBranchNodeRegistry: FlowNodeRegistry;

package/dist/components/design-editor/nodes/condition-else-branch/index.js

@@ -0,0 +1,31 @@
+import { formMeta } from "./form-meta.js";
+import { nanoid } from "nanoid";
+const ConditionElseBranchNodeRegistry = {
+    type: 'CONDITION_ELSE_BRANCH',
+    extend: 'block',
+    meta: {
+        copyDisable: true,
+        addDisable: true,
+        deleteDisable: true,
+        sidebarDisable: true,
+        style: {
+            width: '100%'
+        }
+    },
+    info: {
+        icon: 'CONDITION_ELSE_BRANCH',
+        description: '分支else节点'
+    },
+    formMeta: formMeta,
+    onAdd (ctx, from) {
+        return {
+            id: `condition_branch_${nanoid(5)}`,
+            type: 'CONDITION_ELSE_BRANCH',
+            data: {
+                title: "条件else分支节点",
+                value: 'branch Value'
+            }
+        };
+    }
+};
+export { ConditionElseBranchNodeRegistry };

package/dist/components/design-editor/nodes/inclusive-else-branch/form-meta.d.ts

@@ -0,0 +1,4 @@
+import { FormMeta, FormRenderProps } from '@flowgram.ai/fixed-layout-editor';
+import { FlowNodeJSON } from '../../typings';
+export declare const renderForm: (data: FormRenderProps<FlowNodeJSON["data"]>) => import("react/jsx-runtime").JSX.Element;
+export declare const formMeta: FormMeta<FlowNodeJSON['data']>;

package/dist/components/design-editor/nodes/inclusive-else-branch/form-meta.js

@@ -0,0 +1,37 @@
+import { jsx, jsxs } from "react/jsx-runtime";
+import { provideJsonSchemaOutputs, syncVariableTitle } from "@flowgram.ai/form-materials";
+import { ValidateTrigger } from "@flowgram.ai/fixed-layout-editor";
+import { NodePanel } from "../../node-components/panel/index.js";
+import "react";
+import { NodeIcon } from "../../components/node-icon/index.js";
+import { Space } from "antd";
+const renderForm = (data)=>/*#__PURE__*/ jsx(NodePanel, {
+        data: data,
+        children: /*#__PURE__*/ jsxs(Space, {
+            style: {
+                width: 100,
+                textAlign: 'center',
+                padding: 5
+            },
+            children: [
+                /*#__PURE__*/ jsx(NodeIcon, {
+                    type: "INCLUSIVE_ELSE_BRANCH"
+                }),
+                /*#__PURE__*/ jsx("span", {
+                    children: "其他情况"
+                })
+            ]
+        })
+    });
+const formMeta = {
+    render: renderForm,
+    validateTrigger: ValidateTrigger.onChange,
+    validate: {
+        title: ({ value })=>value ? void 0 : 'Title is required'
+    },
+    effect: {
+        title: syncVariableTitle,
+        outputs: provideJsonSchemaOutputs
+    }
+};
+export { formMeta, renderForm };

package/dist/components/design-editor/nodes/inclusive-else-branch/index.d.ts

@@ -0,0 +1,2 @@
+import { FlowNodeRegistry } from '../../typings';
+export declare const InclusiveElseBranchNodeRegistry: FlowNodeRegistry;

package/dist/components/design-editor/nodes/inclusive-else-branch/index.js

@@ -0,0 +1,20 @@
+import { formMeta } from "./form-meta.js";
+const InclusiveElseBranchNodeRegistry = {
+    type: 'INCLUSIVE_ELSE_BRANCH',
+    extend: 'block',
+    meta: {
+        copyDisable: true,
+        addDisable: true,
+        sidebarDisable: true,
+        deleteDisable: true,
+        style: {
+            width: '100%'
+        }
+    },
+    info: {
+        icon: 'INCLUSIVE_ELSE_BRANCH',
+        description: '包容else分支'
+    },
+    formMeta: formMeta
+};
+export { InclusiveElseBranchNodeRegistry };

package/dist/components/design-editor/nodes/index.js

@@ -15,15 +15,19 @@ import { SubProcessNodeRegistry } from "./sub-process/index.js";
 import { TriggerNodeRegistry } from "./trigger/index.js";
 import { ManualNodeRegistry } from "./manual/index.js";
 import { ManualBranchNodeRegistry } from "./manual-branch/index.js";
+import { ConditionElseBranchNodeRegistry } from "./condition-else-branch/index.js";
+import { InclusiveElseBranchNodeRegistry } from "./inclusive-else-branch/index.js";
 const FlowNodeRegistries = [
     ApprovalNodeRegistry,
     ConditionNodeRegistry,
     ConditionBranchNodeRegistry,
+    ConditionElseBranchNodeRegistry,
     DelayNodeRegistry,
     EndNodeRegistry,
     HandleNodeRegistry,
     InclusiveNodeRegistry,
     InclusiveBranchNodeRegistry,
+    InclusiveElseBranchNodeRegistry,
     ManualNodeRegistry,
     ManualBranchNodeRegistry,
     NotifyNodeRegistry,

package/dist/components/design-panel/presenters/index.js

@@ -120,7 +120,7 @@ class Presenter {
         const block = nodeManager.toItemRender(flowNode);
         if (currentNode) {
             if (currentNode.blocks) {
-                const order = currentNode.blocks.length + 1;
+                const order = currentNode.blocks.length;
                 return {
                     ...block,
                     data: {

package/dist/script-components/components/condition/components/condition-group/condition.d.ts

@@ -4,6 +4,7 @@ interface ConditionItemViewProps {
     data?: Condition;
     id: string;
     location: 'left' | 'right';
+    disabled?: boolean;
 }
 export declare const ConditionItemView: React.FC<ConditionItemViewProps>;
 export {};

package/dist/script-components/components/condition/components/condition-group/condition.js

@@ -32,6 +32,7 @@ const VariableSelect = (props)=>{
         });
     };
     return /*#__PURE__*/ jsx(Select, {
+        disabled: props.disabled,
         showSearch: {
             filterOption: (value, option)=>{
                 if (option.value) return option.value.includes(value) || option.label.includes(value);
@@ -57,6 +58,7 @@ const TypeInput = (props)=>{
         });
     };
     return /*#__PURE__*/ jsx(Input, {
+        disabled: props.disabled,
         style: {
             width: "200px"
         },
@@ -90,6 +92,7 @@ const ConditionItemView = (props)=>{
                     width: "100px"
                 },
                 value: type,
+                disabled: props.disabled,
                 options: [
                     {
                         label: '选择变量',
@@ -105,12 +108,14 @@ const ConditionItemView = (props)=>{
                 }
             }),
             "variable" === type && /*#__PURE__*/ jsx(VariableSelect, {
+                disabled: props.disabled,
                 value: props.data?.value || '',
                 onChange: (value)=>{
                     handleUpdate(value);
                 }
             }),
             "input" === type && /*#__PURE__*/ jsx(TypeInput, {
+                disabled: props.disabled,
                 value: props.data?.value || '',
                 onChange: (value)=>{
                     handleUpdate(value);

package/dist/script-components/components/condition/components/condition-group/group.js

@@ -55,18 +55,29 @@ const Group = ()=>{
                     key: 'right',
                     title: '右侧参数',
                     dataIndex: 'right',
-                    render: (_, record)=>/*#__PURE__*/ jsx(ConditionItemView, {
+                    render: (_, record)=>{
+                        if (false !== record.right) return /*#__PURE__*/ jsx(ConditionItemView, {
                             id: record.id,
                             location: 'right',
                             data: record.right
-                        })
+                        });
+                        return /*#__PURE__*/ jsx("div", {
+                            style: {
+                                width: "100px"
+                            },
+                            children: "无"
+                        });
+                    }
                 },
                 {
                     key: 'option',
                     title: '操作',
                     render: (text, record)=>/*#__PURE__*/ jsxs(Space, {
+                            style: {
+                                width: '100px'
+                            },
                             children: [
-                                /*#__PURE__*/ jsx("a", {
+                                'is_null' != record.type && /*#__PURE__*/ jsx("a", {
                                     onClick: ()=>{
                                         presenter.switchCondition(record.id);
                                     },

package/dist/script-components/components/condition/components/condition-group/type.js

@@ -8,7 +8,8 @@ const ConditionTypeView = (props)=>{
     const { context } = useConditionContext();
     const presenter = context.getPresenter().getConditionGroupPresenter();
     const handleChangeType = (value)=>{
-        presenter.updateType(props.id, value);
+        const relationType = value;
+        presenter.updateType(props.id, relationType);
     };
     return /*#__PURE__*/ jsx(Select, {
         placeholder: "请选择关系",

package/dist/script-components/components/condition/convertor/groovy.js

@@ -43,8 +43,9 @@ class ConditionReturnConvertor {
         if (conditionGroup.left) {
             if ('variable' === conditionGroup.left.type) return conditionGroup.left.dataType;
         }
-        if (conditionGroup.right) {
-            if ('variable' === conditionGroup.right.type) return conditionGroup.right.dataType;
+        if (false !== conditionGroup.right && conditionGroup.right) {
+            const right = conditionGroup.right;
+            if ('variable' === right.type) return right.dataType;
         }
         return 'STRING';
     }
@@ -70,11 +71,24 @@ class ConditionReturnConvertor {
             const left = conditionGroup.left;
             const right = conditionGroup.right;
             const type = conditionGroup.type;
-            if (left && right && type) {
-                const leftExpression = this.getConditionExpression(left, dataType);
-                const rightExpression = this.getConditionExpression(right, dataType);
-                const typeExpression = this.getConditionTypeExpression(type);
-                return leftExpression + typeExpression + rightExpression;
+            if (type) {
+                if ('is_null' === type) {
+                    if (left) {
+                        const leftExpression = this.getConditionExpression(left, dataType);
+                        if ('STRING' === dataType) return `(${leftExpression} == '' ||  ${leftExpression} == null)`;
+                        if ('LONG' === dataType) return `${leftExpression} == 0`;
+                        if ('INTEGER' === dataType) return `${leftExpression} == 0`;
+                        if ('DOUBLE' === dataType) return `${leftExpression} == 0`;
+                        if ('BOOLEAN' === dataType) return `${leftExpression} == false`;
+                        return `${leftExpression} == null`;
+                    }
+                }
+                if (left && right && type) {
+                    const leftExpression = this.getConditionExpression(left, dataType);
+                    const rightExpression = this.getConditionExpression(right, dataType);
+                    const typeExpression = this.getConditionTypeExpression(type);
+                    return leftExpression + typeExpression + rightExpression;
+                }
             }
         }
         return '';

package/dist/script-components/components/condition/convertor/group.js

@@ -8,9 +8,17 @@ class GroupConvertor {
         const left = this.group.left;
         const right = this.group.right;
         const type = this.group.type;
-        if (left && right && type) {
-            const relation = relationTypeOptions.find((relationTypeOption)=>relationTypeOption.value === type);
-            return `${left.label} ${relation?.label} ${right.label}`;
+        if (type) {
+            if ('is_null' === type) {
+                if (left) {
+                    const relation = relationTypeOptions.find((relationTypeOption)=>relationTypeOption.value === type);
+                    return `${left.label} ${relation?.label}`;
+                }
+            }
+            if (left && right && type) {
+                const relation = relationTypeOptions.find((relationTypeOption)=>relationTypeOption.value === type);
+                return `${left.label} ${relation?.label} ${right.label}`;
+            }
         }
         return '未知';
     }

package/dist/script-components/components/condition/presenters/group-presenter.js

@@ -22,10 +22,25 @@ class ConditionGroupPresenter {
     updateType(id, type) {
         this.presenter.updateState((prevState)=>{
             const groups = prevState.groups.map((group)=>{
-                if (group.id === id) return {
-                    ...group,
-                    type: type
-                };
+                if (group.id === id) {
+                    if ('is_null' === type) return {
+                        ...group,
+                        type: type,
+                        right: false
+                    };
+                    if (group.right) return {
+                        ...group,
+                        type: type
+                    };
+                    {
+                        const data = {
+                            ...group,
+                            type: type
+                        };
+                        delete data.right;
+                        return data;
+                    }
+                }
                 return group;
             });
             return {

package/dist/script-components/components/condition/typings/index.d.ts

@@ -3,7 +3,7 @@ import { GroovyVariableMapping } from "../../../typings";
 /**
  *  条件类型
  */
-export type RelationType = 'equal' | 'greater_than' | 'greater_equal' | 'less_than' | 'less_equal' | 'not_equal' | 'unknow';
+export type RelationType = 'equal' | 'greater_than' | 'greater_equal' | 'less_than' | 'less_equal' | 'not_equal' | 'is_null' | 'unknow';
 /**
  *  逻辑关系
  */
@@ -74,6 +74,6 @@ export interface Condition {
 export interface ConditionGroup {
     id: string;
     left?: Condition;
-    right?: Condition;
+    right?: Condition | boolean;
     type?: RelationType;
 }

package/dist/script-components/components/condition/typings/index.js

@@ -27,6 +27,10 @@ const relationTypeOptions = [
     {
         label: '不等于',
         value: 'not_equal'
+    },
+    {
+        label: '为空',
+        value: 'is_null'
     }
 ];
 export { initStateData, relationTypeOptions };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@coding-flow/flow-design",
-  "version": "0.0.11",
+  "version": "0.0.13",
   "description": "flow-engine design components ",
   "type": "module",
   "keywords": [
@@ -54,16 +54,16 @@
     "nanoid": "^5.1.6",
     "react-redux": "^9.2.0",
     "styled-components": "^5.3.11",
-    "@coding-flow/flow-core": "0.0.11",
-    "@coding-flow/flow-types": "0.0.11",
-    "@coding-flow/flow-icons": "0.0.11",
-    "@coding-flow/flow-pc-ui": "0.0.11"
+    "@coding-flow/flow-core": "0.0.13",
+    "@coding-flow/flow-types": "0.0.13",
+    "@coding-flow/flow-icons": "0.0.13",
+    "@coding-flow/flow-pc-ui": "0.0.13"
   },
   "devDependencies": {
     "@types/lodash-es": "^4.17.12",
     "@types/styled-components": "^5.1.36",
-    "@coding-flow/flow-core": "0.0.11",
-    "@coding-flow/flow-types": "0.0.11"
+    "@coding-flow/flow-types": "0.0.13",
+    "@coding-flow/flow-core": "0.0.13"
   },
   "scripts": {
     "build": "rslib build",