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

package/dist/amis-object.cjs.js

@@ -1750,8 +1750,8 @@ var config = {
 /*
  * @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: 
  */
 
@@ -1791,6 +1791,7 @@ const getSchema$4 = async (uiSchema, ctx) => {
                                     "type": "dialog",
                                     "data": {
                                         "$master": "$$",
+                                        "_master": "${_master}",
                                         "defaultData": "${defaultData}",
                                         "appId": "${appId}",
                                         "objectName": "${objectName}",
@@ -1862,8 +1863,8 @@ async function getPage({type, pageId = '', appId, objectName = '', recordId = ''
 /*
  * @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:
  */
 
@@ -1929,6 +1930,12 @@ 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",
@@ -1979,6 +1986,16 @@ const getSchema$2 = (uiSchema)=>{
                                   "objectName": `${uiSchema.name}`,
                                   "__deletedRecord": true
                                 }
+                            },
+                            {
+                                "actionType": "broadcast",
+                                "args": {
+                                  "eventName": "@data.changed.${_master.objectName}"
+                                },
+                                "data": {
+                                  "objectName": "${_master.objectName}"
+                                },
+                                "expression": "${_master.objectName}"
                             }
                           ]
                     }
@@ -4328,6 +4345,15 @@ 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 = [];
@@ -6204,6 +6230,16 @@ async function getObjectForm(objectSchema, ctx){
                 "data": {
                   "objectName": `${objectSchema.name}`
                 }
+              },
+              {
+                "actionType": "broadcast",
+                "args": {
+                  "eventName": "@data.changed.${_master.objectName}"
+                },
+                "data": {
+                  "objectName": "${_master.objectName}"
+                },
+                "expression": "${_master.objectName}"
               }
             ]
           }
@@ -6995,7 +7031,7 @@ async function getCalendarApi(mainObject, fields, options) {
   const searchableFields = [];
   let { filter, sort, top, setDataToComponentId = '' } = options;
 
-  if(!top){
+  if (!top) {
     // 日历请求不翻页
     top = 200;
   }
@@ -7121,7 +7157,8 @@ async function getCalendarApi(mainObject, fields, options) {
         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;
@@ -7194,7 +7231,7 @@ function getCalendarRecordSaveApi(object, calendarOptions) {
         return payload;
     `,
     headers: {
-        Authorization: "Bearer ${context.tenantId},${context.authToken}"
+      Authorization: "Bearer ${context.tenantId},${context.authToken}"
     }
   };
 }
@@ -7213,9 +7250,9 @@ async function getObjectCalendar(objectSchema, calendarOptions, options) {
   calendarOptions = Object.assign({}, DEFAULT_CALENDAR_OPTIONS, ___default.omitBy(calendarOptions, ___default.isNil));
 
   const titleFields = calendarOptions.title || [
-    calendarOptions.startDateExpr, 
-    calendarOptions.endDateExpr, 
-    calendarOptions.allDayExpr, 
+    calendarOptions.startDateExpr,
+    calendarOptions.endDateExpr,
+    calendarOptions.allDayExpr,
     calendarOptions.textExpr
   ];
   let fields = [];
@@ -7239,9 +7276,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;
@@ -7348,19 +7385,154 @@ 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(!___default.isEmpty(calendarOptions.startDayHour)){
+  if (!___default.isEmpty(calendarOptions.startDayHour)) {
     businessHours.startTime = `${calendarOptions.startDayHour}:00`;
   }
-  if(!___default.isEmpty(calendarOptions.endDayHour)){
+  if (!___default.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": "",
@@ -7370,135 +7542,8 @@ async function getObjectCalendar(objectSchema, calendarOptions, options) {
     "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;
 }
@@ -12062,11 +12107,12 @@ var AmisObjectTable = function (props) { return __awaiter(void 0, void 0, void 0
 }); };
 
 var AmisObjectCalendar = function (props) { return __awaiter(void 0, void 0, void 0, function () {
-    var top, sort, filters, filtersFunction, title, currentView, startDateExpr, endDateExpr, allDayExpr, textExpr, data, defaultData, _a, className, objectApiName, amisSchemaData, schema, uiSchema, amisSchema, serviceData;
+    var top, sort, filters, filtersFunction, title, currentView, startDateExpr, endDateExpr, allDayExpr, textExpr, data, defaultData, _a, className, onEvent, config, objectApiName, amisSchemaData, schema, uiSchema, amisSchema, serviceData;
     return __generator(this, function (_b) {
         switch (_b.label) {
             case 0:
-                props.$schema, top = props.top, sort = props.sort, filters = props.filters, filtersFunction = props.filtersFunction, title = props.title, currentView = props.currentView, startDateExpr = props.startDateExpr, endDateExpr = props.endDateExpr, allDayExpr = props.allDayExpr, textExpr = props.textExpr, data = props.data, defaultData = props.defaultData, _a = props.className, className = _a === void 0 ? "" : _a;
+                console.log("AmisObjectCalendar props", props);
+                props.$schema, top = props.top, sort = props.sort, filters = props.filters, filtersFunction = props.filtersFunction, title = props.title, currentView = props.currentView, startDateExpr = props.startDateExpr, endDateExpr = props.endDateExpr, allDayExpr = props.allDayExpr, textExpr = props.textExpr, data = props.data, defaultData = props.defaultData, _a = props.className, className = _a === void 0 ? "" : _a, onEvent = props.onEvent, config = props.config;
                 objectApiName = props.objectApiName || "events";
                 amisSchemaData = Object.assign({}, data, defaultData);
                 return [4 /*yield*/, getCalendarSchema(amisSchemaData.appId, objectApiName, {
@@ -12076,7 +12122,7 @@ var AmisObjectCalendar = function (props) { return __awaiter(void 0, void 0, voi
                         endDateExpr: endDateExpr,
                         allDayExpr: allDayExpr,
                         textExpr: textExpr
-                    }, { top: top, sort: sort, filter: filters, filtersFunction: filtersFunction })];
+                    }, { top: top, sort: sort, filter: filters, filtersFunction: filtersFunction, onEvent: onEvent, config: config })];
             case 1:
                 schema = (_b.sent());
                 uiSchema = schema.uiSchema;
@@ -13166,7 +13212,7 @@ var PageListView = function (props) { return __awaiter(void 0, void 0, void 0, f
                     "showHeader": true,
                     "showDisplayAs": (defaultFormFactor !== 'SMALL'),
                     "formFactor": formFactor,
-                    "className": (displayAs === 'split') ? 'w-full' : 'p-0 flex-1 overflow-hidden h-full sm:m-3 sm:mb-0 sm:border sm:shadow sm:rounded border-slate-300 border-solid bg-gray-100'
+                    "className": (displayAs === 'split') ? 'w-full' : 'p-0 flex-1 sm:m-3 sm:mb-0 sm:border sm:shadow sm:rounded border-slate-300 border-solid bg-gray-100'
                 };
                 defData = __assign$2(__assign$2({}, $schema.data), { objectName: objectApiName, listViewId: listViewId, listName: listviewId, appId: appId, formFactor: formFactor, displayAs: displayAs });
                 return [2 /*return*/, {