@steedos-widgets/amis-lib 1.2.0-beta.1 → 1.2.0

package/dist/index.esm.js

@@ -334,7 +334,7 @@ const getSteedosAuth = () => {
  * @Author: baozhoutao@steedos.com
  * @Date: 2022-08-16 17:02:08
  * @LastEditors: baozhoutao@steedos.com
- * @LastEditTime: 2023-03-03 14:52:18
+ * @LastEditTime: 2023-04-11 09:57:37
  * @Description:
  */
 
@@ -361,10 +361,11 @@ const Router = {
     },
     getObjectDetailPath(props){
         const {formFactor, appId, objectName, recordId, listViewName, _templateType} = props;
+        // var urlParams = new URLSearchParams(window.location.search);
         // if(objectName === 'instances'){
         //     return `/workflow/space/\${context.tenantId}/\${listName}/${recordId}`;
         // }
-        const displayAs = Router.getTabDisplayAs(objectName);
+        const displayAs =  Router.getTabDisplayAs(objectName); //urlParams.get("display") ||
         if(_templateType === 'JavaScript'){
             return `/app/${appId}/${objectName}/view/${recordId}?display=${displayAs}&side_object=<%=item.objectName%>&side_listview_id=<%=item.listName%>`;
         }
@@ -380,7 +381,7 @@ const Router = {
  * @Author: baozhoutao@steedos.com
  * @Date: 2022-05-23 09:53:08
  * @LastEditors: baozhoutao@steedos.com
- * @LastEditTime: 2023-03-09 10:00:44
+ * @LastEditTime: 2023-04-10 11:22:54
  * @Description: 
  */
 
@@ -575,6 +576,7 @@ async function getFieldTpl (field, options){
         case 'number':
         case 'currency':
             return await getNumberTpl(field);
+        case 'percent':
         case 'formula':
         case 'summary':
             return getUiFieldTpl(field)
@@ -607,7 +609,7 @@ async function getFieldsTemplate(fields, expand){
             if(includes(['time','date','datetime','boolean','number','currency'], field.type)){
                 fieldsName.push(`${field.name}`);
             }
-            if(includes(['time','filesize','date','datetime','boolean','number','currency', 'select', 'file', 'image', 'avatar', 'formula', 'summary', 'object', 'grid'], field.type)){
+            if(includes(['percent','time','filesize','date','datetime','boolean','number','currency', 'select', 'file', 'image', 'avatar', 'formula', 'summary', 'object', 'grid'], field.type)){
                 displayFields.push(`${field.name}`);
             }
         }
@@ -1362,7 +1364,7 @@ var config = {
  * @Author: baozhoutao@steedos.com
  * @Date: 2022-11-01 15:51:00
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2023-04-08 12:05:19
+ * @LastEditTime: 2023-04-11 13:58:24
  * @Description: 
  */
 
@@ -1386,16 +1388,20 @@ const getSchema$4 = async (uiSchema, ctx) => {
             const relatedKey = _master.relatedKey;
             const masterObjectName = _master.objectName;
             const recordId = _master.recordId;
+            let relatedKeySaveValue = recordId;
             const fields = ${JSON.stringify(uiSchema.fields)};
             const relatedField = fields[relatedKey];
+            if(relatedField.reference_to_field && relatedField.reference_to_field !== '_id'){
+                relatedKeySaveValue = _master.record[relatedField.reference_to_field];
+            }
             let defaultData = {}; 
             let relatedKeyValue; 
             if(!_.isString(relatedField.reference_to)){
-                relatedKeyValue = { o: masterObjectName, ids: [recordId] };
+                relatedKeyValue = { o: masterObjectName, ids: [relatedKeySaveValue] };
             }else if (relatedField.multiple) {
-                relatedKeyValue = [recordId];
+                relatedKeyValue = [relatedKeySaveValue];
             } else {
-                relatedKeyValue = recordId;
+                relatedKeyValue = relatedKeySaveValue;
             }
             defaultData[relatedKey]=relatedKeyValue;
             if(payload.schema){
@@ -1431,7 +1437,6 @@ const getSchema$4 = async (uiSchema, ctx) => {
                                         "_master": "${_master}",
                                         "_master._isRelated": "${_isRelated}",
                                         "_master.relatedKey": "${relatedKey}",
-                                        "defaultData": "${defaultData}",
                                         "appId": "${appId}",
                                         "objectName": "${objectName}",
                                         "context": "${context}",
@@ -1488,7 +1493,7 @@ const getSchema$4 = async (uiSchema, ctx) => {
  * @Author: baozhoutao@steedos.com
  * @Date: 2022-07-13 15:18:03
  * @LastEditors: baozhoutao@steedos.com
- * @LastEditTime: 2022-11-08 09:35:03
+ * @LastEditTime: 2023-04-11 10:34:26
  * @Description: 
  */
 
@@ -1496,6 +1501,13 @@ async function getPage({type, pageId = '', appId, objectName = '', recordId = ''
     const api = `/api/pageSchema/${type}?app=${appId}&objectApiName=${objectName}&recordId=${recordId}&pageId=${pageId}&formFactor=${formFactor}`;
     const page = await fetchAPI(api);
     if (page && page.schema) {
+        page.schema = JSON.parse(page.schema);
+        if(page.schema.data){
+            delete page.schema.data.recordId;
+            delete page.schema.data.objectName;
+            delete page.schema.data.context;
+            delete page.schema.data.global;
+        }
         return page;
     }
 }
@@ -7476,8 +7488,8 @@ const getRecordPermissions = async (objectName, recordId)=>{
 /*
  * @Author: baozhoutao@steedos.com
  * @Date: 2022-07-05 15:55:39
- * @LastEditors: 殷亮辉 yinlianghui@hotoa.com
- * @LastEditTime: 2023-04-08 18:14:55
+ * @LastEditors: Please set LastEditors
+ * @LastEditTime: 2023-04-11 13:13:00
  * @Description:
  */
 
@@ -7599,8 +7611,6 @@ async function getRecordDetailRelatedListSchema(objectName, recordId, relatedObj
             }
         }
     }
-
-    let relatedValue = "${recordId}";
     // if(refField.reference_to_field && refField.reference_to_field != '_id'){
     //     const masterRecord = await getRecord(objectName, recordId, [refField.reference_to_field]);
     //     relatedValue = masterRecord[refField.reference_to_field]
@@ -7662,14 +7672,7 @@ async function getRecordDetailRelatedListSchema(objectName, recordId, relatedObj
                 _isRelated: true
             },
             body:[
-                {
-                    ...amisSchema,
-                    data: {
-                        defaultData: {
-                            ...{[relatedKey]: getRelatedFieldValue(objectName, relatedValue, relatedObjectUiSchema, relatedKey)}
-                        }
-                    }
-                }
+                amisSchema
             ]
         }
     };
@@ -7822,7 +7825,7 @@ async function getRelatedListSchema(
  * @Author: baozhoutao@steedos.com
  * @Date: 2022-07-05 15:55:39
  * @LastEditors: 殷亮辉 yinlianghui@hotoa.com
- * @LastEditTime: 2023-04-08 17:31:57
+ * @LastEditTime: 2023-04-11 11:28:11
  * @Description:
  */
 
@@ -8271,35 +8274,19 @@ async function getRecordDetailSchema(objectName, appId, props = {}){
         amisSchema: {
             "type": "service",
             "body": [
-              {
-                "type": "steedos-record-detail-header",
-                "label": "标题面板",
-                "objectApiName": "${objectName}",
-                "recordId": "${recordId}",
-                "id": "u:48d2c28eb755",
-                onEvent: {
-                    "recordLoaded": {
-                        "actions": [
-                            {
-                                "actionType": "reload",
-                                "data": {
-                                    "name": `\${event.data.record.${uiSchema?.NAME_FIELD_KEY || 'name'}}`,
-                                    "record": `\${event.data.record}`,
-                                    "_id": "\${event.data.record._id}",
-                                    "recordId": "\${event.data.record._id}",
-                                    "recordLoaded": true,
-                                }
-                            }
-                        ]
-                      }
+                {
+                    "type": "steedos-record-detail-header",
+                    "label": "标题面板",
+                    "objectApiName": "${objectName}",
+                    "recordId": "${recordId}",
+                    "id": "u:48d2c28eb755"
                 },
-              },
-              content
+                content
             ],
-            // data: {
-            //     "_master.objectName": "${objectName}",  
-            //     "_master.recordId": "${recordId}"
-            // },
+            data: {
+                "_master.objectName": "${objectName}",  
+                "_master.recordId": "${recordId}"
+            },
             onEvent: {
                 "recordLoaded": {
                     "actions": [
@@ -8307,10 +8294,10 @@ async function getRecordDetailSchema(objectName, appId, props = {}){
                             "actionType": "reload",
                             "data": {
                                 "name": `\${record.${uiSchema.NAME_FIELD_KEY || 'name'}}`,
-                                // "_master.record": `\${record}`, 
-                                // // 不清楚reload 如何给对象下的某个key复制, 所以此处重复设置_master的objectName、recordId
-                                // "_master.objectName": "${objectName}", 
-                                // "_master.recordId": "${recordId}"
+                                "_master.record": `\${record}`, 
+                                // 不清楚reload 如何给对象下的某个key复制, 所以此处重复设置_master的objectName、recordId
+                                "_master.objectName": "${objectName}", 
+                                "_master.recordId": "${recordId}"
                             }
                         }
                     ]