@steedos-widgets/amis-lib 1.2.40 → 1.2.41

package/dist/index.umd.js

@@ -702,7 +702,7 @@
       let expandFieldsQuery = "";
       if(expandFields.length > 0){
           ___namespace.each(expandFields, function(field){
-              expandFieldsQuery = expandFieldsQuery + `${field.expandInfo.fieldName}:${field.expandInfo.fieldName}__expand{${field.expandInfo.displayName}}`;
+              expandFieldsQuery = expandFieldsQuery + `${field.expandInfo.fieldName}__expand{${field.expandInfo.displayName}}`;
           });
       }
 
@@ -3464,7 +3464,7 @@
           });
           // 有过滤条件时只显示搜索按钮上的红点，不自动展开搜索栏
           if(!_.isEmpty(omitedEmptyFormValue)){
-            let crudService = SteedosUI.getRef(data.$scopeId).getComponentById("service_listview_" + data.objectName)
+            let crudService = SteedosUI.getRef(data.$scopeId).parent.getComponentById("service_listview_" + data.objectName)
             crudService && crudService.setData({isFieldsFilterEmpty: false});
             // setData({ showFieldsFilter: true });//自动展开搜索栏
           }
@@ -9373,6 +9373,39 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
       });
   `;
 
+    const onEventClickScript = `
+    const data = event.data;
+    const eventData = data.event;
+    const appId = data.appId;
+    const objectName = data.objectName;
+    const eventId = data.event && data.event.id;
+    doAction({
+      "actionType": "link",
+      "args": {
+        "link": "/app/" + appId + "/" + objectName + "/view/" + eventId
+      }
+    });
+    // doAction({
+    //   "actionType": "dialog",
+    //   "dialog": {
+    //     "type": "dialog",
+    //     "title": "",
+    //     "body": [
+    //       {
+    //         "type": "steedos-record-detail",
+    //         "objectApiName": "\${objectName}",
+    //         "recordId": data.event && data.event.id
+    //       }
+    //     ],
+    //     "closeOnEsc": false,
+    //     "closeOnOutside": false,
+    //     "showCloseButton": true,
+    //     "size": "lg",
+    //     "actions": []
+    //   }
+    // });
+  `;
+
     const recordId = "${event.id}";
     const recordPermissionsApi = getCalendarRecordPermissionsApi(objectSchema, recordId);
     const recordSaveApi = getCalendarRecordSaveApi(objectSchema, calendarOptions);
@@ -9418,11 +9451,16 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
         "weight": 0,
         "actions": [
           {
-            "actionType": "link",
-            "args": {
-              "link": "/app/${appId}/${objectName}/view/${event.id}"
-            }
-          }
+            "actionType": "custom",
+            "script": onEventClickScript
+          },
+          // amis 升级到 3.2后，以下的"actionType": "link"方式拿不到appId和objectName了
+          // {
+          //   "actionType": "link",
+          //   "args": {
+          //     "link": "/app/${appId}/${objectName}/view/${event.id}"
+          //   }
+          // }
         ]
       },
       "eventAdd": {
@@ -10589,8 +10627,8 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
   /*
    * @Author: baozhoutao@steedos.com
    * @Date: 2022-07-05 15:55:39
-   * @LastEditors: 殷亮辉 yinlianghui@hotoa.com
-   * @LastEditTime: 2023-08-04 12:27:48
+   * @LastEditors: baozhoutao@steedos.com
+   * @LastEditTime: 2023-08-17 18:03:51
    * @Description:
    */
 
@@ -10961,7 +10999,7 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
                   if(filedInfo && (filedInfo.type === 'lookup' || filedInfo.type === 'master_detail') && _$1.isString(filedInfo.reference_to) ){
                       const rfUiSchema = await getUISchema(filedInfo.reference_to);
                       const rfFieldInfo = rfUiSchema.fields[displayName];
-                      fields.push(Object.assign({}, rfFieldInfo, {name: column, expand: true, expandInfo: {fieldName, displayName}}));
+                      fields.push(Object.assign({}, rfFieldInfo, {name: `${fieldName}__expand.${displayName}`, expand: true, expandInfo: {fieldName, displayName}}));
                   }
               }else {
                   if(uiSchema.fields[column]){
@@ -10977,7 +11015,7 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
                       const rfUiSchema = await getUISchema(filedInfo.reference_to);
                       const rfFieldInfo = rfUiSchema.fields[displayName];
                       fields.push(Object.assign({}, rfFieldInfo, 
-                          {name: column.field, expand: true, expandInfo: {fieldName, displayName}},
+                          {name: `${fieldName}__expand.${displayName}`, expand: true, expandInfo: {fieldName, displayName}},
                           {
                               width: column.width,
                               wrap: column.wrap, // wrap = true 是没效果的