@steedos/standard-object-database 2.4.10-beta.2 → 2.4.10-beta.5

package/main/default/objects/object_listviews.object.yml

@@ -95,10 +95,6 @@ fields:
       - object_name
     reference_to: object_fields
     reference_to_field: name
-    filtersFunction: !<tag:yaml.org,2002:js/function> |-
-      function(filters, values){
-        return ['object', '=', values.object_name]
-      }
   sort:
     label: Default Sort Order
     type: grid
@@ -203,10 +199,6 @@ fields:
     is_wide: false
     reference_to: object_fields
     reference_to_field: name
-    filtersFunction: !<tag:yaml.org,2002:js/function> |-
-      function(filters, values){
-        return ['object', '=', values.object_name]
-      }
   searchable_fields:
     label: Searchable Fields
     type: grid
@@ -224,10 +216,6 @@ fields:
     is_wide: false
     reference_to: object_fields
     reference_to_field: name
-    filtersFunction: !<tag:yaml.org,2002:js/function> |-
-      function(filters, values){
-        return ['object', '=', values.object_name]
-      }
   sort_no:
     label: Sort no
     type: number

package/main/default/objects/objects.core.js

@@ -225,22 +225,24 @@ function loadObject(doc, oldDoc) {
         objectql.loadObjectLazyListenners(doc.name);
         objectql.loadObjectLazyButtons(doc.name);
         //获取到继承后的对象
-        const _doc = objectql.getObjectConfig(doc.name);
+        // const _doc = objectql.getObjectConfig(doc.name);
+        // console.log(`loadObject===>`, doc.name)
         objectql.getSteedosSchema().metadataRegister.addObjectConfig(DB_OBJECT_SERVICE_NAME, originalObject).then(function(res){            
             if(res){
-                datasource.setObject(doc.name, _doc);
-                try {
-                    if (!datasourceName || datasourceName == defaultDatasourceName) {
-                        Creator.Objects[doc.name] = _doc;
-                        Creator.loadObjects(_doc, _doc.name);
-                    }
-                } catch (error) {
-                    console.log('error', error);
-                }
-                if (!oldDoc || (oldDoc && oldDoc.is_enable === false && doc.is_enable)) {
-                    loadObjectTriggers(doc);
-                    loadObjectPermission(doc);
-                }
+                // datasource.setObject(doc.name, _doc);
+                // try {
+                //     if (!datasourceName || datasourceName == defaultDatasourceName) {
+                //         Creator.Objects[doc.name] = _doc;
+                //         Creator.loadObjects(_doc, _doc.name);
+                //     }
+                // } catch (error) {
+                //     console.log('error', error);
+                // }
+                // if (!oldDoc || (oldDoc && oldDoc.is_enable === false && doc.is_enable)) {
+                //     loadObjectTriggers(doc);
+                //     loadObjectPermission(doc);
+                // }
+                
                 objectql.getSteedosSchema().broker.broadcast("$packages.statisticsActivatedPackages", {});
             }
         })
@@ -342,7 +344,7 @@ function reloadObject(changeLog){
             return 
         }
         //获取到最新的对象
-        const object = objectql.getObjectConfig(objectName);
+        const object = objectql.getOriginalObjectConfig(objectName);
 
         let _mf =  _.max(_.values(object.fields), function (field) { return field.sort_no; });
         if(_mf && object.name){
@@ -355,18 +357,18 @@ function reloadObject(changeLog){
         if(deleted.actions.length == 0){
             deleted.actions = null;
         }
-
+        // console.log(`reloadObject===>`, object.name)
         objectql.getSteedosSchema().metadataRegister.addObjectConfig(DB_OBJECT_SERVICE_NAME, Object.assign({}, object, {isMain:false, __deleted: deleted})).then(function(res){            
             if(res){
-                datasource.setObject(object.name, object);
-                try {
-                    if(!objectDataSourceName || objectDataSourceName == defaultDatasourceName){
-                        Creator.Objects[object.name] = object;
-                        Creator.loadObjects(object, object.name);
-                    }
-                } catch (error) {
-                    console.log('error', error);
-                }
+                // datasource.setObject(object.name, object);
+                // try {
+                //     if(!objectDataSourceName || objectDataSourceName == defaultDatasourceName){
+                //         Creator.Objects[object.name] = object;
+                //         Creator.loadObjects(object, object.name);
+                //     }
+                // } catch (error) {
+                //     console.log('error', error);
+                // }
                 objectql.getSteedosSchema().broker.broadcast("$packages.statisticsActivatedPackages", {});
             }
         })

package/main/default/routes/amis_button_design.ejs

@@ -127,6 +127,7 @@
           delete schema.data.context.tenantId;
           delete schema.data.context.authToken;
           delete schema.data.context.user;
+          delete schema.data.context.rootUrl;
         }
         return await axios.post(
           `${rootUrl}/graphql`,

package/main/default/routes/amis_listview_design.ejs

@@ -2,7 +2,7 @@
  * @Author: baozhoutao@steedos.com
  * @Date: 2022-06-02 17:45:15
  * @LastEditors: baozhoutao@steedos.com
- * @LastEditTime: 2023-03-30 17:55:29
+ * @LastEditTime: 2023-04-04 16:00:34
  * @Description: 
 -->
 <html>
@@ -122,6 +122,7 @@
           delete schema.data.context.tenantId;
           delete schema.data.context.authToken;
           delete schema.data.context.user;
+          delete schema.data.context.rootUrl;
         }
         return await axios.post(
           `${rootUrl}/graphql`,

package/main/default/triggers/object_fields.trigger.js

@@ -222,7 +222,7 @@ module.exports = {
             objectName = filters._id.split('.')[0];
         }
         if(objectName){
-            let fields = await InternalData.getObjectFields(objectName, this.userId);
+            let fields = await InternalData.getObjectFields(objectName, this.userId, filters.name ? true : false);
             if(fields){
                 _.each(fields, (field)=>{
                     this.data.values.push(Object.assign({_id: `${objectName}.${field.name}`}, field))
@@ -254,7 +254,7 @@ module.exports = {
             objectName = filters._id.split('.')[0];
         }
         if(objectName){
-            let fields = await InternalData.getObjectFields(objectName, this.userId);
+            let fields = await InternalData.getObjectFields(objectName, this.userId, true);
             if(fields){
                 _.each(fields, (field)=>{
                     this.data.values.push(Object.assign({_id: `${objectName}.${field.name}`}, field))

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@steedos/standard-object-database",
-    "version": "2.4.10-beta.2",
+    "version": "2.4.10-beta.5",
     "main": "package.service.js",
     "private": false,
     "publishConfig": {
@@ -12,5 +12,5 @@
     "description": "steedos package",
     "repository": {},
     "license": "MIT",
-    "gitHead": "3759fa50ad8df741a72470f4d07c712272c13e6e"
+    "gitHead": "6af4954a8952eeb36d10cb6db7722bdc243cfa97"
 }