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

package/dist/amis/AmisRecordDetail.d.ts

@@ -23,20 +23,10 @@ export declare const AmisRecordDetail: (props: any) => Promise<{
         objectApiName: string;
         recordId: string;
         id: string;
-        onEvent: {
-            recordLoaded: {
-                actions: {
-                    actionType: string;
-                    data: {
-                        name: string;
-                        record: string;
-                        _id: string;
-                        recordId: string;
-                        recordLoaded: boolean;
-                    };
-                }[];
-            };
-        };
     })[];
+    data: {
+        "_master.objectName": string;
+        "_master.recordId": string;
+    };
     onEvent: any;
 }>;

package/dist/amis-object.cjs.css

@@ -304,8 +304,8 @@ body {
 .top-0 {
     top: 0px
 }
-.z-50 {
-    z-index: 50
+.z-10 {
+    z-index: 10
 }
 .col-span-2 {
     grid-column: span 2 / span 2

package/dist/amis-object.cjs.js

@@ -721,7 +721,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:
  */
 
@@ -748,10 +748,11 @@ const Router$1 = {
     },
     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$1.getTabDisplayAs(objectName);
+        const displayAs =  Router$1.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%>`;
         }
@@ -767,7 +768,7 @@ const Router$1 = {
  * @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: 
  */
 
@@ -962,6 +963,7 @@ async function getFieldTpl (field, options){
         case 'number':
         case 'currency':
             return await getNumberTpl(field);
+        case 'percent':
         case 'formula':
         case 'summary':
             return getUiFieldTpl(field)
@@ -994,7 +996,7 @@ async function getFieldsTemplate(fields, expand){
             if(___default.includes(['time','date','datetime','boolean','number','currency'], field.type)){
                 fieldsName.push(`${field.name}`);
             }
-            if(___default.includes(['time','filesize','date','datetime','boolean','number','currency', 'select', 'file', 'image', 'avatar', 'formula', 'summary', 'object', 'grid'], field.type)){
+            if(___default.includes(['percent','time','filesize','date','datetime','boolean','number','currency', 'select', 'file', 'image', 'avatar', 'formula', 'summary', 'object', 'grid'], field.type)){
                 displayFields.push(`${field.name}`);
             }
         }
@@ -1749,7 +1751,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: 
  */
 
@@ -1773,16 +1775,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){
@@ -1818,7 +1824,6 @@ const getSchema$4 = async (uiSchema, ctx) => {
                                         "_master": "${_master}",
                                         "_master._isRelated": "${_isRelated}",
                                         "_master.relatedKey": "${relatedKey}",
-                                        "defaultData": "${defaultData}",
                                         "appId": "${appId}",
                                         "objectName": "${objectName}",
                                         "context": "${context}",
@@ -1875,7 +1880,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: 
  */
 
@@ -1883,6 +1888,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;
     }
 }
@@ -7863,8 +7875,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:
  */
 
@@ -7986,8 +7998,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]
@@ -8049,14 +8059,7 @@ async function getRecordDetailRelatedListSchema(objectName, recordId, relatedObj
                 _isRelated: true
             },
             body:[
-                {
-                    ...amisSchema,
-                    data: {
-                        defaultData: {
-                            ...{[relatedKey]: getRelatedFieldValue(objectName, relatedValue, relatedObjectUiSchema, relatedKey)}
-                        }
-                    }
-                }
+                amisSchema
             ]
         }
     };
@@ -8209,7 +8212,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:
  */
 
@@ -8658,35 +8661,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": [
@@ -8694,10 +8681,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}"
                             }
                         }
                     ]
@@ -12353,7 +12340,7 @@ var AmisRecordDetailHeader = function (props) { return __awaiter(void 0, void 0,
     return __generator(this, function (_d) {
         switch (_d.label) {
             case 0:
-                _a = props.className, className = _a === void 0 ? 'sticky top-0 z-50 bg-gray-100 border-b sm:shadow sm:rounded sm:border border-slate-300 p-4' : _a;
+                _a = props.className, className = _a === void 0 ? 'sticky top-0 z-10 bg-gray-100 border-b sm:shadow sm:rounded sm:border border-slate-300 p-4' : _a;
                 return [4 /*yield*/, getUISchema(props.objectApiName || "space_users", false)];
             case 1:
                 objectUiSchema = _d.sent();
@@ -12363,17 +12350,11 @@ var AmisRecordDetailHeader = function (props) { return __awaiter(void 0, void 0,
                             {
                                 "actionType": "reload",
                                 "data": {
-                                    "name": "${record.".concat((objectUiSchema === null || objectUiSchema === void 0 ? void 0 : objectUiSchema.NAME_FIELD_KEY) || 'name', "}"),
-                                    "record": "${record}",
-                                    "recordLoaded": true
-                                }
-                            },
-                            {
-                                "actionType": "setValue",
-                                "args": {
-                                    "value": {
-                                        "recordLoaded": true,
-                                    }
+                                    "name": "${event.data.record.".concat((objectUiSchema === null || objectUiSchema === void 0 ? void 0 : objectUiSchema.NAME_FIELD_KEY) || 'name', "}"),
+                                    "record": "${event.data.record}",
+                                    "_id": "\${event.data.record._id}",
+                                    "recordId": "\${event.data.record._id}",
+                                    "recordLoaded": true,
                                 }
                             }
                         ]
@@ -12394,17 +12375,17 @@ var AmisRecordDetailHeader = function (props) { return __awaiter(void 0, void 0,
 /*
  * @Author: baozhoutao@steedos.com
  * @Date: 2022-12-08 10:32:17
- * @LastEditors: baozhoutao@steedos.com
- * @LastEditTime: 2023-03-22 15:41:38
+ * @LastEditors: 殷亮辉 yinlianghui@hotoa.com
+ * @LastEditTime: 2023-04-11 11:28:41
  * @Description:
  */
 var AmisRecordDetail = function (props) { return __awaiter(void 0, void 0, void 0, function () {
-    var className, appId, _a, objectApiName, recordId, onEvent, schema, recordDetailData;
+    var className, appId, _a, objectApiName, recordId, body, schema, recordDetailData;
     return __generator(this, function (_b) {
         switch (_b.label) {
             case 0:
-                className = props.className, props.$schema, appId = props.appId, _a = props.objectApiName, objectApiName = _a === void 0 ? "space_users" : _a, recordId = props.recordId, onEvent = props.onEvent, props.defaultData;
-                return [4 /*yield*/, getRecordDetailSchema(objectApiName, appId, { onEvent: onEvent })];
+                className = props.className, props.$schema, appId = props.appId, _a = props.objectApiName, objectApiName = _a === void 0 ? "space_users" : _a, recordId = props.recordId, props.onEvent, props.defaultData, body = props.body;
+                return [4 /*yield*/, getRecordDetailSchema(objectApiName, appId)];
             case 1:
                 schema = (_b.sent()).amisSchema;
                 recordDetailData = {};
@@ -12413,6 +12394,9 @@ var AmisRecordDetail = function (props) { return __awaiter(void 0, void 0, void
                 }
                 schema.data = Object.assign({}, schema.data, recordDetailData);
                 schema.className = className;
+                if (body) {
+                    schema.body = body;
+                }
                 return [2 /*return*/, schema];
         }
     });
@@ -12663,8 +12647,6 @@ var AmisAppLauncher = function (props) { return __awaiter(void 0, void 0, void 0
                                         "items": {
                                             "type": "button",
                                             "level": "link",
-                                            "actionType": "link",
-                                            "link": "${path}",
                                             "body": [{
                                                     "type": "tpl",
                                                     "tpl": "<div class='slds-app-launcher__tile slds-text-link_reset'><div class='slds-app-launcher__tile-figure'><svg class='w-12 h-12 slds-icon slds-icon_container slds-icon-standard-${REPLACE(icon, '_', '-')}' aria-hidden='true'><use xlink:href='/assets/icons/standard-sprite/svg/symbols.svg#${icon}'></use></svg><span class='slds-assistive-text'>${name}</span></div><div class='slds-app-launcher__tile-body'><span class='slds-link text-blue-600 text-lg'><span title='${name}'>${name}</span></span><div style='display: -webkit-box; -webkit-line-clamp: 1;-webkit-box-orient: vertical;overflow: hidden;'><span title='${description}'>${description}</span></div></div></div>",
@@ -12691,6 +12673,21 @@ var AmisAppLauncher = function (props) { return __awaiter(void 0, void 0, void 0
                                                     "actions": [
                                                         {
                                                             "actionType": "closeDialog"
+                                                        },
+                                                        {
+                                                            "actionType": "link",
+                                                            "args": {
+                                                                "link": "${path}"
+                                                            },
+                                                            "expression": "${!blank}"
+                                                        },
+                                                        {
+                                                            "actionType": "url",
+                                                            "args": {
+                                                                "url": "${path}",
+                                                                "blank": true
+                                                            },
+                                                            "expression": "${blank}"
                                                         }
                                                     ]
                                                 }
@@ -13422,7 +13419,7 @@ var PageListView = function (props) { return __awaiter(void 0, void 0, void 0, f
                     appId: appId,
                     name: objectApiName,
                 });
-                listSchema = page ? JSON.parse(page.schema) : {
+                listSchema = page ? page.schema : {
                     "type": "steedos-object-listview",
                     "objectApiName": objectApiName,
                     "columnsTogglable": false,
@@ -13476,7 +13473,7 @@ var PageRecordDetail = function (props) { return __awaiter(void 0, void 0, void
                 return [4 /*yield*/, getPage({ type: 'record', appId: appId, objectName: objectApiName, formFactor: defaultFormFactor })];
             case 2:
                 recordPage = _a.sent();
-                recordSchema = recordPage ? JSON.parse(recordPage.schema) : {
+                recordSchema = recordPage ? recordPage.schema : {
                     "type": "wrapper",
                     "className": "overflow-y-auto p-0 m-0 flex-1 h-full",
                     "name": "amis-".concat(appId, "-").concat(objectApiName, "-detail"),
@@ -13490,32 +13487,9 @@ var PageRecordDetail = function (props) { return __awaiter(void 0, void 0, void
                         }
                     ],
                 };
-                recordSchema = {
-                    "type": "service",
-                    "body": [recordSchema],
-                    data: {
-                        "_master.objectName": "${objectName}",
-                        "_master.recordId": "${recordId}"
-                    },
-                    onEvent: {
-                        "recordLoaded": {
-                            "actions": [
-                                {
-                                    "actionType": "reload",
-                                    "data": {
-                                        "_master.record": "${record}",
-                                        // 不清楚reload 如何给对象下的某个key复制, 所以此处重复设置_master的objectName、recordId
-                                        "_master.objectName": "${objectName}",
-                                        "_master.recordId": "${recordId}"
-                                    }
-                                }
-                            ]
-                        }
-                    }
-                };
                 _a.label = 3;
             case 3:
-                listSchema = listPage ? JSON.parse(listPage.schema) : {
+                listSchema = listPage ? listPage.schema : {
                     "type": "steedos-object-listview",
                     "objectApiName": sideObject,
                     "columnsTogglable": false,
@@ -13540,7 +13514,7 @@ var PageRecordDetail = function (props) { return __awaiter(void 0, void 0, void
                             },
                             {
                                 "type": "wrapper",
-                                "className": 'p-0 flex-1 focus:outline-none lg:order-last h-full',
+                                "className": 'overflow-y-auto p-0 flex-1 focus:outline-none lg:order-last h-full',
                                 "body": ___default.defaultsDeep({ data: defData }, recordSchema)
                             }
                         ]