@steedos/standard-object-database 2.6.8-beta.1 → 2.6.8-beta.4

package/main/default/client/object_fields.client.js

@@ -209,4 +209,43 @@ Steedos.ObjectFieldManager.getSummaryFiltersOperation = function(field_type) {
     operations.push(optionals.equal, optionals.unequal);
   }
   return operations;
-};
+};
+
+(function () {
+  try {
+      var styleCss = $(`<style>
+          .defaultValue_field div:first-child{
+              flex-grow: 1;
+          }
+          .defaultValue_field .defaultValue_field_formula{
+              // margin: 4px;
+          }
+          .defaultValue_field .defaultValue_field_formula .antd-Form-label{
+              visibility: visible;
+          }
+
+          .defaultValue_field .defaultValue_field_formula_visible{
+              flex-grow: 1;
+          }
+          .defaultValue_field .defaultValue_field_formula_visible .antd-Form-label .antd-TplField{
+              visibility: visible;
+          }
+          .defaultValue_field .defaultValue_field_hidden{
+              display: none;
+          }
+          .defaultValue_field .defaultValue_field_formula_hidden{
+              flex-grow: 0;
+          }
+          .defaultValue_field .defaultValue_field_formula_hidden .antd-Form-label{
+              display: none;
+          }
+          .defaultValue_field .defaultValue_field_formula_hidden .antd-FormulaPicker-input{
+              display: none;
+          }
+
+      </style>`);
+      $("head").append(styleCss);
+  } catch (error) {
+      console.log(error);
+  }
+})();

package/main/default/objectTranslations/object_fields.en/object_fields.en.objectTranslation.yml

@@ -29,7 +29,7 @@ fields:
         value: text
       - label: Textarea
         value: textarea
-      - label: Html
+      - label: Rich text
         value: html
       - label: Code
         value: code
@@ -163,6 +163,22 @@ fields:
     label: Description
     help: 
     description: 
+  auto_fill_mapping:
+    label: Auto Fill Mapping
+    help: When the data is selected, the field values in the reference object are automatically filled into the current form field according to the following mapping.
+    description: 
+  auto_fill_mapping.$:
+    label: Auto Fill Mapping
+    help: 
+    description: 
+  auto_fill_mapping.$.from:
+    label: From:Fields in object that reference to
+    help: 
+    description: 
+  auto_fill_mapping.$.to:
+    label: To:Fields in the current form
+    help: 
+    description: 
   autonumber_enable_modify:
     label: Allow modification of numbers
     help: 

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

@@ -30,7 +30,7 @@ fields:
         value: text
       - label: 长文本
         value: textarea
-      - label: Html文本
+      - label: 富文本
         value: html
       - label: 代码
         value: code
@@ -155,6 +155,22 @@ fields:
     label: 描述
     help: 
     description: 
+  auto_fill_mapping:
+    label: 自动填充规则
+    help: 选择数据后，将按以下映射关系将引用对象中的字段值自动填充到当前表单字段中。
+    description: 
+  auto_fill_mapping.$:
+    label: 自动填充规则
+    help: 
+    description: 
+  auto_fill_mapping.$.from:
+    label: 从：引用对象中的字段
+    help: 
+    description: 
+  auto_fill_mapping.$.to:
+    label: 填充到：当前表单字段
+    help: 
+    description: 
   autonumber_enable_modify:
     label: 允许修改编号
     help: 

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

@@ -199,9 +199,49 @@ fields:
     amis:
       disabledOn: "${is_system == true}"
   defaultValue:
-    type: text
+    type: object
+    blackbox: true
     label: Default Value
     sort_no: 160
+    visible_on: "{{['autonumber','formula','summary','image','file'].indexOf(formData.type) > -1 ? false: true}}"
+    amis:
+      type: service
+      className: 
+        antd-Form-item: true 
+        antd-Form-item--normal: true 
+        m-0: true 
+        "md:border-b": global.mode === "read"
+        defaultValue_field: true 
+        flex: true
+      schemaApi:
+        url: "${context.rootUrl}/service/api/object_fields/defaultValue/schema"
+        method: post
+        data:
+          object: ${object}
+          name: ${name}
+          options: ${options}
+          type: ${type}
+          reference_to: ${reference_to}
+          multiple: ${multiple}
+          filtersFunction: ${filtersFunction}
+          reference_to_field: ${reference_to_field}
+          mode: ${global.mode}
+          scale: ${scale}
+          _id: ${_id}
+        trackExpression: "${object},${options},${type},${reference_to},${reference_to_field},${multiple},${filtersFunction},${_id},${scale}"
+        headers:
+          Authorization: "Bearer ${context.tenantId},${context.authToken}"
+        # sendOn: "!!this.type"
+      onEvent:
+        fetchSchemaInited:
+          weight: 0
+          actions:
+            - actionType: "setValue"
+              componentId: "service_detail_page"
+              args: 
+                value: 
+                  defaultValue: "${event.data.body[0].value}"
+              expression: "global.mode ==='read' && event.data.body[0].value"
   group:
     type: text
     label: Group
@@ -448,6 +488,14 @@ fields:
     amis:
       showIndex: true
       disabledOn: "${is_system == true}"
+      enableDialog: false
+      columns: 
+        - label
+        - value
+        - name: color
+          width: 170
+        - name: description
+          width: 300
   options.$:
     label: Options
     blackbox: true
@@ -468,6 +516,52 @@ fields:
     label: Description
     type: text
     required: false
+  auto_fill_mapping:
+    type: table
+    label: Auto Fill Mapping
+    is_wide: true
+    inlineHelpText: When the data is selected, the field values in the reference object are automatically filled into the current form field according to the following mapping.
+    visible_on: "{{(formData.type === 'lookup' || formData.type === 'master_detail') && formData.reference_to && !!!formData.multiple}}"
+    sort_no: 280
+    amis:
+      enableDialog: false
+      disabledOn: "${is_system == true}"
+  auto_fill_mapping.$:
+    label: Auto Fill Mapping
+    blackbox: true
+    type: object
+  auto_fill_mapping.$.from:
+    label: From:Fields in object that reference to
+    type: lookup
+    reference_to: object_fields
+    reference_to_field: name
+    required: true
+    depend_on:
+      - reference_to
+    filtersFunction: !<tag:yaml.org,2002:js/function> |-
+      function (filters, values) {
+        if(values && values.reference_to){
+          return ['object', '=', values.reference_to]
+        }else{
+          return ['_id', '=', 'no']
+        }
+      }
+  auto_fill_mapping.$.to:
+    label: To:Fields in the current form
+    type: lookup
+    reference_to: object_fields
+    reference_to_field: name
+    required: true
+    depend_on:
+      - object
+    filtersFunction: !<tag:yaml.org,2002:js/function> |-
+      function (filters, values) {
+        if(values && values.object){
+          return ['object', '=', values.object]
+        }else{
+          return ['_id', '=', 'no']
+        }
+      }
   formula_blank_value:
     type: select
     label: Blank Field Handling
@@ -586,7 +680,7 @@ fields:
     sort_no: 320
   summary_filters:
     label: Filter Criteria
-    type: 'grid'
+    type: 'table'
     inlineHelpText: Only records meeting certain criteria should be included in the calculation, all records should be included in the calculation while the criteria is empty.
     is_wide: true
     depend_on:
@@ -595,6 +689,8 @@ fields:
     sort_no: 330
     amis:
       disabledOn: "${is_system == true}"
+      inlineEditMode: true
+      showIndex: true
   summary_filters.$:
     label: Filter Criteria
     blackbox: true

package/main/default/objects/objects.action.js

@@ -177,6 +177,9 @@ module.exports = {
     if(!record){
         record = Creator.odata.get("objects", record_id, "is_deleted");
     }
+    if(record.is_system){
+        return false;
+    }
     if(record && !record.is_deleted){
         return Creator.baseObject.actions.standard_delete.visible.apply(this, arguments);
     }

package/main/default/pages/object_fields_form.page.amis.json

@@ -9,8 +9,24 @@
             "className": "",
             "enableTabs": true,
             "mode": "edit",
-            "layout": "normal",
-            "apiRequestAdaptor": "api.data.query = api.data.query.replace('object_fields__update', 'object_fields__upsert')",
+            "layout": "horizontal",
+            "onEvent": {
+                "change": {
+                    "actions": [
+                        {
+                            "actionType": "setValue",
+                            "args": {
+                                "value": {
+                                    "defaultValue": ""
+                                }
+                            },
+                            "expression": "${!!event.data.defaultValue_formula}"
+                        }
+                    ]
+                }
+            },
+            "initApiAdaptor": "const defaultValue_field_value = payload.data.defaultValue; if(defaultValue_field_value && _.isString(defaultValue_field_value) && defaultValue_field_value.indexOf('{')>-1 ){ payload.data.defaultValue_formula = defaultValue_field_value; delete payload.data.defaultValue; } return payload;",
+            "apiRequestAdaptor": "if(formData.defaultValue_formula){ formData.defaultValue = formData.defaultValue_formula }  __saveData = JSON.stringify(JSON.stringify(formData)); api.data = {query: query.replace('{__saveData}', __saveData)}; api.data.query = api.data.query.replace('object_fields__update', 'object_fields__upsert')",
             "submitSuccActions": [
                 {
                     "actionType": "custom",

package/main/default/pages/object_form.page.amis.json

@@ -10,7 +10,7 @@
             "className": "",
             "enableTabs": true,
             "mode": "edit",
-            "layout": "normal",
+            "layout": "horizontal",
             "apiRequestAdaptor": "console.log('api.data.query===', api.data.query);api.data.query = api.data.query.replace('objects__update', 'objects__upsert')",
             "submitSuccActions": [
                 {
@@ -21,7 +21,12 @@
                       "position": "top-right"
                     }
                 }
-            ]
+            ],
+            "fieldsExtend": {
+                "compactLayouts": {
+                    "label": ""
+                }
+            }
         }
     ],
     "data": {

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

@@ -0,0 +1,249 @@
+/*
+ * @Description: 提供action_field_updates(字段更新对象)需要的数据接口
+ */
+
+const register = require("@steedos/metadata-registrar");
+const steedosI18n = require("@steedos/i18n");
+const _ = require("lodash");
+const clone = require("clone");
+
+// 默认值字段代码：services/standard-object-database/main/default/services/object_fields.service.js
+
+module.exports = {
+    name: "object_fields",
+    mixins: [],
+    /**
+     * Settings
+     */
+    settings: {
+
+    },
+
+    /**
+     * Dependencies
+     */
+    dependencies: [],
+
+    /**
+     * Actions
+     */
+    actions: {
+        getDefaultValueSchema: {
+            // 需要传 objectName, targetObject(非必填), field_name 参数进来。
+            rest: {
+                method: "POST",
+                path: "/defaultValue/schema"
+            },
+            async handler(ctx) {
+                const data = await this.getDefaultValueSchema(ctx);
+                return { status: 0, msg: "", data: data }
+            }
+        }
+    },
+
+    /**
+     * Events
+     */
+    events: {
+
+    },
+
+    /**
+     * Methods
+     */
+    methods: {
+        /* defaultValue 字段使用*/
+        getDefaultValueSchema: {
+            async handler(ctx) {
+                // console.log('ctx==>', ctx);
+                const userSession = ctx.meta.user;
+                const lng = userSession.language || 'zh-CN';
+                const type = ctx.params.type || 'text';
+                const objectName = ctx.params.object;
+                const fieldName = ctx.params.name;
+                const reference_to = ctx.params.reference_to;
+                const options = ctx.params.options;
+                const multiple = ctx.params.multiple;
+                const filtersFunction = ctx.params.filtersFunction;
+                const reference_to_field = ctx.params.reference_to_field || '_id';
+                const _id = ctx.params._id;
+                const mode = ctx.params.mode;
+                const scale = ctx.params.scale;
+                // const mode = global.mode;
+                
+                const partialType = ['text','textarea','html','code','markdown','boolean','toggle','date','datetime','time','password','url','email','color','location']; 
+                // const fieldType = partialType.indexOf(type) > -1 ? type : 'text'; 
+
+                let targetField = null;
+                let NAME_FIELD_KEY = null;
+                if (mode === 'read') {
+                    const objectConfig = await register.getObjectConfig(objectName);
+                    NAME_FIELD_KEY = objectConfig.NAME_FIELD_KEY || 'name';
+                    targetField = objectConfig.fields[fieldName];
+                }
+                // console.log('targetField==>', targetField);
+                const value = (targetField && targetField.defaultValue) || '';
+                const translatedLabel = lng === 'zh-CN' ? "默认值" : 'DefaultValue';
+                let defaultValue_schema = {
+                    "type": "text",
+                    "name": "defaultValue",
+                    "label": translatedLabel,
+                    "labelClassName": "text-left"
+                }
+                
+                if(partialType.indexOf(type) > -1){
+                    defaultValue_schema.type = type;
+                }else if(type === 'select' && options){
+                    defaultValue_schema.type = type;
+                    defaultValue_schema.options = options;
+                    defaultValue_schema.multiple = multiple;
+                }else if(['lookup','master_detail'].includes(type) && reference_to){
+                    defaultValue_schema.type = type;
+                    defaultValue_schema.reference_to = reference_to;
+                    defaultValue_schema.multiple = multiple;
+                    defaultValue_schema.filtersFunction = filtersFunction;
+                    defaultValue_schema.reference_to_field = reference_to_field;
+                } else if(['number','currency','percent'].includes(type)){
+                    defaultValue_schema.type = type;
+                    defaultValue_schema.scale = scale;
+                }
+                
+                let steedos_field = {
+                    type:'steedos-field', 
+                    name:'defaultValue', 
+                    clearValueOnHidden: true,
+                    fieldName: 'defaultValue', 
+                    field: defaultValue_schema,
+                    value: value,
+                    readonly: mode === 'read' ?  true : false
+                };
+                if(mode === 'read'){
+                    const baseFieldConfig = {
+                        "name": "defaultValue",
+                        "label": translatedLabel,
+                        "labelClassName": "text-left",
+                        "clearValueOnHidden": true,
+                        "fieldName": "defaultValue"
+                    }
+                    if(_.isString(value) && value.indexOf('{')>-1){
+                        // 只读时值是公式就显示公式
+                        steedos_field = {
+                            "type": "control",
+                            "label": translatedLabel,
+                            "body": {
+                                "name": "defaultValue",
+                                "label": translatedLabel,
+                                "labelClassName": "text-left",
+                                "type": "tpl",
+                                "tpl": value.indexOf('$') > -1 ? "\\"+value : value
+                            }
+                        }
+                    }else if(['number','currency','percent'].includes(type)){
+                        steedos_field = {
+                            ...baseFieldConfig,
+                            "type": "static-tpl",
+                            "tpl": `<div>${value}</div>`,
+                            "className": "m-1 md:border-b steedos-static-tpl-readonly",
+                            "quickEdit": false,
+                        }
+                    }else if(['date','datetime','time'].includes(type)){
+                        let fieldTypeConfig ={};
+                        if(type==='date'){
+                            fieldTypeConfig = {
+                                "type": "input-date",
+                                "inputFormat": "YYYY-MM-DD",
+                                "format": "YYYY-MM-DDT00:00:00.000[Z]",
+                                "className": "m-1 steedos-input-date-edit",
+                            }
+                        }else if(type==='datetime'){
+                            fieldTypeConfig = {
+                                "type": "input-datetime",
+                                "inputFormat": "YYYY-MM-DD HH:mm",
+                                "format": "YYYY-MM-DDTHH:mm:ss.SSSZ",
+                                "className": "m-1 steedos-input-datetime-edit",
+                            }
+                        }else if(type==='time'){
+                            fieldTypeConfig = {
+                                "type": "input-time",
+                                "inputFormat": "HH:mm",
+                                "format": "1970-01-01THH:mm:00.000[Z]",
+                                "className": "m-1 steedos-input-time-edit",
+                            }
+                        }
+                        steedos_field = {
+                            ...baseFieldConfig,
+                            ...fieldTypeConfig,
+                            value: value,
+                            static: true
+                        }
+                    }else if(['boolean'].includes(type)){
+                        steedos_field = {
+                            ...baseFieldConfig,
+                            value: value,
+                            "type": "static",
+                            "tpl": `${value}`,
+                            "className": "m-1 md:border-b steedos-static-readonly"
+                        }
+                    }else if(['lookup','master_detail'].includes(type)){
+                        // console.log('t==>', type, reference_to, NAME_FIELD_KEY, targetField)
+                        if(value && value.length && _.isString(reference_to)){
+                            const query = {
+                                fields: [NAME_FIELD_KEY],
+                                filters: [reference_to_field, '=', value]
+                            }
+                            const res = await this.broker.call(
+                                'objectql.find', 
+                                {
+                                  objectName: reference_to,
+                                  query
+                                }
+                            );
+                            // console.log('res==>', res, reference_to, NAME_FIELD_KEY, targetField);
+                            const tpl = _.map(res, NAME_FIELD_KEY).join('、')
+                            steedos_field = {
+                                "type": "control",
+                                "label": translatedLabel,
+                                "body": {
+                                    "name": "defaultValue",
+                                    "label": translatedLabel,
+                                    "labelClassName": "text-left",
+                                    "type": "tpl",
+                                    "tpl": tpl
+                                },
+                                value: value
+                            }
+                        }
+                    }
+                }
+                let body = [
+                    steedos_field
+                ]
+                if(mode === 'edit'){
+                    body[0].field.amis = {
+                        // disabledOn: "!!this.defaultValue_formula",
+                        "className": {
+                            "defaultValue_field_hidden": "!this.defaultValue && (!this.defaultValue || '').toString() && !!this.defaultValue_formula"
+                        }
+                    }
+                    body.push({
+                        "name": "defaultValue_formula",
+                        "label": translatedLabel,
+                        "evalMode": false,
+                        "type": "input-formula",
+                        "placeholder": "公式",
+                        // "disabledOn": "!!this.defaultValue && !!this.defaultValue.toString()",
+                        "className": {
+                            "defaultValue_field_formula": true,
+                            "defaultValue_field_formula_visible": "!!this.defaultValue_formula",
+                            "defaultValue_field_formula_hidden": "(!!this.defaultValue && !!this.defaultValue.toString()) || (!this.defaultValue && !this.defaultValue_formula)"
+                        }
+                    })
+                }
+                // console.log('body==>', body);
+                return {
+                    body
+                }
+            }
+        }
+    }
+};

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@steedos/standard-object-database",
-    "version": "2.6.8-beta.1",
+    "version": "2.6.8-beta.4",
     "main": "package.service.js",
     "private": false,
     "publishConfig": {
@@ -12,10 +12,10 @@
     "description": "steedos package",
     "dependencies": {
         "@steedos-widgets/amis-lib": "^1.0.22",
-        "@steedos/metadata-core": "2.6.8-beta.1",
-        "@steedos/standard-objects": "2.6.8-beta.1"
+        "@steedos/metadata-core": "2.6.8-beta.4",
+        "@steedos/standard-objects": "2.6.8-beta.4"
     },
     "repository": {},
     "license": "MIT",
-    "gitHead": "73f9e280508031703d48fe2d339778aa5579bff1"
+    "gitHead": "8a12f13e28a5b7faab37c00a5e894bffda4c5c91"
 }