@steedos/standard-process-approval 2.6.1-beta.7 → 2.6.2-beta.2

package/main/default/client/process.client.js

@@ -38,7 +38,8 @@ Steedos.ProcessManager.allowSubmit = function(object_name, record_id){
     if(!object_name || !record_id){
         return false;
     }
-    const object = this.object || window.Creator?.getObject(object_name)
+    var _window$Creator;
+    const object = this.object || ((_window$Creator = window.Creator) === null || _window$Creator === void 0 ? void 0 : _window$Creator.getObject(object_name));
     if(!object.enable_process){
         return false;
     }

package/main/default/objectTranslations/process_definition.zh-CN/process_definition.zh-CN.objectTranslation.yml

@@ -55,7 +55,7 @@ fields:
     help: 
     description: 
   initial_submission_workflow_notifications_actions:
-    label: 工作流通知
+    label: 消息提醒
     help: 
     description: 
   final_approval_record_lock:
@@ -72,7 +72,7 @@ fields:
     help: 
     description: 
   final_approval_workflow_notifications_actions:
-    label: 工作流通知
+    label: 消息提醒
     help: 
     description: 
   final_rejection_record_lock:
@@ -89,7 +89,7 @@ fields:
     help: 
     description: 
   final_rejection_workflow_notifications_actions:
-    label: 工作流通知
+    label: 消息提醒
     help: 
     description: 
   recall_record_lock:
@@ -106,7 +106,7 @@ fields:
     help: 
     description: 
   recall_workflow_notifications_actions:
-    label: 工作流通知
+    label: 消息提醒
     help: 
     description: 
 groups:

package/main/default/objectTranslations/process_node.zh-CN/process_node.zh-CN.objectTranslation.yml

@@ -89,7 +89,7 @@ fields:
     help: 
     description: 
   approval_workflow_notifications_actions:
-    label: 工作流通知
+    label: 消息提醒
     help: 
     description: 
   rejection_updates_field_actions:
@@ -97,7 +97,7 @@ fields:
     help: 
     description: 
   rejection_workflow_notifications_actions:
-    label: 工作流通知
+    label: 消息提醒
     help: 
     description: 
 groups:

package/main/default/objectTranslations/workflow_notifications.zh-CN/workflow_notifications.zh-CN.objectTranslation.yml

@@ -1,5 +1,5 @@
 name: workflow_notifications
-label: 工作流通知
+label: 消息提醒
 description:
 fields:
   name:

package/main/default/objectTranslations/workflow_rule.zh-CN/workflow_rule.zh-CN.objectTranslation.yml

@@ -26,7 +26,7 @@ fields:
         value: onCreateOnly
       - label: 新建时，和每次编辑时
         value: onAllChanges
-      - label: 新建时，或编辑数据导致条件成立
+      - label: 新建时，和编辑数据导致条件成立时
         value: onCreateOrTriggeringUpdate
     description: 
   formula:
@@ -38,7 +38,7 @@ fields:
     help: 
     description: 
   workflow_notifications_actions:
-    label: 工作流通知
+    label: 消息提醒
     help: 
     description: 
   workflow_outbound_messages_actions:

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

@@ -108,7 +108,7 @@
                             "className": "px-0"
                         }
                     ],
-                    "className": "antd-Tabs antd-Tabs--line bg-white border-slate-300 p-4 sm:border sm:mt-3 sm:rounded sm:shadow",
+                    "className": "antd-Tabs antd-Tabs--line bg-white border-gray-300 p-4 sm:border sm:mt-3 sm:rounded sm:shadow",
                     "toolbarClassName": "",
                     "contentClassName": ""
                 }

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

@@ -41,25 +41,25 @@ fields:
     group: Select Assigned User
   assigned_user_field:
     type: lookup
+    reference_to: object_fields
+    reference_to_field: name
     multiple: true
     is_wide: true
     group: Select Assigned User
     showIcon: false
     depend_on:
       - object_name
-    optionsFunction: !!js/function |
-      function (doc){
-        var object = Creator.getObject(doc.object_name);
-        var options = [];
-        if(object){
-          var userFields = _.filter(object.fields, function(field){
-            return (field.type === 'lookup' || field.type === 'master_detail') && field.omit != true && (field.reference_to === 'users' || ('space_users' === field.reference_to && 'user' === field.reference_to_field))
-          });
-          _.each(userFields, function(field){
-            options.push({label:field.label, value:field.name});
-          })
+    filtersFunction: !<tag:yaml.org,2002:js/function> |-
+      function (filters, values) {
+        if(values && values.object_name){
+          return [
+            ['object', '=', values.object_name],
+            ['type','=',['lookup','master_detail']],
+            [['reference_to','=','users'],'or',[['reference_to','=','space_users'],['reference_to_field','=','user']]]
+          ]
+        }else{
+          return ['_id', '=', 'no']
         }
-        return options;
       }
 form:
   beforeEdit: !!js/function |

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

@@ -102,11 +102,13 @@ fields:
     inlineHelpText: Run Time-Dependent Actions if the following filters are met.
     group: time_dependent_action
   time_triggers:
-    type: grid
+    type: table
     label: 时间触发器
     is_wide: true
     required: false
     group: time_dependent_action
+    amis:
+      columns: ["number", "unit", "type", "date_field"]
   time_triggers.$:
     label: Field
     blackbox: true
@@ -137,30 +139,19 @@ fields:
   time_triggers.$.date_field:
     label: 日期字段
     type: lookup
+    reference_to: object_fields
+    reference_to_field: name
+    enable_enhanced_lookup: false
     depend_on:
       - object_name
-    optionsFunction: !!js/function |
-      function (values) {
-        console.log('values: ', values);
-        const object_name = values.object_name;
-        const options = [];
-        if (object_name) {
-          var object = Creator.getObject(object_name);
-          var objectLabel = object.label;
-          var fields = object.fields;
-          for(const key in fields) {
-            if (Object.hasOwnProperty.call(fields, key)) {
-              const f = fields[key]
-              if (!f.hidden && (f.type == 'datetime' || f.type == 'date')) {
-                options.push({
-                  label: objectLabel + ': ' + f.label,
-                  value: f.name
-                })
-              }
-            }
-          }
+    filtersFunction: !<tag:yaml.org,2002:js/function> |-
+      function (filters, values) {
+        const objectName = values.object_name;
+        if(objectName){
+          return [['object', '=', objectName], ['type', '=', ['datetime','date']]]
+        }else{
+          return ['_id', '=', 'no']
         }
-        return options
       }
   time_triggers.$.updates_field_actions:
     type: lookup

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

@@ -53,6 +53,7 @@ module.exports = {
         objectql.checkFormula(this.doc.entry_criteria, this.doc.object_name)
     },
     afterFind: async function(){
+        let spaceId = this.spaceId;
         let filters = InternalData.parserFilters(this.query.filters)
         let approvalProcesses = [];
         if(filters.name){
@@ -72,6 +73,7 @@ module.exports = {
 
         if(approvalProcesses){
             this.data.values = this.data.values.concat(approvalProcesses)
+            this.data.values = objectql.getSteedosSchema().metadataDriver.find(this.data.values, this.query, spaceId);
         }
     },
     afterAggregate: async function(){

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@steedos/standard-process-approval",
-    "version": "2.6.1-beta.7",
+    "version": "2.6.2-beta.2",
     "main": "package.service.js",
     "private": false,
     "publishConfig": {
@@ -10,10 +10,10 @@
         "steedos"
     ],
     "dependencies": {
-        "@steedos/process": "2.6.1-beta.7"
+        "@steedos/process": "2.6.2-beta.2"
     },
     "description": "steedos package",
     "repository": {},
     "license": "MIT",
-    "gitHead": "b12f271460ef3686face095e875aa38e8ddc4c7f"
+    "gitHead": "ddef9fbc34afc7b57c59a31e9ed4f56818dc4c31"
 }