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

package/dist/index.cjs.js

@@ -1390,8 +1390,8 @@ var config = {
 /*
  * @Author: baozhoutao@steedos.com
  * @Date: 2022-11-01 15:51:00
- * @LastEditors: 殷亮辉 yinlianghui@hotoa.com
- * @LastEditTime: 2023-03-27 15:42:24
+ * @LastEditors: 廖大雪 2291335922@qq.com
+ * @LastEditTime: 2023-03-09 15:16:10
  * @Description: 
  */
 
@@ -1431,7 +1431,6 @@ const getSchema$4 = async (uiSchema, ctx) => {
                                     "type": "dialog",
                                     "data": {
                                         "$master": "$$",
-                                        "_master": "${_master}",
                                         "defaultData": "${defaultData}",
                                         "appId": "${appId}",
                                         "objectName": "${objectName}",
@@ -1503,8 +1502,8 @@ async function getPage({type, pageId = '', appId, objectName = '', recordId = ''
 /*
  * @Author: baozhoutao@steedos.com
  * @Date: 2022-11-01 15:49:58
- * @LastEditors: 殷亮辉 yinlianghui@hotoa.com
- * @LastEditTime: 2023-03-27 11:36:49
+ * @LastEditors: baozhoutao@steedos.com
+ * @LastEditTime: 2022-11-08 16:39:40
  * @Description:
  */
 
@@ -1570,12 +1569,6 @@ const getSchema$3 = async (uiSchema, ctx) => {
   };
 };
 
-/*
- * @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",
@@ -1626,16 +1619,6 @@ const getSchema$2 = (uiSchema)=>{
                                   "objectName": `${uiSchema.name}`,
                                   "__deletedRecord": true
                                 }
-                            },
-                            {
-                                "actionType": "broadcast",
-                                "args": {
-                                  "eventName": "@data.changed.${_master.objectName}"
-                                },
-                                "data": {
-                                  "objectName": "${_master.objectName}"
-                                },
-                                "expression": "${_master.objectName}"
                             }
                           ]
                     }
@@ -3985,15 +3968,6 @@ async function lookupToAmisPicker(field, readonly, ctx){
     `;
     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 = [];
@@ -5870,16 +5844,6 @@ async function getObjectForm(objectSchema, ctx){
                 "data": {
                   "objectName": `${objectSchema.name}`
                 }
-              },
-              {
-                "actionType": "broadcast",
-                "args": {
-                  "eventName": "@data.changed.${_master.objectName}"
-                },
-                "data": {
-                  "objectName": "${_master.objectName}"
-                },
-                "expression": "${_master.objectName}"
               }
             ]
           }
@@ -6671,7 +6635,7 @@ async function getCalendarApi(mainObject, fields, options) {
   const searchableFields = [];
   let { filter, sort, top, setDataToComponentId = '' } = options;
 
-  if (!top) {
+  if(!top){
     // 日历请求不翻页
     top = 200;
   }
@@ -6797,8 +6761,7 @@ async function getCalendarApi(mainObject, fields, options) {
         title: n["${calendarOptions.textExpr}"],
         start: n["${calendarOptions.startDateExpr}"],
         end: n["${calendarOptions.endDateExpr}"],
-        allDay: n["${calendarOptions.allDayExpr}"],
-        extendedProps: n
+        allDay: n["${calendarOptions.allDayExpr}"]
       }
     });
     const successCallback = selfData.successCallback;
@@ -6871,7 +6834,7 @@ function getCalendarRecordSaveApi(object, calendarOptions) {
         return payload;
     `,
     headers: {
-      Authorization: "Bearer ${context.tenantId},${context.authToken}"
+        Authorization: "Bearer ${context.tenantId},${context.authToken}"
     }
   };
 }
@@ -6890,9 +6853,9 @@ async function getObjectCalendar(objectSchema, calendarOptions, options) {
   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 = [];
@@ -6916,9 +6879,9 @@ async function getObjectCalendar(objectSchema, calendarOptions, options) {
     }
   }
   let initialView = calendarOptions.currentView;
-  if (initialView) {
+  if(initialView){
     // day, week, month, agenda
-    switch (initialView) {
+    switch(initialView){
       case "day":
         initialView = "timeGridDay";
         break;
@@ -7025,154 +6988,19 @@ async function getObjectCalendar(objectSchema, calendarOptions, options) {
   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": "",
@@ -7182,8 +7010,135 @@ async function getObjectCalendar(objectSchema, calendarOptions, options) {
     "selectMirror": permissions.allowCreate,
     "initialView": initialView,
     "businessHours": businessHours,
-    ...config,
-    "onEvent": onEvent
+    "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);"
+          }
+        ]
+      },
+    }
   };
   return amisSchema;
 }