@steedos/service-metadata-objects 2.1.49 → 2.1.53

package/src/lookup/LookupActionHandler.ts

@@ -18,6 +18,9 @@ export class LookupActionHandler {
 
     async deleteAll(objectConfig){
         try {
+            if (!objectConfig) {
+                return;
+            }
             await this.deleteAllLookups(objectConfig);
             return true
         } catch (error) {
@@ -63,14 +66,14 @@ export class LookupActionHandler {
         }
     }
 
-    getDetailKey(objectApiName) {
-        return `$steedos.$lookup.#${objectApiName}.detail`
+    getDetailKey(objectApiName, detailApiName) {
+        return `$steedos.$lookup.#${objectApiName}.$detail.${detailApiName}`
     }
 
     async getDetails(objectApiName: string) {
-        let { metadata } = (await this.broker.call('metadata.get', { key: this.getDetailKey(objectApiName) }, { meta: {} })) || {};
         let detailName = [];
-        _.each(metadata, function(item){
+        const detailsInfo = await this.getDetailsInfo(objectApiName);
+        _.each(detailsInfo, function(item){
             if(item && _.isString(item)){
                 const foo = item.split('.');
                 if(foo.length > 0){
@@ -81,39 +84,28 @@ export class LookupActionHandler {
         return _.uniq(detailName);
     }
     async getDetailsInfo(objectApiName: string){
-        let { metadata } = (await this.broker.call('metadata.get', { key: this.getDetailKey(objectApiName) }, { meta: {} })) || {};
-        return metadata || [];
+        const detailsInfo = [];
+        let records = (await this.broker.call('metadata.filter', { key: this.getDetailKey(objectApiName, "*") }, { meta: {} })) || {};
+        for await (const item of records) {
+            const metadata = item?.metadata;
+            if(metadata){
+                detailsInfo.push(metadata);
+            }
+        }
+        return detailsInfo;
     }
 
     async removeDetail(objectApiName: any, detailObjectApiName: string, detailField: any) {
-        let detail = await this.getDetailsInfo(objectApiName);
-        let maps = [];
-        if (detail) {
-            maps = detail;
-        }
         const detailFullName = `${detailObjectApiName}.${detailField.name}`
-        maps = _.difference(maps, [detailFullName]);
-        await this.broker.call('metadata.add', { key: this.getDetailKey(objectApiName), data: maps }, { meta: {} })
-        // this.broker.emit(`@${objectApiName}.detailsChanged`, { objectApiName, detailObjectApiName, detailFieldName: detailField.name, detailFieldReferenceToFieldName: detailField.reference_to_field });
+        await this.broker.call('metadata.delete', { key: this.getDetailKey(objectApiName, detailFullName) }, { meta: {} });
         return true;
     }
 
     async addDetail(objectApiName: any, detailObjectApiName: string, detailField: any) {
-        let detail = await this.getDetailsInfo(objectApiName);
-        let maps = [];
-        if (detail) {
-            maps = detail;
-        }
         const detailFullName = `${detailObjectApiName}.${detailField.name}`
-        let count = _.filter(maps, function(o) { return o.startsWith(`${detailObjectApiName}.`) && o != detailFullName});
-        if (count.length < 1) {
-            maps.push(detailFullName);
-            maps = _.uniq(maps);
-            await this.broker.call('metadata.add', { key: this.getDetailKey(objectApiName), data: maps }, { meta: {} })
-            this.broker.emit(`@${objectApiName}.detailsChanged`, { objectApiName, detailObjectApiName, detailFieldName: detailField.name, detailFieldReferenceToFieldName: detailField.reference_to_field });
-            return true;
-        }
-        return false;
+        await this.broker.call('metadata.add', { key: this.getDetailKey(objectApiName, detailFullName), data: detailFullName }, { meta: {} })
+        this.broker.broadcast(`@${objectApiName}.detailsChanged`, { objectApiName, detailObjectApiName, detailFieldName: detailField.name, detailFieldReferenceToFieldName: detailField.reference_to_field });
+        return true;
     }
 
     // async removeDetail(objectApiName: any, detailObjectApiName: string) {
@@ -126,7 +118,7 @@ export class LookupActionHandler {
     // }
 
     async deleteObjectLookups(objectApiName: string) {
-        await this.broker.call('metadata.delete', { key: this.getDetailKey(objectApiName) }, { meta: {} });
+        await this.broker.call('metadata.fuzzyDelete', { key: this.getDetailKey(objectApiName, '*') }, { meta: {} });
         return true;
     }
 }

package/src/master-detail/masterDetailActionHandler.ts

@@ -79,7 +79,21 @@ export class MasterDetailActionHandler{
         }
         return false
     }
-
+    
+    async deleteAll(objectConfig) {
+        try {
+            if (!objectConfig) {
+                return;
+            }
+            await this.deleteObjectMasterDetails(objectConfig.name);
+            await this.broker.call('metadata.fuzzyDelete', {key: this.getDetailKey('*', objectConfig.name, '*')}, {meta: {}});
+            return true;
+        } catch (error) {
+            this.broker.logger.error(error);
+        }
+        return false;
+    }
+    
     async remove(objectConfig){
         try {
             await this.removeObjectMasterDetails(objectConfig);
@@ -104,10 +118,10 @@ export class MasterDetailActionHandler{
                 const fieldNameReferenceTo = item.split('.')[0];
                 const fieldName = item.split('.')[1];
                 const field = objectConfig.fields[fieldName];
-                field.name = fieldName;
+                // 考虑以下情况： (字段删除 | 字段名改变） 、 字段类型改变、 字段引用对象改变
                 if( !field || field.type !== 'master_detail' || field.reference_to !== fieldNameReferenceTo){
-                    await this.removeMaster(objectApiName, fieldNameReferenceTo, field);
-                    await this.removeDetail(fieldNameReferenceTo, objectApiName, field);
+                    await this.removeMaster(objectApiName, fieldNameReferenceTo, fieldName);
+                    await this.removeDetail(fieldNameReferenceTo, objectApiName, fieldName);
                 }
             }
         }
@@ -183,15 +197,14 @@ export class MasterDetailActionHandler{
         await this.checkMasterDetails(objectApiName);
     }
 
-
-    getMasterKey(objectApiName){
-        return `$steedos.$masterDetail.#${objectApiName}.master`
+    getMasterKey(objectApiName, masterApiName){
+        return `$steedos.$masterDetail.#${objectApiName}.$master.${masterApiName}`
     }
 
     async getMasters(objectApiName: string){
-        let { metadata } = (await this.broker.call('metadata.get', {key: this.getMasterKey(objectApiName)}, {meta: {}})) || {};
+        let mastersInfo = await this.getMastersInfo(objectApiName);
         let mastersName = [];
-        _.each(metadata, function(item){
+        _.each(mastersInfo, function(item){
             if(item && _.isString(item)){
                 const foo = item.split('.');
                 if(foo.length > 0){
@@ -203,48 +216,37 @@ export class MasterDetailActionHandler{
     }
 
     async getMastersInfo(objectApiName: string){
-        let { metadata } = (await this.broker.call('metadata.get', {key: this.getMasterKey(objectApiName)}, {meta: {}})) || {};
-        return metadata || [];
+        const mastersInfo = [];
+        let records = (await this.broker.call('metadata.filter', { key: this.getMasterKey(objectApiName, "*") }, { meta: {} })) || {};
+        for await (const item of records) {
+            const metadata = item?.metadata;
+            if(metadata){
+                mastersInfo.push(metadata);
+            }
+        }
+        return mastersInfo;
     }
 
     async addMaster(objectApiName: any, masterObjectApiName: string, field: any){
-        let master = await this.getMastersInfo(objectApiName);
-        let maps = [];
-        if(master){
-            maps = master;
-        }
         const masterFullName = `${masterObjectApiName}.${field.name}`
-        let count = _.filter(maps, function(o) { return o.startsWith(`${masterObjectApiName}.`) && o != masterFullName});
-        if (count.length < 1) {
-            maps.push(masterFullName);
-            maps = _.uniq(maps);
-            await this.broker.call('metadata.add', {key: this.getMasterKey(objectApiName), data: maps}, {meta: {}})
-            return true;
-        }
-        console.log(`maps`, maps, masterFullName)
-        return false;
+        await this.broker.call('metadata.add', {key: this.getMasterKey(objectApiName, masterFullName), data: masterFullName}, {meta: {}})
+        return true;
     }
 
-    async removeMaster(objectApiName: any, masterObjectApiName: string, masterField: any){
-        let master = await this.getMastersInfo(objectApiName);
-        let maps = [];
-        if (master) {
-            maps = master;
-        }
-        const masterFullName = `${masterObjectApiName}.${masterField.name}`
-        maps = _.difference(maps, [masterFullName]);
-        await this.broker.call('metadata.add', { key: this.getMasterKey(objectApiName), data: maps }, { meta: {} })
+    async removeMaster(objectApiName: any, masterObjectApiName: string, masterFieldName: any){
+        const masterFullName = `${masterObjectApiName}.${masterFieldName}`
+        await this.broker.call('metadata.delete', { key: this.getMasterKey(objectApiName, masterFullName) }, { meta: {} })
         return true;
     }
 
-    getDetailKey(objectApiName){
-        return `$steedos.$masterDetail.#${objectApiName}.detail`
+    getDetailKey(objectApiName, detailObjectApiName, detailFieldName){
+        return `$steedos.$masterDetail.#${objectApiName}.$detail.${detailObjectApiName}.${detailFieldName}`
     }
 
     async getDetails(objectApiName: string){
-        let { metadata } = (await this.broker.call('metadata.get', {key: this.getDetailKey(objectApiName)}, {meta: {}})) || {};
+        let detailsInfo = await this.getDetailsInfo(objectApiName);
         let detailsName = [];
-        _.each(metadata, function(item){
+        _.each(detailsInfo, function(item){
             if(item && _.isString(item)){
                 const foo = item.split('.');
                 if(foo.length > 0){
@@ -256,38 +258,26 @@ export class MasterDetailActionHandler{
     }
 
     async getDetailsInfo(objectApiName: string){
-        let { metadata } = (await this.broker.call('metadata.get', {key: this.getDetailKey(objectApiName)}, {meta: {}})) || {};
-        return metadata || [];
+        const detailsInfo = [];
+        let records = (await this.broker.call('metadata.filter', { key: this.getDetailKey(objectApiName, "*", "*") }, { meta: {} })) || {};
+        for await (const item of records) {
+            const metadata = item?.metadata;
+            if(metadata){
+                detailsInfo.push(metadata);
+            }
+        }
+        return detailsInfo;
     }
 
     async addDetail(objectApiName: any, detailObjectApiName: string, detailField: any){
-        let detail = await this.getDetailsInfo(objectApiName);
-        let maps = [];
-        if(detail){
-            maps = detail;
-        }
         const detailFullName = `${detailObjectApiName}.${detailField.name}`
-        let count = _.filter(maps, function(o) { return o.startsWith(`${detailObjectApiName}.`) && o != detailFullName});
-        if (count.length < 1) {
-            maps.push(detailFullName);
-            maps = _.uniq(maps);
-            await this.broker.call('metadata.add', {key: this.getDetailKey(objectApiName), data: maps}, {meta: {}})
-            this.broker.emit(`@${objectApiName}.detailsChanged`, { objectApiName, detailObjectApiName, detailFieldName: detailField.name, detailFieldReferenceToFieldName: detailField.reference_to_field });
-            return true;
-        }
-        return false;
+        await this.broker.call('metadata.add', {key: this.getDetailKey(objectApiName, detailObjectApiName, detailField.name), data: detailFullName}, {meta: {}})
+        this.broker.broadcast(`@${objectApiName}.detailsChanged`, { objectApiName, detailObjectApiName, detailFieldName: detailField.name, detailFieldReferenceToFieldName: detailField.reference_to_field });
+        return true;
     }
-
     
-    async removeDetail(objectApiName: any, detailObjectApiName: string, detailField: any){
-        let detail = await this.getDetailsInfo(objectApiName);
-        let maps = [];
-        if (detail) {
-            maps = detail;
-        }
-        const detailFullName = `${detailObjectApiName}.${detailField.name}`
-        maps = _.difference(maps, [detailFullName]);
-        await this.broker.call('metadata.add', { key: this.getDetailKey(objectApiName), data: maps }, { meta: {} })
+    async removeDetail(objectApiName: any, detailObjectApiName: string, detailFieldName: any){
+        await this.broker.call('metadata.delete', { key: this.getDetailKey(objectApiName, detailObjectApiName, detailFieldName)}, { meta: {} })
         return true;
     }
 
@@ -357,8 +347,8 @@ export class MasterDetailActionHandler{
     }
 
     async deleteObjectMasterDetails(objectApiName: string){
-        await this.broker.call('metadata.delete', {key: this.getMasterKey(objectApiName)}, {meta: {}});
-        await this.broker.call('metadata.delete', {key: this.getDetailKey(objectApiName)}, {meta: {}});
+        await this.broker.call('metadata.fuzzyDelete', {key: this.getMasterKey(objectApiName, '*')}, {meta: {}});
+        await this.broker.call('metadata.fuzzyDelete', {key: this.getDetailKey(objectApiName, '*', '*')}, {meta: {}});
         return true;
     }
 }

package/src/objects/fields/index.ts

@@ -1,3 +1,145 @@
-export async function addObjectField(){
-    
-}
+export async function addObjectField() {}
+
+enum SteedosFieldDBType {
+    varchar = "varchar",
+    text = "text",
+    number = "number",
+    boolean = "boolean",
+    date = "date",
+    dateTime = "dateTime",
+    json = "json",
+    array = "array",
+    // oneToOne,
+    // oneToMany,
+    // manyToOne,
+    // manyToMany
+}
+
+export function getDBType(objectName, field) {
+    switch (field.type) {
+        case "text":
+            return SteedosFieldDBType.varchar;
+        case "textarea":
+            return SteedosFieldDBType.text;
+        case "html":
+            return SteedosFieldDBType.text;
+        case "select":
+            if (this.multiple) {
+                return SteedosFieldDBType.array;
+            } else {
+                return SteedosFieldDBType.varchar;
+            }
+        case "boolean":
+            return SteedosFieldDBType.boolean;
+        case "toggle":
+            return SteedosFieldDBType.boolean;
+        case "date":
+            return SteedosFieldDBType.date;
+        case "datetime":
+            return SteedosFieldDBType.dateTime;
+        case "number":
+            return SteedosFieldDBType.number;
+        case "currency":
+            if (!this.scale && this.scale != 0) {
+                this.scale = 2;
+            }
+            return SteedosFieldDBType.number;
+        case "password":
+            return SteedosFieldDBType.varchar;
+        case "lookup":
+            // let reference_to = this.reference_to
+            // if(_.isFunction(this.reference_to)){
+            //     reference_to = this.reference_to()
+            // }
+
+            // if(_.isArray(reference_to)){
+            //     this._columnType = SteedosColumnType.manyToMany
+            // }else{
+            //     if(this.multiple){
+            //         this._columnType = SteedosColumnType.oneToMany
+            //     }else{
+            //         this._columnType = SteedosColumnType.oneToOne
+            //     }
+            // }
+            return SteedosFieldDBType.varchar;
+        case "master_detail":
+            // let reference_to2 = this.reference_to
+            // if(_.isFunction(this.reference_to)){
+            //     reference_to2 = this.reference_to()
+            // }
+
+            // if(_.isArray(reference_to2)){
+            //     this._columnType = SteedosColumnType.manyToMany
+            // }else{
+            //     if(this.multiple){
+            //         this._columnType = SteedosColumnType.manyToOne //TODO
+            //     }else{
+            //         this._columnType = SteedosColumnType.oneToOne
+            //     }
+            // }
+            return SteedosFieldDBType.varchar;
+        case "grid":
+            return SteedosFieldDBType.array;
+        case "url":
+            return SteedosFieldDBType.varchar;
+        case "email":
+            return SteedosFieldDBType.varchar;
+        case "avatar":
+            return SteedosFieldDBType.varchar;
+        case "location":
+            return SteedosFieldDBType.json;
+        case "image":
+            return SteedosFieldDBType.varchar;
+        case "object":
+            return SteedosFieldDBType.json;
+        case "url":
+            return SteedosFieldDBType.varchar;
+        case "[object]":
+            return SteedosFieldDBType.array;
+        case "[Object]":
+            return SteedosFieldDBType.array;
+        case "[grid]":
+            return SteedosFieldDBType.array;
+        case "[text]":
+            return SteedosFieldDBType.array;
+        case "selectCity":
+            return SteedosFieldDBType.json;
+        case "audio":
+            return SteedosFieldDBType.varchar;
+        case "filesize":
+            return SteedosFieldDBType.number;
+        case "file":
+            return SteedosFieldDBType.varchar;
+        case "string":
+            return SteedosFieldDBType.varchar;
+        case "code":
+            return SteedosFieldDBType.varchar;
+        case "function Object() { [native code] }":
+            return SteedosFieldDBType.json;
+        case Object:
+            return SteedosFieldDBType.json;
+        case "function String() { [native code] }":
+            return SteedosFieldDBType.varchar;
+        case String:
+            return SteedosFieldDBType.varchar;
+        case "Object":
+            return SteedosFieldDBType.json;
+        case "autonumber":
+            return SteedosFieldDBType.varchar;
+        case "markdown":
+            return SteedosFieldDBType.varchar;
+        case "formula":
+            return this.getDBType(this.data_type);
+        case "summary":
+            //汇总不需要check类型
+            return SteedosFieldDBType.varchar;
+        case "percent":
+            //百分比字段按数值类型处理
+            return this.getDBType("number");
+        default:
+            console.log(`field`, field);
+            throw new Error(
+                `${objectName}.${field.name} invalid field type ${field.type}`
+            );
+    }
+}