@steedos-widgets/amis-object 3.6.3 → 3.6.4-beta.1

package/dist/amis/AmisRecordService.d.ts

@@ -8,6 +8,11 @@ export declare const AmisRecordService: (props: any) => Promise<{
                 componentId: string;
                 expression: string;
                 script?: undefined;
+            } | {
+                actionType: string;
+                expression: string;
+                componentId?: undefined;
+                script?: undefined;
             } | {
                 actionType: string;
                 script: string;

package/dist/amis-object.cjs.css

@@ -918,6 +918,9 @@ fieldset.antd-Collapse > legend{
 .border-r {
     border-right-width: 1px
 }
+.border-t {
+    border-top-width: 1px
+}
 .border-solid {
     border-style: solid
 }

package/dist/amis-object.cjs.js

@@ -3664,8 +3664,8 @@ function getComparableAmisVersion() {
 /*
  * @Author: baozhoutao@steedos.com
  * @Date: 2022-05-23 09:53:08
- * @LastEditors: liaodaxue
- * @LastEditTime: 2024-01-17 16:00:27
+ * @LastEditors: baozhoutao@steedos.com
+ * @LastEditTime: 2024-02-19 11:57:49
  * @Description: 
  */
 
@@ -3751,7 +3751,11 @@ function getNameTpl(field, ctx){
     if(ctx && ctx.isLookup){
         linkTarget = "target='_blank'";
     }
-    return `<a href="${href}" ${linkTarget}>\${${field.name} | raw}</a>`
+    if(ctx.isRelated){
+        return `<a href="${href}" ${linkTarget} onclick="return false;">\${${field.name} | raw}</a>`
+    }else {
+        return `<a href="${href}" ${linkTarget}>\${${field.name} | raw}</a>`
+    }
 }
 
 function getRelatedFieldTpl(field, ctx){
@@ -3780,6 +3784,9 @@ function getRelatedFieldTpl(field, ctx){
     if(_.isString(field.reference_to) || !field.reference_to){
         if(field.multiple){
             let labelTpl = `<%=item.label%>`;
+            if(ctx.isRelated){
+                linkTarget = "target='_blank'";
+            }
             if(!onlyDisplayLookLabel){
                 const href = Router$1.getObjectDetailPath({
                     formFactor: ctx.formFactor, appId: "<%=data.appId%>", objectName: `<%=item.objectName%>`, recordId: `<%=item.value%>`, _templateType: "JavaScript"
@@ -3802,7 +3809,12 @@ function getRelatedFieldTpl(field, ctx){
                 const href = Router$1.getObjectDetailPath({
                     formFactor: ctx.formFactor, appId: "${appId}", objectName: `${objectNameTpl}`, recordId: `${recordIdTpl}`
                 });
-                labelTpl = `<a href="${href}" ${linkTarget}>${labelTpl}</a>`;
+                if(ctx.isRelated){
+                    labelTpl = `<a href="${href}" ${linkTarget} onclick="return false;">${labelTpl}</a>`;
+                }else {
+                    labelTpl = `<a href="${href}" ${linkTarget}>${labelTpl}</a>`;
+                }
+                
             }
             tpl = labelTpl;
         }
@@ -3917,27 +3929,29 @@ async function getFieldsTemplate(fields, display){
         fieldsArr = _$1__namespace.values(fields);
     }
     for (const field of fieldsArr) {
-        //graphql 的  ui\display 中使用的字段需要先在query中查询. 否则会返回null
-        if(field.expand){
-            expandFields.push(field);
-        }else {
-            if(field.name.indexOf('.') < 0){
-                if(display && (field.type == 'lookup' || field.type == 'master_detail')){
-                    fieldsName.push(`${field.name}`);
-                    displayFields.push(`${field.name}`);
+        if(field.name){
+            //graphql 的  ui\display 中使用的字段需要先在query中查询. 否则会返回null
+            if(field.expand){
+                expandFields.push(field);
+            }else {
+                if(field.name.indexOf('.') < 0){
+                    if(display && (field.type == 'lookup' || field.type == 'master_detail')){
+                        fieldsName.push(`${field.name}`);
+                        displayFields.push(`${field.name}`);
+                    }else {
+                        fieldsName.push( field.alias ? `${field.alias}:${field.name}` : field.name);
+                    }
+                    if(_$1.includes(['time','date','datetime','boolean','number','currency'], field.type)){
+                        fieldsName.push(`${field.name}`);
+                    }
+                    if(_$1.includes(['percent','time','filesize','date','datetime','boolean','number','currency', 'select', 'file', 'image', 'avatar', 'formula', 'summary', 'object', 'grid'], field.type)){
+                        displayFields.push(`${field.name}`);
+                    }
                 }else {
-                    fieldsName.push( field.alias ? `${field.alias}:${field.name}` : field.name);
-                }
-                if(_$1.includes(['time','date','datetime','boolean','number','currency'], field.type)){
-                    fieldsName.push(`${field.name}`);
+                    objectFieldName = field.name.split('.')[0];
+                    fieldsName.push(objectFieldName);
+                    displayFields.push(objectFieldName);
                 }
-                if(_$1.includes(['percent','time','filesize','date','datetime','boolean','number','currency', 'select', 'file', 'image', 'avatar', 'formula', 'summary', 'object', 'grid'], field.type)){
-                    displayFields.push(`${field.name}`);
-                }
-            }else {
-                objectFieldName = field.name.split('.')[0];
-                fieldsName.push(objectFieldName);
-                displayFields.push(objectFieldName);
             }
         }
     }
@@ -5451,6 +5465,54 @@ async function getTableColumns$1(fields, options){
                     columnItem.type = 'color';
                     columnItem.defaultColor = null;
                 }
+
+                if(((field.is_name || field.name === options.labelFieldName) || ((field.type == 'lookup' || field.type == 'master_detail') && _$1__namespace.isString(field.reference_to) && field.multiple != true)) && options.isRelated){
+                    
+                    const drawerRecordDetailSchema = {
+                        "type": "steedos-record-detail",
+                        "objectApiName": "${objectName}",
+                        "recordId": `\${${options.idFieldName}}`,
+                        "showBackButton": false,
+                        "showButtons": true,
+                        "data": {
+                          "_inDrawer": true,  // 用于判断是否在抽屉中
+                          "recordLoaded": false, // 重置数据加载状态
+                        }
+                    };
+
+
+                    if(!(field.is_name || field.name === options.labelFieldName)){
+                        drawerRecordDetailSchema.objectApiName = field.reference_to;
+                        drawerRecordDetailSchema.recordId = `\${_display.${field.name}.value}`;
+                    }
+                    
+                    columnItem.onEvent = {
+                        "click": {
+                          "actions": [
+                            {
+                                "actionType": "drawer",
+                                "drawer": {
+                                  "type": "drawer",
+                                  "title": "&nbsp;",
+                                  "headerClassName": "",
+                                  "size": "lg",
+                                  "bodyClassName": "p-0 m-0 border-t",
+                                  "closeOnEsc": true,
+                                  "resizable": true,
+                                  "actions": [],
+                                  "body": [
+                                    drawerRecordDetailSchema
+                                  ],
+                                  "className": "app-popover",
+                                  "id": "u:fc5f055afa8c"
+                                },
+                                "preventDefault": true
+                            }
+                          ]
+                        }
+                    };
+                }
+
             }
         }
         if(columnItem){
@@ -7683,8 +7745,8 @@ const parseSingleExpression$1 = function (func, formData, dataPath, global, user
 /*
  * @Author: baozhoutao@steedos.com
  * @Date: 2022-11-01 15:51:00
- * @LastEditors: 殷亮辉 yinlianghui@hotoa.com
- * @LastEditTime: 2023-09-25 14:53:05
+ * @LastEditors: baozhoutao@steedos.com
+ * @LastEditTime: 2024-02-18 18:37:35
  * @Description: 
  */
 
@@ -7724,13 +7786,13 @@ const getSchema$5 = async (uiSchema, ctx) => {
             const recordId = _master.recordId;
             let relatedKeySaveValue = recordId;
             const relatedField = fields[relatedKey];
-            if(relatedField.reference_to_field && relatedField.reference_to_field !== '_id'){
+            if(relatedField && relatedField.reference_to_field && relatedField.reference_to_field !== '_id'){
                 relatedKeySaveValue = _master.record[relatedField.reference_to_field];
             }
             let relatedKeyValue; 
-            if(!_.isString(relatedField.reference_to)){
+            if(relatedField && !_.isString(relatedField.reference_to)){
                 relatedKeyValue = { o: masterObjectName, ids: [relatedKeySaveValue] };
-            }else if (relatedField.multiple) {
+            }else if (relatedField && relatedField.multiple) {
                 relatedKeyValue = [relatedKeySaveValue];
             } else {
                 relatedKeyValue = relatedKeySaveValue;
@@ -8014,8 +8076,8 @@ const getSchema$4 = async (uiSchema, ctx) => {
 /*
  * @Author: 殷亮辉 yinlianghui@hotoa.com
  * @Date: 2023-03-22 09:31:21
- * @LastEditors: Please set LastEditors
- * @LastEditTime: 2023-04-12 10:35:36
+ * @LastEditors: baozhoutao@steedos.com
+ * @LastEditTime: 2024-02-18 16:06:21
  */
 const getSchema$3 = (uiSchema)=>{
     return {
@@ -8061,7 +8123,8 @@ const getSchema$3 = (uiSchema)=>{
                                 },
                                 "data": {
                                   "objectName": `${uiSchema.name}`,
-                                  "__deletedRecord": true
+                                  "__deletedRecord": true,
+                                  "_inDrawer": "${_inDrawer}"
                                 }
                             },
                             {
@@ -12346,8 +12409,8 @@ const getRecordPermissions = async (objectName, recordId)=>{
 /*
  * @Author: baozhoutao@steedos.com
  * @Date: 2022-07-05 15:55:39
- * @LastEditors: 殷亮辉 yinlianghui@hotoa.com
- * @LastEditTime: 2024-02-08 16:10:52
+ * @LastEditors: baozhoutao@steedos.com
+ * @LastEditTime: 2024-02-18 14:46:50
  * @Description:
  */
 
@@ -12481,7 +12544,7 @@ async function getRecordDetailRelatedListSchema(objectName, recordId, relatedObj
     //     globalFilter = [`${relatedKey}`, "=", relatedValue];
     // }
     const recordRelatedListHeader = await getObjectRecordDetailRelatedListHeader(relatedObjectUiSchema, relatedLabel, ctx);
-    const componentId = `steedos-record-related-list-${relatedObjectName}`;
+    const componentId = `steedos-record-related-list-${relatedObjectName}_${new Date().getTime()}`;
     const isMobile = window.innerWidth < 768;
     let headerToolbar = [];
     if(!isMobile){
@@ -12755,8 +12818,8 @@ async function getObjectRelatedListsMiniSchema(objectApiName){
 /*
  * @Author: baozhoutao@steedos.com
  * @Date: 2022-07-05 15:55:39
- * @LastEditors: liaodaxue
- * @LastEditTime: 2024-02-05 17:56:27
+ * @LastEditors: baozhoutao@steedos.com
+ * @LastEditTime: 2024-02-18 16:05:21
  * @Description:
  */
 
@@ -13325,10 +13388,14 @@ async function getRecordServiceSchema(objectName, appId, props = {}, body) {
                             "componentId": serviceId,
                             "expression": "this.__deletedRecord != true"
                         },
+                        {
+                            "actionType": "closeDialog",
+                            "expression": "this.__deletedRecord === true && this._inDrawer === true"
+                        },
                         {
                             "actionType": "custom",
                             "script": "window.goBack()",
-                            "expression": "this.__deletedRecord === true"
+                            "expression": "this.__deletedRecord === true && this._inDrawer != true"
                         }
                     ]
                 },
@@ -21557,7 +21624,8 @@ var AmisRecordDetail = function (props) { return __awaiter(void 0, void 0, void
                 if (body) {
                     schema.body = body;
                 }
-                // console.log(`AmisRecordDetail====schema==>`, schema)
+                // console.log(`AmisRecordDetail====schema==>`, schema);
+                schema.data = Object.assign({}, $schema.data, schema.data);
                 return [2 /*return*/, schema];
         }
     });
@@ -21567,7 +21635,7 @@ var AmisRecordDetail = function (props) { return __awaiter(void 0, void 0, void
  * @Author: baozhoutao@steedos.com
  * @Date: 2022-12-08 10:32:17
  * @LastEditors: baozhoutao@steedos.com
- * @LastEditTime: 2024-01-16 14:09:23
+ * @LastEditTime: 2024-02-18 16:05:56
  * @Description:
  */
 var AmisRecordService = function (props) { return __awaiter(void 0, void 0, void 0, function () {