@steedos/standard-process-approval 2.4.0-beta.7 → 2.4.0

package/main/default/client/core.client.js

@@ -1,63 +1,10 @@
-Steedos.authRequest = function (url, options) {
-    var userSession = Creator.USER_CONTEXT;
-    var spaceId = userSession.spaceId;
-    var authToken = userSession.authToken ? userSession.authToken : userSession.user.authToken;
-    var result = null;
-    url = Steedos.absoluteUrl(url);
-    try {
-        var authorization = "Bearer " + spaceId + "," + authToken;
-        var headers = [{
-            name: 'Content-Type',
-            value: 'application/json'
-        }, {
-            name: 'Authorization',
-            value: authorization
-        }];
-
-        var defOptions = {
-            type: "get",
-            url: url,
-            dataType: "json",
-            contentType: 'application/json',
-            beforeSend: function (XHR) {
-                if (headers && headers.length) {
-                    return headers.forEach(function (header) {
-                        return XHR.setRequestHeader(header.name, header.value);
-                    });
-                }
-            },
-            success: function (data) {
-                result = data;
-            },
-            error: function (XMLHttpRequest, textStatus, errorThrown) {
-                console.error(XMLHttpRequest.responseJSON);
-                if (XMLHttpRequest.responseJSON && XMLHttpRequest.responseJSON.error) {
-                    const errorInfo = XMLHttpRequest.responseJSON.error;
-                    result = { error: errorInfo }
-                    let errorMsg;
-                    if (errorInfo.reason) {
-                        errorMsg = errorInfo.reason;
-                    }
-                    else if (errorInfo.message) {
-                        errorMsg = errorInfo.message;
-                    }
-                    else {
-                        errorMsg = errorInfo;
-                    }
-                    toastr.error(t(errorMsg.replace(/:/g, '：')))
-                }
-                else {
-                    toastr.error(XMLHttpRequest.responseJSON)
-                }
-            }
-        }
-        $.ajax(Object.assign({}, defOptions, options));
-        return result;
-    } catch (err) {
-        console.error(err);
-        toastr.error(err);
-    }
-}
+/*
+ * @Author: baozhoutao@steedos.com
+ * @Date: 2022-12-13 10:41:08
+ * @LastEditors: baozhoutao@steedos.com
+ * @LastEditTime: 2023-02-26 16:30:11
+ * @Description: 
+ */
 
 Steedos.getObjectsOptions = function (filterFunction) {
     var options = [];

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

@@ -25,6 +25,13 @@ fields:
   operation:
     label: 新字段值类型
     help: 
+    options:
+      - label: 空值 (null)
+        value: 'null'
+      - label: 使用公式设置新值
+        value: formula
+      - label: 特定值
+        value: literal
     description: 
   formula:
     label: 公式

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

@@ -56,7 +56,8 @@ module.exports = {
       }
     });
   },
-  customizeVisible: function (object_name, record_id, record_permissions, record) {
+  customizeVisible: function (object_name, record_id, record_permissions, data) {
+    var record = data && data.record;
     if (!record) {
       record = {}
     }

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

@@ -18,12 +18,8 @@ fields:
     is_wide: true
     filterable: true
     create: false
-    # reference_to: objects
+    reference_to: objects
     reference_to_field: name
-    optionsFunction: !!js/function |
-      function(){
-        return Steedos.getObjectsOptions();
-      }
   description:
     label: Description
     type: textarea

package/main/default/objects/process/process_instance/process_instance.object.yml

@@ -6,7 +6,7 @@ fields:
   name:
     type: text
   process_definition:
-    type: master_detail
+    type: lookup
     is_wide: true
     reference_to: process_definition
   target_object:

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

@@ -24,7 +24,8 @@ module.exports = {
             }
         });
     },
-    customizeVisible: function(object_name, record_id, record_permissions, record){
+    customizeVisible: function(object_name, record_id, record_permissions, data){
+        var record = data && data.record;
         if(!record){
             record = {}
         }

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

@@ -3,7 +3,7 @@ label: Field Updates
 icon: record
 hidden: true
 enable_inline_edit: false
-# version: 2
+version: 2
 enable_enhanced_lookup: true
 fields:
   name:
@@ -16,103 +16,38 @@ fields:
   object_name:
     label: Object Name
     type: lookup
-    optionsFunction: !!js/function |
-      function () {
-        return Steedos.getObjectsOptions();
-      }
+    reference_to: objects
+    reference_to_field: name
   target_object:
     type: lookup
     label: Object to Update
+    reference_to: objects
+    reference_to_field: name
     depend_on:
       - object_name
-    optionsFunction: !!js/function |
-      function (doc) {
-        var object = Creator.objectsByName[doc.object_name];
-        if(object){
-          var _options = [{label: object.label, value: object.name}];
-          _.forEach(object.fields, function (field, fname) {
-            if(field && field.type === 'master_detail' && _.isString(field.reference_to)){
-              var referenceToObject = Creator.objectsByName[field.reference_to];
-              if(referenceToObject){
-                _options.push({
-                  label: referenceToObject.label,
-                  value: field.name,
-                });
-              }
-            }
-          });
-          return _options;
-        }
-       return [];
-      }
   field_name:
     label: Field to Update
     type: lookup
     showIcon: false
+    reference_to: object_fields
+    reference_to_field: name
     depend_on:
       - object_name
       - target_object
-    optionsFunction: !!js/function |
-      function (doc) {
-        var mainObjectName = null;
-        if(doc.target_object && doc.target_object != doc.object_name){
-          mainObjectName = Creator.objectsByName[doc.object_name].fields[doc.target_object].reference_to;
-        }else{
-          mainObjectName = doc.object_name;
-        }
-        var object = Creator.objectsByName[mainObjectName];
-        if(object){
-          var _options = [];
-          _.forEach(object.fields, function (field, fname) {
-            if(["formula", "summary", "autonumber"].indexOf(field.type) < 0){
-              /*公式、累计汇总、自动编号三种字段类型是只读的，不允许字段更新来变更其值*/
-              _options.push({
-                label: field.label,
-                value: field.name,
-              });
-            }
-          });
-          return _options;
-        }
-        return [];
-      }
   operation:
-    type: lookup
+    type: select
     showIcon: false
     depend_on:
       - field_name
       - target_object
       - object_name
-    optionsFunction: !!js/function |
-      function (doc) {
-        var mainObjectName = null;
-        if(doc.target_object && doc.target_object != doc.object_name){
-          mainObjectName = Creator.objectsByName[doc.object_name].fields[doc.target_object].reference_to;
-        }else{
-          mainObjectName = doc.object_name;
-        }
-        var object = Creator.objectsByName[mainObjectName];
-        if(object && doc.field_name){
-          var _options = [];
-          var field = object.fields[doc.field_name];
-          if(field && field.type != 'boolean'){
-            _options.push({
-                label: TAPi18n.__("action_field_updates_field_operation_options_null"),
-                value: 'null',
-            }) 
-          }
-          _options.push({
-              label: TAPi18n.__("action_field_updates_field_operation_options_formula"),
-              value: 'formula',
-          });
-          _options.push({
-              label: TAPi18n.__("action_field_updates_field_operation_options_literal"),
-              value: 'literal',
-          })
-          return _options;
-        }
-        return [];
-      }
+    options: 
+      - label: 'null'
+        value: 'null'
+      - label: formula
+        value: formula
+      - label: literal
+        value: literal
     # options: 
     #   - label: 'Null'
     #     value: 'null'
@@ -127,10 +62,12 @@ fields:
   formula:
     type: textarea
     is_wide: true
+    visible_on: "{{formData.operation === 'formula' ? true: false}}"
   literal_value:
     type: text
     is_wide: true
     label: Literal value
+    visible_on: "{{formData.operation === 'literal' ? true: false}}"
   notify_assignee:
     type: boolean
     hidden: true

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

@@ -24,7 +24,8 @@ module.exports = {
             }
         });
     },
-    customizeVisible: function(object_name, record_id, record_permissions, record){
+    customizeVisible: function(object_name, record_id, record_permissions, data){
+        var record = data && data.record;
         if(!record){
             record = {}
         }

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

@@ -21,10 +21,8 @@ fields:
     type: lookup
     required: true
     is_wide: true
-    optionsFunction: !!js/function |
-      function () {
-        return Steedos.getObjectsOptions();
-      }
+    reference_to: objects
+    reference_to_field: name
   title:
     label: Title
     type: textarea
@@ -51,7 +49,7 @@ fields:
       - object_name
     optionsFunction: !!js/function |
       function (doc){
-        var object = Creator.objectsByName[doc.object_name];
+        var object = Creator.getObject(doc.object_name);
         var options = [];
         if(object){
           var userFields = _.filter(object.fields, function(field){

package/main/default/objects/workflow-actions/workflow_outbound_messages/fields/object_fields_to_send.field.yml

@@ -3,16 +3,12 @@ label: 要发送的字段
 type: lookup
 multiple: true
 is_wide: true
+reference_to: object_fields
+reference_to_field: name
 depend_on:
   - object_name
-optionsFunction: !<tag:yaml.org,2002:js/function> |-
-  function (values) {
-          if (!(values != null ? values.object_name : void 0)) {
-            values.object_name = Session.get("object_name");
-          }
-          if(values.object_name && !_.isString(values.object_name)){
-            values.object_name = values.object_name.name
-          }
-          return Creator.getObjectFieldOptions(values != null ? values.object_name : void 0);
-        }
+filtersFunction: !<tag:yaml.org,2002:js/function> |-
+  function(filters, values){
+    return ['object', '=', values.object_name]
+  }
 sort_no: 70

package/main/default/objects/workflow-actions/workflow_outbound_messages/fields/object_name.field.yml

@@ -3,9 +3,7 @@ label: 对象
 type: lookup
 required: true
 is_wide: true
-optionsFunction: !!js/function |
-  function () {
-    return Steedos.getObjectsOptions();
-  }
+reference_to: objects
+reference_to_field: name
 index: true
 sort_no: 10

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

@@ -24,7 +24,8 @@ module.exports = {
             }
         });
     },
-    customizeVisible: function(object_name, record_id, record_permissions, record){
+    customizeVisible: function(object_name, record_id, record_permissions, data){
+        var record = data && data.record;
         if(!record){
             record = {}
         }

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

@@ -10,10 +10,8 @@ fields:
     type: lookup
     required: true
     is_wide: true
-    optionsFunction: !!js/function |
-      function () {
-        return Steedos.getObjectsOptions();
-      }
+    reference_to: objects
+    reference_to_field: name
   name:
     type: text
     required: true
@@ -52,7 +50,7 @@ fields:
     filtersFunction: !!js/function |
       function (filters, dependValues) {
         if(dependValues && dependValues.object_name){
-          return "object_name eq '" + dependValues.object_name + "'";
+          return ['object_name','=',dependValues.object_name];
         }
       }
   workflow_notifications_actions:
@@ -68,7 +66,7 @@ fields:
     filtersFunction: !!js/function |
       function (filters, dependValues) {
         if(dependValues && dependValues.object_name){
-          return "object_name eq '" + dependValues.object_name + "'";
+          return ['object_name','=',dependValues.object_name];
         }
       }
   workflow_outbound_messages_actions:
@@ -84,7 +82,7 @@ fields:
     filtersFunction: !!js/function |
       function (filters, dependValues) {
         if(dependValues && dependValues.object_name){
-          return "object_name eq '" + dependValues.object_name + "'";
+          return ['object_name','=',dependValues.object_name];
         }
       }
   # boolean_filter: # TODO 暂不支持
@@ -136,7 +134,7 @@ fields:
     required: true
   time_triggers.$.date_field:
     label: 日期字段
-    type: select
+    type: lookup
     depend_on:
       - object_name
     optionsFunction: !!js/function |
@@ -174,7 +172,7 @@ fields:
     filtersFunction: !!js/function |
       function (filters, dependValues) {
         if(dependValues && dependValues.object_name){
-          return "object_name eq '" + dependValues.object_name + "'";
+          return ['object_name','=',dependValues.object_name];
         }
       }
   time_triggers.$.workflow_notifications_actions:
@@ -189,7 +187,7 @@ fields:
     filtersFunction: !!js/function |
       function (filters, dependValues) {
         if(dependValues && dependValues.object_name){
-          return "object_name eq '" + dependValues.object_name + "'";
+          return ['object_name','=',dependValues.object_name];
         }
       }
   time_triggers.$.workflow_outbound_messages_actions:
@@ -204,7 +202,7 @@ fields:
     filtersFunction: !!js/function |
       function (filters, dependValues) {
         if(dependValues && dependValues.object_name){
-          return "object_name eq '" + dependValues.object_name + "'";
+          return ['object_name','=',dependValues.object_name];
         }
       }
   description:

package/main/default/services/action_field_updates.service.js

@@ -0,0 +1,252 @@
+/*
+ * @Description: 提供action_field_updates(字段更新对象)需要的数据接口
+ */
+
+const objectql = require("@steedos/objectql");
+const steedosI18n = require("@steedos/i18n");
+const _ = require("lodash");
+const clone = require("clone");
+
+
+module.exports = {
+    name: "action_field_updates",
+    mixins: [],
+    /**
+     * Settings
+     */
+    settings: {
+
+    },
+
+    /**
+     * Dependencies
+     */
+    dependencies: [],
+
+    /**
+     * Actions
+     */
+    actions: {
+        getTargetObjectOptions: {
+            // 需要传 objectName 参数进来。
+            rest: {
+                method: "GET",
+                path: "/target_object/options"
+            },
+            async handler(ctx) {
+                const options = await this.getTargetObjectOptions(ctx);
+                return { status: 0, data: { options } }
+            }
+        },
+        getFieldNameOptions: {
+            // 需要传 objectName, targetObject 参数进来。
+            rest: {
+                method: "GET",
+                path: "/field_name/options"
+            },
+            async handler(ctx) {
+                const options = await this.getFieldNameOptions(ctx);
+                return { status: 0, data: { options } }
+            }
+        },
+        getOperationOptions: {
+            // 需要传 objectName, targetObject(非必填), field_name 参数进来。
+            rest: {
+                method: "GET",
+                path: "/operation/options"
+            },
+            async handler(ctx) {
+                const options = await this.getOperationOptions(ctx);
+                return { status: 0, data: { options } }
+            }
+        },
+        getLiteralValueOptions: {
+            // 需要传 objectName, targetObject(非必填), field_name 参数进来。
+            rest: {
+                method: "GET",
+                path: "/literal_value/options"
+            },
+            async handler(ctx) {
+                const data = await this.getLiteralValueOptions(ctx);
+                return { status: 0, msg: "", data: data }
+            }
+        }
+    },
+
+    /**
+     * Events
+     */
+    events: {
+
+    },
+
+    /**
+     * Methods
+     */
+    methods: {
+        /* target_object 字段使用*/
+        getTargetObjectOptions: {
+            async handler(ctx) {
+                const userSession = ctx.meta.user;
+                const lng = userSession.language || 'zh-CN';
+                const objectName = ctx.params.objectName;
+                if(!objectName){
+                    return []
+                }
+                const objectConfig = await objectql.getObjectConfig(objectName);
+                steedosI18n.translationObject(lng, objectConfig.name, objectConfig);
+
+                const options = [{ label: objectConfig.label, value: objectConfig.name }];
+                for (fieldName in objectConfig.fields) {
+                    const field = objectConfig.fields[fieldName]
+                    if (field && field.type === 'master_detail' && _.isString(field.reference_to)) {
+                        const referenceToObjectConfig = await objectql.getObjectConfig(field.reference_to);
+                        steedosI18n.translationObject(lng, referenceToObjectConfig.name, referenceToObjectConfig);
+                        if (referenceToObjectConfig) {
+                            options.push({
+                                label: referenceToObjectConfig.label,
+                                value: field.name,
+                            });
+                        }
+                    }
+                }
+                return options;
+            }
+        },
+        /* field_name 字段使用*/
+        getFieldNameOptions: {
+            async handler(ctx) {
+                const userSession = ctx.meta.user;
+                const lng = userSession.language || 'zh-CN';
+                const objectName = ctx.params.objectName;
+                const targetObject = ctx.params.targetObject;
+                if (!objectName || !targetObject) {
+                    return []
+                }
+
+                let mainObjectName = null;
+                if (targetObject && targetObject != objectName) {
+                    const targetField = await objectql.getObjectConfig(objectName).fields[targetObject];
+                    mainObjectName = targetField && targetField.reference_to;
+                } else {
+                    mainObjectName = objectName;
+                }
+
+                const objectConfig = await objectql.getObjectConfig(mainObjectName);
+                const options = [];
+                if (objectConfig) {
+                    steedosI18n.translationObject(lng, objectConfig.name, objectConfig);
+                    _.forEach(objectConfig.fields, function (field, fname) {
+                        if (["formula", "summary", "autonumber"].indexOf(field.type) < 0 && !field.hidden && !field.omit && !field.readonly && field.visible_on !== '{{false}}') {
+                            /*公式、累计汇总、自动编号三种字段类型是只读的，不允许字段更新来变更其值*/
+                            options.push({
+                                label: field.label,
+                                value: field.name,
+                            });
+                        }
+                    });
+                }
+                return options;
+            }
+        },
+        /* operation 字段使用*/
+        getOperationOptions: {
+            async handler(ctx) {
+                const userSession = ctx.meta.user;
+                const lng = userSession.language || 'zh-CN';
+                const objectName = ctx.params.objectName;
+                const targetObject = ctx.params.targetObject;
+                const fieldName = ctx.params.fieldName;
+                
+                if (!objectName || !fieldName) {
+                    return []
+                }
+
+                let mainObjectName = null;
+                if (targetObject && targetObject != objectName) {
+                    const targetField = await objectql.getObjectConfig(objectName).fields[targetObject];
+                    mainObjectName = targetField && targetField.reference_to;
+                } else {
+                    mainObjectName = objectName;
+                }
+
+                const objectConfig = await objectql.getObjectConfig(mainObjectName);
+                const options = [];
+                if (objectConfig) {
+                    steedosI18n.translationObject(lng, objectConfig.name, objectConfig);
+                    const field = objectConfig.fields[fieldName];
+                    if (field && field.type != 'boolean') {
+                        options.push({
+                            label: TAPi18n.__("action_field_updates_field_operation_options_null",{},lng),
+                            value: 'null',
+                        })
+                    }
+                    options.push({
+                        label: TAPi18n.__("action_field_updates_field_operation_options_formula",{},lng),
+                        value: 'formula',
+                    });
+                    options.push({
+                        label: TAPi18n.__("action_field_updates_field_operation_options_literal",{},lng),
+                        value: 'literal',
+                    })
+                }
+                return options;
+            }
+        },
+        /* literal_value 字段使用*/
+        getLiteralValueOptions: {
+            async handler(ctx) {
+                const userSession = ctx.meta.user;
+                const lng = userSession.language || 'zh-CN';
+                const objectName = ctx.params.objectName;
+                const targetObject = ctx.params.targetObject;
+                const fieldName = ctx.params.fieldName;
+                
+                if (!objectName || !fieldName) {
+                    return []
+                }
+
+                let mainObjectName = null;
+                if (targetObject && targetObject != objectName) {
+                    const targetField = await objectql.getObjectConfig(objectName).fields[targetObject];
+                    mainObjectName = targetField && targetField.reference_to;
+                } else {
+                    mainObjectName = objectName;
+                }
+
+                const objectConfig = await objectql.getObjectConfig(mainObjectName);
+                let literal_value_schema = {
+                    "type": "text",
+                    "name": "literal_value",
+                    "label": "指定新字段值",
+                    "required": false,
+                    "is_wide": true,
+                    "labelClassName": "text-left"
+                }
+                if (objectConfig) {
+                    steedosI18n.translationObject(lng, objectConfig.name, objectConfig);
+                    const field = objectConfig.fields[fieldName];
+                    literal_value_schema = Object.assign({}, field, {
+                        name: "literal_value",
+                        label: "指定新字段值",
+                        disabled: false,
+                        readonly: false,
+                        is_wide: true
+                    });
+                }
+                return {
+                    "body": [
+                        {
+                            "type": "steedos-field",
+                            "field": literal_value_schema,
+                            "name": "literal_value",
+                            "clearValueOnHidden": true,
+                            "fieldName": "literal_value",
+                            "visibleOn": "this.operation === 'literal'"
+                        }
+                    ]
+                }
+            }
+        }
+    }
+};

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@steedos/standard-process-approval",
-    "version": "2.4.0-beta.7",
+    "version": "2.4.0",
     "main": "package.service.js",
     "private": false,
     "publishConfig": {
@@ -10,10 +10,10 @@
         "steedos"
     ],
     "dependencies": {
-        "@steedos/process": "2.4.0-beta.7"
+        "@steedos/process": "2.4.0"
     },
     "description": "steedos package",
     "repository": {},
     "license": "MIT",
-    "gitHead": "581c4cad88be53dbc0c6f4c4f13a3e645702d555"
+    "gitHead": "70a4e7417d8d86c47cf5c7e3bbe0e89f2cee4222"
 }