@steedos/standard-process-approval 2.7.27-beta.6 → 3.0.0-beta.100

package/main/default/objects/process/approval/{process_definition.object.yml → process_definition/process_definition.object.yml}

@@ -123,8 +123,12 @@ fields:
       - object_name
     filtersFunction: !!js/function |
       function (filters, dependValues) {
-        if(dependValues && dependValues.object_name){
-          return "object_name eq '" + dependValues.object_name + "'";
+        var pObjectName = dependValues && dependValues.object_name;
+        if(pObjectName){
+          return ['object_name', '=', pObjectName];
+        }
+        else{
+          return ['object_name', '=', -1];
         }
       }
     group: Initial Submission Actions
@@ -138,8 +142,12 @@ fields:
       - object_name
     filtersFunction: !!js/function |
       function (filters, dependValues) {
-        if(dependValues && dependValues.object_name){
-          return "object_name eq '" + dependValues.object_name + "'";
+        var pObjectName = dependValues && dependValues.object_name;
+        if(pObjectName){
+          return ['object_name', '=', pObjectName];
+        }
+        else{
+          return ['object_name', '=', -1];
         }
       }
     group: Initial Submission Actions
@@ -165,8 +173,12 @@ fields:
       - object_name
     filtersFunction: !!js/function |
       function (filters, dependValues) {
-        if(dependValues && dependValues.object_name){
-          return "object_name eq '" + dependValues.object_name + "'";
+        var pObjectName = dependValues && dependValues.object_name;
+        if(pObjectName){
+          return ['object_name', '=', pObjectName];
+        }
+        else{
+          return ['object_name', '=', -1];
         }
       }
     group: Final Approval Actions
@@ -180,8 +192,12 @@ fields:
       - object_name
     filtersFunction: !!js/function |
       function (filters, dependValues) {
-        if(dependValues && dependValues.object_name){
-          return "object_name eq '" + dependValues.object_name + "'";
+        var pObjectName = dependValues && dependValues.object_name;
+        if(pObjectName){
+          return ['object_name', '=', pObjectName];
+        }
+        else{
+          return ['object_name', '=', -1];
         }
       }
     group: Final Approval Actions
@@ -207,8 +223,12 @@ fields:
       - object_name
     filtersFunction: !!js/function |
       function (filters, dependValues) {
-        if(dependValues && dependValues.object_name){
-          return "object_name eq '" + dependValues.object_name + "'";
+        var pObjectName = dependValues && dependValues.object_name;
+        if(pObjectName){
+          return ['object_name', '=', pObjectName];
+        }
+        else{
+          return ['object_name', '=', -1];
         }
       }
     group: Final Rejection Actions
@@ -222,8 +242,12 @@ fields:
       - object_name
     filtersFunction: !!js/function |
       function (filters, dependValues) {
-        if(dependValues && dependValues.object_name){
-          return "object_name eq '" + dependValues.object_name + "'";
+        var pObjectName = dependValues && dependValues.object_name;
+        if(pObjectName){
+          return ['object_name', '=', pObjectName];
+        }
+        else{
+          return ['object_name', '=', -1];
         }
       }
     group: Final Rejection Actions
@@ -250,8 +274,12 @@ fields:
       - object_name
     filtersFunction: !!js/function |
       function (filters, dependValues) {
-        if(dependValues && dependValues.object_name){
-          return "object_name eq '" + dependValues.object_name + "'";
+        var pObjectName = dependValues && dependValues.object_name;
+        if(pObjectName){
+          return ['object_name', '=', pObjectName];
+        }
+        else{
+          return ['object_name', '=', -1];
         }
       }
     group: Recall Actions
@@ -265,8 +293,12 @@ fields:
       - object_name
     filtersFunction: !!js/function |
       function (filters, dependValues) {
-        if(dependValues && dependValues.object_name){
-          return "object_name eq '" + dependValues.object_name + "'";
+        var pObjectName = dependValues && dependValues.object_name;
+        if(pObjectName){
+          return ['object_name', '=', pObjectName];
+        }
+        else{
+          return ['object_name', '=', -1];
         }
       }
     group: Recall Actions

package/main/default/objects/process/approval/process_definition.action.js

@@ -1,66 +1,49 @@
+/*
+ * @Author: 殷亮辉 yinlianghui@hotoa.com
+ * @Date: 2025-04-14 09:47:57
+ * @LastEditors: 殷亮辉 yinlianghui@hotoa.com
+ * @LastEditTime: 2025-08-19 14:07:13
+ */
 module.exports = {
-  enableVisible: function (object_name, record_id, record_permissions) {
-    var result = Steedos.authRequest(`/api/v4/${object_name}/${record_id}`, { type: 'get', async: false });
-    return !result.active && !result.is_system
-  },
-  enable: function (object_name, record_id, fields) {
-    Steedos.authRequest(`/api/v4/${object_name}/${record_id}`, { type: 'put', async: false, data: JSON.stringify({ active: true }) });
-    FlowRouter.reload();
-  },
-  disableVisible: function (object_name, record_id, record_permissions) {
-    var result = Steedos.authRequest(`/api/v4/${object_name}/${record_id}`, { type: 'get', async: false });
-    return result.active && !result.is_system
-  },
-  disable: function (object_name, record_id, fields) {
-    Steedos.authRequest(`/api/v4/${object_name}/${record_id}`, { type: 'put', async: false, data: JSON.stringify({ active: false }) });
-    FlowRouter.reload();
-  },
-  copyVisible: function(){
-    return true;
-  },
-  copy: function (object_name, record_id, fields) {
-    let result = Steedos.authRequest(`/api/v4/${object_name}/${record_id}/copy`, { type: 'get', async: false });
-    FlowRouter.go(`/app/admin/process_definition/view/${result._id}`);
-  },
-  customize: function (object_name, record_id, fields) {
-    var doc = Creator.odata.get(object_name, record_id);
-    var newDoc = {}
-    _.each(Creator.getObject(object_name).fields, function (v, k) {
-      if (_.has(doc, k)) {
-        newDoc[k] = doc[k]
-      }
-    })
-    delete newDoc.is_system;
+  // customize: function (object_name, record_id, fields) {
+  //   var doc = Creator.odata.get(object_name, record_id);
+  //   var newDoc = {}
+  //   _.each(Creator.getObject(object_name).fields, function (v, k) {
+  //     if (_.has(doc, k)) {
+  //       newDoc[k] = doc[k]
+  //     }
+  //   })
+  //   delete newDoc.is_system;
 
-    let docName = doc.name
-    let docObjectName = doc.object_name
+  //   let docName = doc.name
+  //   let docObjectName = doc.object_name
 
-    Creator.odata.insert(object_name, Object.assign(newDoc, { name: docName, object_name: docObjectName, active:false }), function (result, error) {
-      if (result) {
-        for(let node of doc.process_nodes){
-          let nodeName = node.name
-          var newNode = {}
-          _.each(Creator.getObject('process_node').fields, function (v, k) {
-            if (_.has(node, k)) {
-              newNode[k] = node[k]
-            }
-          })
-          Creator.odata.insert('process_node', Object.assign(newNode, { name: nodeName, process_definition: result._id }))
-        }
-        if (Session.get("object_name") === 'process_definition') {
-          FlowRouter.go(`/app/-/${object_name}/view/${result._id}`)
-        } else {
-          href = Creator.getObjectUrl(object_name, result._id);
-          window.open(href, '_blank', 'width=800, height=600, left=50, top= 50, toolbar=no, status=no, menubar=no, resizable=yes, scrollbars=yes')
-        }
-      }
-    });
-  },
+  //   Creator.odata.insert(object_name, Object.assign(newDoc, { name: docName, object_name: docObjectName, active: false }), function (result, error) {
+  //     if (result) {
+  //       for (let node of doc.process_nodes) {
+  //         let nodeName = node.name
+  //         var newNode = {}
+  //         _.each(Creator.getObject('process_node').fields, function (v, k) {
+  //           if (_.has(node, k)) {
+  //             newNode[k] = node[k]
+  //           }
+  //         })
+  //         Creator.odata.insert('process_node', Object.assign(newNode, { name: nodeName, process_definition: result._id }))
+  //       }
+  //       if (Session.get("object_name") === 'process_definition') {
+  //         FlowRouter.go(`/app/-/${object_name}/view/${result._id}`)
+  //       } else {
+  //         href = Creator.getObjectUrl(object_name, result._id);
+  //         window.open(href, '_blank', 'width=800, height=600, left=50, top= 50, toolbar=no, status=no, menubar=no, resizable=yes, scrollbars=yes')
+  //       }
+  //     }
+  //   });
+  // },
   customizeVisible: function (object_name, record_id, record_permissions, data) {
     var record = data && data.record;
     if (!record) {
       record = {}
     }
-    return Creator.baseObject.actions.standard_new.visible() && record.is_system;
+    return Steedos.Object.base.actions.standard_new.visible() && record.is_system;
   }
 }

package/main/default/objects/process/approval/process_node.object.yml

@@ -25,6 +25,17 @@ fields:
     type: master_detail
     is_wide: true
     reference_to: process_definition
+    auto_fill_mapping:
+      - from: object_name
+        to: object_name
+  object_name:
+    label: Object
+    type: lookup
+    reference_to: objects
+    reference_to_field: name
+    required: true
+    filterable: true
+    visible_on: "${false}"
   filtrad:
     type: boolean
     label: All records should enter this step
@@ -89,23 +100,22 @@ fields:
     visible_on: "{{ formData.approver != 'submitter_choose' }}"
     depend_on:
       - process_definition
-    optionsFunction: !!js/function |
-      function (doc){
-        var options = [];
-        if(doc.process_definition){
-          var pid = doc.process_definition;
-          if(_.isObject(pid)){
-            pid = pid._id;
-          }
-          var object_name = Creator.odata.get("process_definition", pid, "object_name").object_name;
-          var userFields = _.filter(Creator.getObject(object_name).fields, function(field){
-            return (field.type === 'lookup' || field.type === 'master_detail') && field.omit != true && (field.reference_to === 'users' || (field.reference_to === 'space_users' && field.reference_to_field === 'user'))
-          });
-          _.each(userFields, function(field){
-            options.push({label:field.label, value:field.name});
-          })
+    reference_to: object_fields
+    reference_to_field: name
+    filtersFunction: !<tag:yaml.org,2002:js/function> |-
+      function (filters, values) {
+        var pid = values.process_definition;
+        if(_.isObject(pid)){
+          pid = pid._id;
+        }
+        var result = Steedos.authRequest("/api/v1/process_definition/" + pid + "?fields=[\"object_name\"]", {type: 'get', async: false});
+        var pObjectName = result && result.data && result.data.object_name;
+        if(pObjectName){
+          return [['object', '=', pObjectName], [['type', '=', 'lookup'], 'or', ['type', '=', 'master_detail']], [['reference_to', '=', 'users'], 'or', [['reference_to', '=', 'space_users'],['reference_to_field', '=', 'user']]], ['omit', '!=', true]];
+        }
+        else{
+          return ['object', '=', -1];
         }
-        return options;
       }
   when_multiple_approvers:
     type: select
@@ -149,8 +159,14 @@ fields:
           if(_.isObject(pid)){
             pid = pid._id;
           }
-          var object_name = Creator.odata.get("process_definition", pid, "object_name").object_name;
-          return "object_name eq '" + object_name + "'";
+          var result = Steedos.authRequest("/api/v1/process_definition/" + pid + "?fields=[\"object_name\"]", {type: 'get', async: false});
+          var pObjectName = result && result.data && result.data.object_name;
+          if(pObjectName){
+            return ['object_name', '=', pObjectName];
+          }
+          else{
+            return ['object_name', '=', -1];
+          }
         }
       }
     group: Approval Actions
@@ -169,8 +185,14 @@ fields:
           if(_.isObject(pid)){
             pid = pid._id;
           }
-          var object_name = Creator.odata.get("process_definition", pid, "object_name").object_name;
-          return "object_name eq '" + object_name + "'";
+          var result = Steedos.authRequest("/api/v1/process_definition/" + pid + "?fields=[\"object_name\"]", {type: 'get', async: false});
+          var pObjectName = result && result.data && result.data.object_name;
+          if(pObjectName){
+            return ['object_name', '=', pObjectName];
+          }
+          else{
+            return ['object_name', '=', -1];
+          }
         }
       }
     group: Approval Actions
@@ -189,8 +211,14 @@ fields:
           if(_.isObject(pid)){
             pid = pid._id;
           }
-          var object_name = Creator.odata.get("process_definition", pid, "object_name").object_name;
-          return "object_name eq '" + object_name + "'";
+          var result = Steedos.authRequest("/api/v1/process_definition/" + pid + "?fields=[\"object_name\"]", {type: 'get', async: false});
+          var pObjectName = result && result.data && result.data.object_name;
+          if(pObjectName){
+            return ['object_name', '=', pObjectName];
+          }
+          else{
+            return ['object_name', '=', -1];
+          }
         }
       }
     group: Rejection Actions
@@ -209,8 +237,14 @@ fields:
           if(_.isObject(pid)){
             pid = pid._id;
           }
-          var object_name = Creator.odata.get("process_definition", pid, "object_name").object_name;
-          return "object_name eq '" + object_name + "'";
+          var result = Steedos.authRequest("/api/v1/process_definition/" + pid + "?fields=[\"object_name\"]", {type: 'get', async: false});
+          var pObjectName = result && result.data && result.data.object_name;
+          if(pObjectName){
+            return ['object_name', '=', pObjectName];
+          }
+          else{
+            return ['object_name', '=', -1];
+          }
         }
       }
     group: Rejection Actions

package/main/default/objects/process_instance_history/buttons/approve.button.yml

@@ -90,9 +90,6 @@ amis_schema: |-
           "body"
       ],
       "data": {
-          "context": {
-              "rootUrl": "http://127.0.0.1:5300"
-          },
           "app_id": "",
           "tab_id": "",
           "object_name": "",

package/main/default/objects/process_instance_history/buttons/reassign.button.yml

@@ -89,9 +89,6 @@ amis_schema: |-
           "body"
       ],
       "data": {
-          "context": {
-              "rootUrl": "http://127.0.0.1:5300"
-          },
           "app_id": "",
           "tab_id": "",
           "object_name": "",

package/main/default/objects/process_instance_history/buttons/recall.button.yml

@@ -82,15 +82,11 @@ amis_schema: |-
           "body"
       ],
       "data": {
-          "context": {
-              "rootUrl": "http://127.0.0.1:5300"
-          },
           "app_id": "",
           "tab_id": "",
           "object_name": "",
           "dataComponentId": "",
           "record_id": "",
-          "record": {},
           "permissions": {}
       },
       "bodyClassName": "p-0",

package/main/default/objects/process_instance_history/buttons/reject.button.yml

@@ -82,9 +82,6 @@ amis_schema: |-
           "body"
       ],
       "data": {
-          "context": {
-              "rootUrl": "http://127.0.0.1:5300"
-          },
           "app_id": "",
           "tab_id": "",
           "object_name": "",

package/main/default/objects/process_instance_history/pages/process_instance_detail.page.amis.json

@@ -13,7 +13,7 @@
                 },
                 {
                     "type": "tabs",
-                    "className": "steedos-record-tabs bg-white p-4 mt-3 border-y",
+                    "className": "steedos-record-tabs bg-white p-4 sm:m-4 sm:border sm:rounded",
                     "tabs": [
                         {
                             "title": "详情",
@@ -34,50 +34,53 @@
                                             "enableInitApi": true
                                         }
                                     ]
-                                }
-                            ],
-                            "id": "u:78283d8a88a6",
-                            "className": "px-0"
-                        },
-                        {
-                            "title": "相关表",
-                            "body": [
+                                },
                                 {
                                     "type": "group",
                                     "id": "u:731d4077557a",
                                     "className": "px-0",
                                     "body": [
                                         {
-                                            "type": "steedos-object-related-lists",
-                                            "id": "u:f3101a683d9e",
-                                            "label": "所有相关表",
+                                            "type": "steedos-record-service",
+                                            "id": "u:abefc73e930d",
+                                            "label": "记录服务",
                                             "recordId": "${target_object.ids[0]}",
                                             "objectApiName": "${target_object.o}",
-                                            "visibleOn": "${!!target_object}"
+                                            "body": [
+                                                {
+                                                    "type": "steedos-object-related-lists",
+                                                    "id": "u:f3101a683d9e",
+                                                    "label": "所有相关表",
+                                                    "recordId": "${target_object.ids[0]}",
+                                                    "objectApiName": "${target_object.o}",
+                                                    "visibleOn": "${!!target_object}"
+                                                }
+                                            ]
                                         }
                                     ]
                                 }
                             ],
-                            "id": "u:2828559659a3"
+                            "id": "u:78283d8a88a6",
+                            "className": "px-0"
                         },
-                      {
-                        "title": "当前记录",
-                        "className": "px-0 py-4",
-                        "body": [
-                          {
-                            "type": "steedos-object-form",
-                            "label": "对象表单",
-                            "objectApiName": "${objectName}",
-                            "recordId": "${recordId}",
-                            "appId": "${appId}",
-                            "id": "u:417063b0c22f"
-                          }
-                        ],
-                        "id": "u:5d4e7e3f6ecc"
-                      }
+                        {
+                            "title": "当前记录",
+                            "body": [
+                                {
+                                    "type": "steedos-object-form",
+                                    "id": "u:417063b0c22f",
+                                    "label": "对象表单",
+                                    "objectApiName": "${objectName}",
+                                    "recordId": "${recordId}",
+                                    "appId": "${appId}"
+                                }
+                            ],
+                            "id": "u:5d4e7e3f6ecc",
+                            "className": "px-0 py-4"
+                        }
                     ],
                     "id": "u:e1251a3f5a0f"
-                  }
+                }
             ],
             "data": {
                 "_master.objectName": "${objectName}",
@@ -99,25 +102,17 @@
                 }
             },
             "id": "u:be317b257920",
-            "messages": {}
+            "messages": {},
+            "dsType": "api"
         }
     ],
     "regions": [
-      "body"
+        "body"
     ],
-    "data": {
-      "objectName": "process_instance_history",
-      "recordId": "sJjFfTionvxrwrdF8",
-      "context": {
-        "rootUrl": "http://127.0.0.1:5900",
-        "tenantId": "63ed8fb288feeecd0165843d",
-        "userId": "1852bcb9-a3cb-4d04-905b-1cd12e4cdb3b",
-        "authToken": "655db0535cc3e217056b8fcb0aa270b8618128df0daad0076f9b90c4041a537f4aef46ed54131dc642afeb"
-      }
-    },
+    "data": {},
     "id": "page_process_instance_history_record_detail",
     "name": "page_process_instance_history_record_detail",
     "objectApiName": "${objectName}",
     "bodyClassName": "",
     "className": "object-detail-page"
-}
+}

package/main/default/objects/workflow-actions/action_field_updates.action.js

@@ -29,6 +29,6 @@ module.exports = {
         if(!record){
             record = {}
         }
-        return Creator.baseObject.actions.standard_new.visible() && record.is_system;
+        return Steedos.Object.base.actions.standard_new.visible() && record.is_system;
     }
 }

package/main/default/objects/workflow-actions/action_field_updates.object.yml

@@ -5,6 +5,7 @@ hidden: true
 enable_inline_edit: false
 version: 2
 enable_enhanced_lookup: true
+isMetadata: true
 fields:
   name:
     type: text

package/main/default/objects/workflow-actions/workflow_notifications.action.js

@@ -29,6 +29,6 @@ module.exports = {
         if(!record){
             record = {}
         }
-        return Creator.baseObject.actions.standard_new.visible() && record.is_system;
+        return Steedos.Object.base.actions.standard_new.visible() && record.is_system;
     }
 }

package/main/default/objects/workflow-actions/workflow_notifications.object.yml

@@ -5,6 +5,7 @@ hidden: true
 enable_inline_edit: false
 enable_enhanced_lookup: true
 version: 2
+isMetadata: true
 fields:
   name:
     type: text

package/main/default/objects/workflow-actions/workflow_outbound_messages/workflow_outbound_messages.object.yml

@@ -4,4 +4,5 @@ icon: app
 version: 2
 hidden: true
 enable_inline_edit: false
-enable_enhanced_lookup: true
+enable_enhanced_lookup: true
+isMetadata: true

package/main/default/objects/workflow-actions/workflow_rule.action.js

@@ -29,6 +29,6 @@ module.exports = {
         if(!record){
             record = {}
         }
-        return Creator.baseObject.actions.standard_new.visible() && record.is_system;
+        return Steedos.Object.base.actions.standard_new.visible() && record.is_system;
     }
 }

package/main/default/objects/workflow-actions/workflow_rule.object.yml

@@ -4,6 +4,7 @@ icon: maintenance_work_rule
 hidden: true
 version: 2
 enable_enhanced_lookup: true
+isMetadata: true
 fields:
   object_name:
     label: Object Name
@@ -116,40 +117,18 @@ fields:
     group: time_dependent_action
     amis:
       showIndex: true
-      columns: ["number", "unit", "type", "date_field"]
+      columns: ["date_field", "type", "number", "unit"]
   time_triggers.$:
     label: Field
     blackbox: true
     type: object
-  time_triggers.$.number:
-    label: 数值
-    type: number
-    scale: 0
-    required: true
-  time_triggers.$.unit:
-    label: 单位
-    type: select
-    options: 
-      - label: 小时
-        value: hour
-      - label: 天
-        value: day
-    required: true
-  time_triggers.$.type:
-    label: 类型
-    type: select
-    options: 
-      - label: 早于
-        value: earlier_than
-      - label: 晚于
-        value: later_than
-    required: true
   time_triggers.$.date_field:
     label: 日期字段
     type: lookup
     reference_to: object_fields
     reference_to_field: name
     enable_enhanced_lookup: false
+    required: true
     depend_on:
       - object_name
     filtersFunction: !<tag:yaml.org,2002:js/function> |-
@@ -161,6 +140,29 @@ fields:
           return ['_id', '=', 'no']
         }
       }
+  time_triggers.$.type:
+    label: 类型
+    type: select
+    options: 
+      - label: 早于
+        value: earlier_than
+      - label: 晚于
+        value: later_than
+    required: true
+  time_triggers.$.number:
+    label: 数值
+    type: number
+    scale: 0
+    required: true
+  time_triggers.$.unit:
+    label: 单位
+    type: select
+    options: 
+      - label: 小时
+        value: hour
+      - label: 天
+        value: day
+    required: true
   time_triggers.$.updates_field_actions:
     type: lookup
     multiple: true