@steedos-widgets/amis-lib 1.1.3-beta.7 → 1.1.3

package/dist/index.umd.js

@@ -1389,8 +1389,8 @@
   /*
    * @Author: baozhoutao@steedos.com
    * @Date: 2022-11-01 15:51:00
-   * @LastEditors: 廖大雪 2291335922@qq.com
-   * @LastEditTime: 2023-03-09 15:16:10
+   * @LastEditors: 殷亮辉 yinlianghui@hotoa.com
+   * @LastEditTime: 2023-03-27 15:42:24
    * @Description: 
    */
 
@@ -1430,6 +1430,7 @@
                                       "type": "dialog",
                                       "data": {
                                           "$master": "$$",
+                                          "_master": "${_master}",
                                           "defaultData": "${defaultData}",
                                           "appId": "${appId}",
                                           "objectName": "${objectName}",
@@ -1501,8 +1502,8 @@
   /*
    * @Author: baozhoutao@steedos.com
    * @Date: 2022-11-01 15:49:58
-   * @LastEditors: baozhoutao@steedos.com
-   * @LastEditTime: 2022-11-08 16:39:40
+   * @LastEditors: 殷亮辉 yinlianghui@hotoa.com
+   * @LastEditTime: 2023-03-27 11:36:49
    * @Description:
    */
 
@@ -1568,6 +1569,12 @@
     };
   };
 
+  /*
+   * @Author: 殷亮辉 yinlianghui@hotoa.com
+   * @Date: 2023-03-22 09:31:21
+   * @LastEditors: 殷亮辉 yinlianghui@hotoa.com
+   * @LastEditTime: 2023-03-27 16:03:34
+   */
   const getSchema$2 = (uiSchema)=>{
       return {
           "type": "service",
@@ -1618,6 +1625,16 @@
                                     "objectName": `${uiSchema.name}`,
                                     "__deletedRecord": true
                                   }
+                              },
+                              {
+                                  "actionType": "broadcast",
+                                  "args": {
+                                    "eventName": "@data.changed.${_master.objectName}"
+                                  },
+                                  "data": {
+                                    "objectName": "${_master.objectName}"
+                                  },
+                                  "expression": "${_master.objectName}"
                               }
                             ]
                       }
@@ -3967,6 +3984,15 @@ filterService.setData({showFieldsFilter: !!!filterService.props.data.showFieldsF
     `;
       source.adaptor = `
     const enable_tree = ${refObjectConfig.enable_tree};
+    const op = api.data.$self.op;
+    if(!_.isEmpty(op)){
+        // op不为空，表示处于字段初始编辑状态，不是点击后出现弹窗状态。
+        const rows = _.map(payload.data.rows, (item)=>{
+            return _.pick(item, ["${referenceTo.labelField.name}", "${referenceTo.valueField.name}"]);
+        })
+        payload.data.rows = rows;
+        return payload;
+    }
     if(enable_tree){
         const records = payload.data.rows;
         const treeRecords = [];
@@ -5843,6 +5869,16 @@ filterService.setData({showFieldsFilter: !!!filterService.props.data.showFieldsF
                   "data": {
                     "objectName": `${objectSchema.name}`
                   }
+                },
+                {
+                  "actionType": "broadcast",
+                  "args": {
+                    "eventName": "@data.changed.${_master.objectName}"
+                  },
+                  "data": {
+                    "objectName": "${_master.objectName}"
+                  },
+                  "expression": "${_master.objectName}"
                 }
               ]
             }
@@ -6634,7 +6670,7 @@ filterService.setData({showFieldsFilter: !!!filterService.props.data.showFieldsF
     const searchableFields = [];
     let { filter, sort, top, setDataToComponentId = '' } = options;
 
-    if(!top){
+    if (!top) {
       // 日历请求不翻页
       top = 200;
     }
@@ -6760,7 +6796,8 @@ filterService.setData({showFieldsFilter: !!!filterService.props.data.showFieldsF
         title: n["${calendarOptions.textExpr}"],
         start: n["${calendarOptions.startDateExpr}"],
         end: n["${calendarOptions.endDateExpr}"],
-        allDay: n["${calendarOptions.allDayExpr}"]
+        allDay: n["${calendarOptions.allDayExpr}"],
+        extendedProps: n
       }
     });
     const successCallback = selfData.successCallback;
@@ -6833,7 +6870,7 @@ filterService.setData({showFieldsFilter: !!!filterService.props.data.showFieldsF
         return payload;
     `,
       headers: {
-          Authorization: "Bearer ${context.tenantId},${context.authToken}"
+        Authorization: "Bearer ${context.tenantId},${context.authToken}"
       }
     };
   }
@@ -6852,9 +6889,9 @@ filterService.setData({showFieldsFilter: !!!filterService.props.data.showFieldsF
     calendarOptions = Object.assign({}, DEFAULT_CALENDAR_OPTIONS, _$1.omitBy(calendarOptions, _$1.isNil));
 
     const titleFields = calendarOptions.title || [
-      calendarOptions.startDateExpr, 
-      calendarOptions.endDateExpr, 
-      calendarOptions.allDayExpr, 
+      calendarOptions.startDateExpr,
+      calendarOptions.endDateExpr,
+      calendarOptions.allDayExpr,
       calendarOptions.textExpr
     ];
     let fields = [];
@@ -6878,9 +6915,9 @@ filterService.setData({showFieldsFilter: !!!filterService.props.data.showFieldsF
       }
     }
     let initialView = calendarOptions.currentView;
-    if(initialView){
+    if (initialView) {
       // day, week, month, agenda
-      switch(initialView){
+      switch (initialView) {
         case "day":
           initialView = "timeGridDay";
           break;
@@ -6987,19 +7024,154 @@ filterService.setData({showFieldsFilter: !!!filterService.props.data.showFieldsF
     const recordId = "${event.id}";
     const recordPermissionsApi = getCalendarRecordPermissionsApi(objectSchema, recordId);
     const recordSaveApi = getCalendarRecordSaveApi(objectSchema, calendarOptions);
-    
+
     const businessHours = {
-      daysOfWeek: [ 1, 2, 3, 4, 5 ],
+      daysOfWeek: [1, 2, 3, 4, 5],
       startTime: '08:00',
       endTime: '18:00',
     };
-    if(!_$1.isEmpty(calendarOptions.startDayHour)){
+    if (!_$1.isEmpty(calendarOptions.startDayHour)) {
       businessHours.startTime = `${calendarOptions.startDayHour}:00`;
     }
-    if(!_$1.isEmpty(calendarOptions.endDayHour)){
+    if (!_$1.isEmpty(calendarOptions.endDayHour)) {
       businessHours.endTime = `${calendarOptions.endDayHour}:00`;
     }
-    
+
+    const onEvent = {
+      "getEvents": {
+        "weight": 0,
+        "actions": [
+          {
+            "componentId": "",
+            "args": {
+            },
+            "actionType": "custom",
+            "script": onGetEventsScript
+          }
+        ]
+      },
+      "select": {
+        "weight": 0,
+        "actions": [
+          {
+            "componentId": "",
+            "args": {
+            },
+            "actionType": "custom",
+            "script": onSelectScript
+          }
+        ]
+      },
+      "eventClick": {
+        "weight": 0,
+        "actions": [
+          {
+            "componentId": "",
+            "args": {
+            },
+            "actionType": "custom",
+            "script": onEventClickScript
+          }
+        ]
+      },
+      "eventAdd": {
+        "weight": 0,
+        "actions": [
+          {
+            "componentId": "",
+            "args": {
+            },
+            "actionType": "custom",
+            "script": "console.log('eventAdd'); console.log(event);"
+          }
+        ]
+      },
+      "eventChange": {
+        "weight": 0,
+        "actions": [
+          {
+            "actionType": 'ajax',
+            "args": {
+              "api": recordPermissionsApi
+            }
+          },
+          {
+            "actionType": "toast",
+            "expression": "!event.data.editable",
+            "args": {
+              "msgType": "error",
+              "msg": "您没有编辑该记录的权限！",
+              "position": "top-center"
+            }
+          },
+          {
+            "actionType": 'ajax',
+            "expression": "event.data.editable",
+            "args": {
+              "api": recordSaveApi,
+              "messages": {
+                "success": objectSchema.label + "修改成功",
+                "failed": objectSchema.label + "修改失败！"
+              }
+            }
+          }
+        ]
+      },
+      "eventRemove": {
+        "weight": 0,
+        "actions": [
+          {
+            "componentId": "",
+            "args": {
+            },
+            "actionType": "custom",
+            "script": "console.log('eventRemove'); console.log(event);"
+          }
+        ]
+      },
+      "eventsSet": {
+        "weight": 0,
+        "actions": [
+          {
+            "componentId": "",
+            "args": {
+            },
+            "actionType": "custom",
+            "script": "console.log('eventsSet'); console.log(event);"
+          }
+        ]
+      }
+    };
+
+    Object.assign(onEvent, options.onEvent);
+
+    const config = options.config || {};
+    if(config.eventContent && typeof config.eventContent === "string"){
+      const hasReturn = /\breturn\b/.test(config.eventContent);
+      if(hasReturn){
+        try {
+          // 如果是包括return语句的字符串，则按函数解析，见 https://fullcalendar.io/docs/content-injection
+          let fn = new Function("arg", config.eventContent);
+          config.eventContent = fn;
+        } catch (e) {
+          console.warn(e);
+        }
+      }
+    }
+
+    if(config.noEventsContent && typeof config.noEventsContent === "string"){
+      const hasReturn = /\breturn\b/.test(config.noEventsContent);
+      if(hasReturn){
+        try {
+          // 如果是包括return语句的字符串，则按函数解析，见 https://fullcalendar.io/docs/content-injection
+          let fn = new Function("arg", config.noEventsContent);
+          config.noEventsContent = fn;
+        } catch (e) {
+          console.warn(e);
+        }
+      }
+    }
+
     const amisSchema = {
       "type": "steedos-fullcalendar",
       "label": "",
@@ -7009,135 +7181,8 @@ filterService.setData({showFieldsFilter: !!!filterService.props.data.showFieldsF
       "selectMirror": permissions.allowCreate,
       "initialView": initialView,
       "businessHours": businessHours,
-      "onEvent": {
-        "getEvents": {
-          "weight": 0,
-          "actions": [
-            {
-              "componentId": "",
-              "args": {
-              },
-              "actionType": "custom",
-              "script": onGetEventsScript
-            }
-          ]
-        },
-        "select": {
-          "weight": 0,
-          "actions": [
-            {
-              "componentId": "",
-              "args": {
-              },
-              "actionType": "custom",
-              "script": onSelectScript
-            }
-          ]
-        },
-        "eventClick": {
-          "weight": 0,
-          "actions": [
-            {
-              "componentId": "",
-              "args": {
-              },
-              "actionType": "custom",
-              "script": onEventClickScript
-            }
-          ]
-        },
-        "eventAdd": {
-          "weight": 0,
-          "actions": [
-            {
-              "componentId": "",
-              "args": {
-              },
-              "actionType": "custom",
-              "script": "console.log('eventAdd'); console.log(event);"
-            }
-          ]
-        },
-        "eventChange": {
-          "weight": 0,
-          "actions": [
-            {
-              "actionType": 'ajax',
-              "args": {
-                "api": recordPermissionsApi
-              }
-            },
-            {
-              "actionType": "toast",
-              "expression": "!event.data.editable",
-              "args": {
-                "msgType": "error",
-                "msg": "您没有编辑该记录的权限！",
-                "position": "top-center"
-              }
-            },
-            {
-              "actionType": 'ajax',
-              "expression": "event.data.editable",
-              "args": {
-                "api": recordSaveApi,
-                "messages": {
-                  "success": objectSchema.label + "修改成功",
-                  "failed": objectSchema.label + "修改失败！"
-                }
-              }
-            }
-          ]
-        },
-        "eventRemove": {
-          "weight": 0,
-          "actions": [
-            {
-              "componentId": "",
-              "args": {
-              },
-              "actionType": "custom",
-              "script": "console.log('eventRemove'); console.log(event);"
-            }
-          ]
-        },
-        "eventsSet": {
-          "weight": 0,
-          "actions": [
-            {
-              "componentId": "",
-              "args": {
-              },
-              "actionType": "custom",
-              "script": "console.log('eventsSet'); console.log(event);"
-            }
-          ]
-        },
-        "eventDidMount": {
-          "weight": 0,
-          "actions": [
-            {
-              "componentId": "",
-              "args": {
-              },
-              "actionType": "custom",
-              "script": "console.log('eventDidMount'); console.log(event);"
-            }
-          ]
-        },
-        "eventWillUnmount": {
-          "weight": 0,
-          "actions": [
-            {
-              "componentId": "",
-              "args": {
-              },
-              "actionType": "custom",
-              "script": "console.log('eventWillUnmount'); console.log(event);"
-            }
-          ]
-        },
-      }
+      ...config,
+      "onEvent": onEvent
     };
     return amisSchema;
   }