@nocobase/flow-engine 2.0.0-alpha.13 → 2.0.0-alpha.14

package/lib/components/FieldModelRenderer.js

@@ -65,7 +65,7 @@ function FieldModelRenderer(props) {
     let val;
     if (e && e.target && typeof e.target.value !== "undefined") {
       val = e.target.value;
-    } else if (typeof e === "string" || typeof e === "object" && !(e instanceof Event)) {
+    } else if (typeof e === "string" || typeof e === "number" || typeof e === "object" && !(e instanceof Event)) {
       val = e;
     } else {
       val = "";
@@ -89,7 +89,7 @@ function FieldModelRenderer(props) {
     onCompositionEnd: handleCompositionEnd
   };
   (0, import_react.useEffect)(() => {
-    model.setProps(modelProps);
+    model && model.setProps(modelProps);
   }, [modelProps]);
   return /* @__PURE__ */ import_react.default.createElement(import_flow_engine.FlowModelRenderer, { model, ...rest });
 }

package/lib/data-source/index.d.ts

@@ -49,7 +49,9 @@ export declare class DataSource {
     addCollection(collection: Collection | CollectionOptions): void;
     updateCollection(newOptions: CollectionOptions): void;
     upsertCollection(options: CollectionOptions): Collection;
-    upsertCollections(collections: CollectionOptions[]): void;
+    upsertCollections(collections: CollectionOptions[], options?: {
+        clearFields?: boolean;
+    }): void;
     removeCollection(name: string): void;
     clearCollections(): void;
     setOptions(newOptions?: any): void;
@@ -68,9 +70,13 @@ export declare class CollectionManager {
     get flowEngine(): FlowEngine;
     addCollection(collection: Collection | CollectionOptions): void;
     removeCollection(name: string): void;
-    updateCollection(newOptions: CollectionOptions): void;
+    updateCollection(newOptions: CollectionOptions, options?: {
+        clearFields?: boolean;
+    }): void;
     upsertCollection(options: CollectionOptions): Collection;
-    upsertCollections(collections: CollectionOptions[]): void;
+    upsertCollections(collections: CollectionOptions[], options?: {
+        clearFields?: boolean;
+    }): void;
     sortCollectionsByInherits(collections: CollectionOptions[]): CollectionOptions[];
     getCollection(name: string): Collection | undefined;
     getCollections(): Collection[];
@@ -97,7 +103,9 @@ export declare class Collection {
     get titleCollectionField(): CollectionField;
     initInherits(): void;
     setDataSource(dataSource: DataSource): void;
-    setOptions(newOptions?: any): void;
+    setOptions(newOptions?: any, options?: {
+        clearFields?: boolean;
+    }): void;
     getFields(): CollectionField[];
     getToOneAssociationFields(): CollectionField[];
     getAssociationFields(types?: any[]): CollectionField[];

package/lib/data-source/index.js

@@ -153,8 +153,8 @@ const _DataSource = class _DataSource {
   upsertCollection(options) {
     return this.collectionManager.upsertCollection(options);
   }
-  upsertCollections(collections) {
-    return this.collectionManager.upsertCollections(collections);
+  upsertCollections(collections, options = {}) {
+    return this.collectionManager.upsertCollections(collections, options);
   }
   removeCollection(name) {
     return this.collectionManager.removeCollection(name);
@@ -205,12 +205,12 @@ const _CollectionManager = class _CollectionManager {
   removeCollection(name) {
     this.collections.delete(name);
   }
-  updateCollection(newOptions) {
+  updateCollection(newOptions, options = {}) {
     const collection = this.getCollection(newOptions.name);
     if (!collection) {
       throw new Error(`Collection ${newOptions.name} not found`);
     }
-    collection.setOptions(newOptions);
+    collection.setOptions(newOptions, options);
   }
   upsertCollection(options) {
     if (this.collections.has(options.name)) {
@@ -220,10 +220,10 @@ const _CollectionManager = class _CollectionManager {
     }
     return this.getCollection(options.name);
   }
-  upsertCollections(collections) {
+  upsertCollections(collections, options = {}) {
     for (const collection of (0, import_sortCollectionsByInherits.sortCollectionsByInherits)(collections)) {
       if (this.collections.has(collection.name)) {
-        this.updateCollection(collection);
+        this.updateCollection(collection, options);
       } else {
         this.addCollection(collection);
       }
@@ -378,10 +378,13 @@ const _Collection = class _Collection {
   setDataSource(dataSource) {
     this.dataSource = dataSource;
   }
-  setOptions(newOptions = {}) {
+  setOptions(newOptions = {}, options = {}) {
     Object.keys(this.options).forEach((key) => delete this.options[key]);
     Object.assign(this.options, newOptions);
     this.initInherits();
+    if (options.clearFields) {
+      this.clearFields();
+    }
     this.upsertFields(this.options.fields || []);
   }
   getFields() {
@@ -446,7 +449,6 @@ const _Collection = class _Collection {
     return field.targetCollection.getFieldByPath(otherKeys.join("."));
   }
   getField(fieldName) {
-    this.setFields(this.options.fields);
     return this.fields.get(fieldName);
   }
   getFullFieldPath(name) {

package/lib/resources/multiRecordResource.js

@@ -130,6 +130,7 @@ const _MultiRecordResource = class _MultiRecordResource extends import_baseRecor
   async create(data, options) {
     const config = this.mergeRequestConfig({ data }, this.createActionOptions, options);
     await this.runAction("create", config);
+    this.emit("saved", data);
     await this.refresh();
   }
   async get(filterByTk) {
@@ -155,6 +156,7 @@ const _MultiRecordResource = class _MultiRecordResource extends import_baseRecor
       options
     );
     await this.runAction("update", config);
+    this.emit("saved", data);
     await this.refresh();
   }
   async destroySelectedRows() {

package/lib/resources/singleRecordResource.js

@@ -69,6 +69,7 @@ const _SingleRecordResource = class _SingleRecordResource extends import_baseRec
       ...config,
       data
     });
+    this.emit("saved", data);
     if ((options == null ? void 0 : options.refresh) !== false) {
       await this.refresh();
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/flow-engine",
-  "version": "2.0.0-alpha.13",
+  "version": "2.0.0-alpha.14",
   "private": false,
   "description": "A standalone flow engine for NocoBase, managing workflows, models, and actions.",
   "main": "lib/index.js",
@@ -33,5 +33,5 @@
   ],
   "author": "NocoBase Team",
   "license": "AGPL-3.0",
-  "gitHead": "b5b60c6ddb996b96bdc1e6d21604ef6585ae01e8"
+  "gitHead": "6b4785d03d0a551f1fe6815e9bcbc7a9f38901df"
 }

package/src/components/FieldModelRenderer.tsx

@@ -34,7 +34,7 @@ export function FieldModelRenderer(props: any) {
     let val;
     if (e && e.target && typeof e.target.value !== 'undefined') {
       val = e.target.value;
-    } else if (typeof e === 'string' || (typeof e === 'object' && !(e instanceof Event))) {
+    } else if (typeof e === 'string' || typeof e === 'number' || (typeof e === 'object' && !(e instanceof Event))) {
       val = e;
     } else {
       val = '';
@@ -61,7 +61,7 @@ export function FieldModelRenderer(props: any) {
     onCompositionEnd: handleCompositionEnd,
   };
   useEffect(() => {
-    model.setProps(modelProps);
+    model && model.setProps(modelProps);
   }, [modelProps]);
 
   return <FlowModelRenderer model={model} {...rest} />;

package/src/data-source/index.ts

@@ -144,8 +144,8 @@ export class DataSource {
     return this.collectionManager.upsertCollection(options);
   }
 
-  upsertCollections(collections: CollectionOptions[]) {
-    return this.collectionManager.upsertCollections(collections);
+  upsertCollections(collections: CollectionOptions[], options: { clearFields?: boolean } = {}) {
+    return this.collectionManager.upsertCollections(collections, options);
   }
 
   removeCollection(name: string) {
@@ -210,12 +210,12 @@ export class CollectionManager {
     this.collections.delete(name);
   }
 
-  updateCollection(newOptions: CollectionOptions) {
+  updateCollection(newOptions: CollectionOptions, options: { clearFields?: boolean } = {}) {
     const collection = this.getCollection(newOptions.name);
     if (!collection) {
       throw new Error(`Collection ${newOptions.name} not found`);
     }
-    collection.setOptions(newOptions);
+    collection.setOptions(newOptions, options);
   }
 
   upsertCollection(options: CollectionOptions) {
@@ -227,10 +227,10 @@ export class CollectionManager {
     return this.getCollection(options.name);
   }
 
-  upsertCollections(collections: CollectionOptions[]) {
+  upsertCollections(collections: CollectionOptions[], options: { clearFields?: boolean } = {}) {
     for (const collection of sortCollectionsByInherits(collections)) {
       if (this.collections.has(collection.name)) {
-        this.updateCollection(collection);
+        this.updateCollection(collection, options);
       } else {
         this.addCollection(collection);
       }
@@ -412,10 +412,13 @@ export class Collection {
     this.dataSource = dataSource;
   }
 
-  setOptions(newOptions: any = {}) {
+  setOptions(newOptions: any = {}, options: { clearFields?: boolean } = {}) {
     Object.keys(this.options).forEach((key) => delete this.options[key]);
     Object.assign(this.options, newOptions);
     this.initInherits();
+    if (options.clearFields) {
+      this.clearFields();
+    }
     this.upsertFields(this.options.fields || []);
   }
 
@@ -490,7 +493,6 @@ export class Collection {
   }
 
   getField(fieldName: string): CollectionField | undefined {
-    this.setFields(this.options.fields); //数据表字段被删除
     return this.fields.get(fieldName);
   }
 

package/src/resources/multiRecordResource.ts

@@ -113,6 +113,7 @@ export class MultiRecordResource<TDataItem = any> extends BaseRecordResource<TDa
   async create(data: TDataItem, options?: AxiosRequestConfig): Promise<void> {
     const config = this.mergeRequestConfig({ data }, this.createActionOptions, options);
     await this.runAction('create', config);
+    this.emit('saved', data);
     await this.refresh();
   }
 
@@ -140,6 +141,7 @@ export class MultiRecordResource<TDataItem = any> extends BaseRecordResource<TDa
       options,
     );
     await this.runAction('update', config);
+    this.emit('saved', data);
     await this.refresh();
   }
 

package/src/resources/singleRecordResource.ts

@@ -43,6 +43,7 @@ export class SingleRecordResource<TData = any> extends BaseRecordResource<TData>
       ...config,
       data,
     });
+    this.emit('saved', data);
     if (options?.refresh !== false) {
       await this.refresh();
     }