@steedos-widgets/amis-lib 1.1.0-beta.2 → 1.1.1

package/dist/index.umd.js

@@ -1075,17 +1075,10 @@
       data.$value = `$${valueField}`;
       // data["&"] = "$$";
 
-      const fieldValue = ctx.value;
-
       const requestAdaptor = `
         var filters = [['parent', '=', null]];
         api.data.query = api.data.query.replace(/{__filters}/g, JSON.stringify(filters));
         var defaultValue = api.data.$value;
-        var fieldValue = ${JSON.stringify(fieldValue)};
-        if(!defaultValue && fieldValue){
-            // 如果表单中没有字段值，则认字段上配置的value属性
-            defaultValue = fieldValue;
-        }
         var optionsFiltersOp = "${field.multiple ? "in" : "="}";
         var optionsFilters = [["user", optionsFiltersOp, []]];
         if (defaultValue) { 
@@ -3974,6 +3967,11 @@ filterService.setData({showFieldsFilter: !!!filterService.props.data.showFieldsF
     `;
       source.adaptor = `
     const enable_tree = ${refObjectConfig.enable_tree};
+    const value = api.data.$self.value;
+    if(!_.isEmpty(value)){
+        // value 不为空值，表示返回当前选中节点信息
+        return payload;
+    }
     if(enable_tree){
         const records = payload.data.rows;
         const treeRecords = [];
@@ -4278,21 +4276,20 @@ filterService.setData({showFieldsFilter: !!!filterService.props.data.showFieldsF
           // return await lookupToAmisGroup(field, readonly, ctx);
       }
 
-      if(ctx.ids || ctx.idsTrackOn){
-          return await lookupToAmisIdsPicker(field, readonly, ctx);
-      }
-
       let referenceTo = await getReferenceTo(field);
       if(!referenceTo){
           return await lookupToAmisSelect(field, readonly, ctx);
       }
 
-      const refObject = await getUISchema(referenceTo.objectName);
-
       if(referenceTo.objectName === "space_users" && field.reference_to_field === "user"){
+          if(ctx.idsDependOn || field.amis){
+              return await lookupToAmisIdsPicker(field, readonly, ctx);
+          }
           return await lookupToAmisSelectUser(field, readonly, ctx);
       }
 
+      const refObject = await getUISchema(referenceTo.objectName);
+
       // 此处不参考 steedos 的 enable_enhanced_lookup 规则. 如果默认是开启弹出选择,用户选择过程操作太繁琐, 所以默认是关闭弹出选择.
       // 由于amis picker 目前不支持联动, 配置了depend_on时, 使用使用select ,以支持联动
       // TODO: 确认 amis picker 支持联动时, 清理field.depend_on判断
@@ -4327,7 +4324,7 @@ filterService.setData({showFieldsFilter: !!!filterService.props.data.showFieldsF
       }
       const refObjectConfig = await getUISchema(referenceTo.objectName);
 
-      const { ids, idsTrackOn } = ctx;
+      const { idsDependOn } = ctx;
 
       const fields = {
           [referenceTo.labelField.name]: referenceTo.labelField,
@@ -4341,14 +4338,9 @@ filterService.setData({showFieldsFilter: !!!filterService.props.data.showFieldsF
       source.data.$term = "$term";
       source.data.$self = "$$";
 
-      if(ids && ids.length){
-          source.sendOn = true;
-      }
-      else {
-          source.sendOn = false;
-      }
-      if(idsTrackOn){
-          source.sendOn = `\${${idsTrackOn} && ${idsTrackOn}.length}`;
+      if(idsDependOn && source.url){
+          source.sendOn = `\${${idsDependOn} && ${idsDependOn}.length}`;
+          source.url = `${source.url}&depend_on_${idsDependOn}=\${${idsDependOn}|join}`;
       }
      
       source.requestAdaptor = `
@@ -4365,10 +4357,10 @@ filterService.setData({showFieldsFilter: !!!filterService.props.data.showFieldsF
             }
         }
 
-        var ids = ${JSON.stringify(ids)};
-        var idsTrackOn = "${idsTrackOn}";
-        if(idsTrackOn){
-            ids = api.data.$self[idsTrackOn];
+        var ids;
+        var idsDependOn = "${idsDependOn}";
+        if(idsDependOn){
+            ids = api.data.$self[idsDependOn];
         }
         if(ids && ids.length){
             filters.push(["${referenceTo.valueField.name}", "=", ids]);
@@ -6647,7 +6639,7 @@ filterService.setData({showFieldsFilter: !!!filterService.props.data.showFieldsF
     const searchableFields = [];
     let { filter, sort, top, setDataToComponentId = '' } = options;
 
-    if(!top){
+    if (!top) {
       // 日历请求不翻页
       top = 200;
     }
@@ -6773,7 +6765,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;
@@ -6846,7 +6839,7 @@ filterService.setData({showFieldsFilter: !!!filterService.props.data.showFieldsF
         return payload;
     `,
       headers: {
-          Authorization: "Bearer ${context.tenantId},${context.authToken}"
+        Authorization: "Bearer ${context.tenantId},${context.authToken}"
       }
     };
   }
@@ -6865,9 +6858,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 = [];
@@ -6891,9 +6884,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;
@@ -6904,7 +6897,7 @@ filterService.setData({showFieldsFilter: !!!filterService.props.data.showFieldsF
           initialView = "dayGridMonth";
           break;
         case "agenda":
-          initialView = "timeGridDay";
+          initialView = "listWeek";
           break;
       }
     }
@@ -7000,19 +6993,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": "",
@@ -7022,111 +7150,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);"
-            }
-          ]
-        },
-      }
+      ...config,
+      "onEvent": onEvent
     };
     return amisSchema;
   }
@@ -8956,7 +8981,6 @@ filterService.setData({showFieldsFilter: !!!filterService.props.data.showFieldsF
                 "args": {
                   "value": {
                     new_judge: "${event.data.value}",
-                    new_next_step: undefined,
                     next_step: undefined,
                   }
                 },
@@ -9008,7 +9032,11 @@ filterService.setData({showFieldsFilter: !!!filterService.props.data.showFieldsF
               id: "u:next_step",
               multiple: false,
               required: true,
-              selectFirst: true,
+              // selectFirst: true,
+              autoFill: {
+                "new_next_step": "${step}",
+                "next_users": null
+              },
               "source": {
                 "url": "${context.rootUrl}/api/workflow/v2/nextStep?judge=${new_judge}",
                 "headers": {
@@ -9020,10 +9048,12 @@ filterService.setData({showFieldsFilter: !!!filterService.props.data.showFieldsF
                 "requestAdaptor": "let { context, judge } = api.data; if(!judge){judge='approved'}\nconst formValues = SteedosUI.getRef(api.data.$scopeId).getComponentById(\"instance_form\").getValues();\n\napi.data = {\nflowVersionId: context.flowVersion._id,\n  instanceId: context._id,\n  flowId: context.flow._id,\n  step: context.step,\n  judge: judge,\n  values: formValues\n}\n\n\n return api;",
                 "adaptor": `
                 payload.data = {
+                  value: payload.nextSteps.length === 1 ? payload.nextSteps[0]._id : null, 
                   options: _.map(payload.nextSteps, (item)=>{
                     return {
                       label: item.name, 
-                      value: item
+                      value: item._id,
+                      step: item
                     }
                   })
                 };
@@ -9036,29 +9066,29 @@ filterService.setData({showFieldsFilter: !!!filterService.props.data.showFieldsF
                   "judge": "${new_judge}",
                 }
               },
-              "onEvent": {
-                "change": {
-                  "weight": 0,
-                  "actions": [
-                    {
-                      "componentId": "instance_approval",
-                      "args": {
-                        "value": {
-                          new_next_step: "${event.data.value}",
-                        }
-                      },
-                      "actionType": "setValue"
-                    },
-                    {
-                      "args": {
-                        next_step: "${event.data.value}",
-                      },
-                      "actionType": "broadcast",
-                      eventName: "approve_next_step_change"
-                    },
-                  ]
-                }
-              }
+              // "onEvent": {
+              //   "change": {
+              //     "weight": 0,
+              //     "actions": [
+              //       {
+              //         "componentId": "instance_approval",
+              //         "args": {
+              //           "value": {
+              //             new_next_step: "${event.data.value}",
+              //           }
+              //         },
+              //         "actionType": "setValue"
+              //       },
+              //       // {
+              //       //   "args": {
+              //       //     next_step: "${event.data.value}",
+              //       //   },
+              //       //   "actionType": "broadcast",
+              //       //   eventName: "approve_next_step_change"
+              //       // },
+              //     ]
+              //   }
+              // }
             },
           ],
           id: "u:4d3a884b437c",
@@ -9096,56 +9126,44 @@ filterService.setData({showFieldsFilter: !!!filterService.props.data.showFieldsF
           body: [
             // TODO 处理下一步处理人默认值
             Object.assign({}, 
-            //   await lookupToAmisPicker(
-            //   {
-            //     name: "next_users",
-            //     label: false,
-            //     reference_to: "space_users",
-            //     reference_to_field: 'user',
-            //     multiple: false,
-            //   },
-            //   false,
-            //   {}
-            // ),
             {
               "type": "steedos-select-user"
             },
-            
             {
               name: "next_users", 
-              // value: "",
               hiddenOn: "this.new_next_step.deal_type != 'pickupAtRuntime'",
               required: true
             }),
             {
-              type: "list-select",
+              type: "steedos-select-user",
               label: "",
               name: "next_users",
-              // options: await getNextStepOptions(instance),
               id: "u:next_users",
               required: true,
-              multiple: "this.new_next_step.deal_type === 'counterSign'",
-              "source": {
-                "url": "${context.rootUrl}/api/workflow/v2/nextStepUsers",
-                "method": "post",
-                "sendOn": "!!this.new_next_step && this.new_next_step.step_type != 'end'",
-                "headers": {
-                  "Authorization": "Bearer ${context.tenantId},${context.authToken}"
-                },
-                "messages": {
+              hiddenOn: "this.new_next_step.deal_type === 'pickupAtRuntime'",
+              amis: {
+                multiple: "this.new_next_step.deal_type === 'counterSign'",
+                "source": {
+                  "url": "${context.rootUrl}/api/workflow/v2/nextStepUsers",
+                  "method": "post",
+                  "sendOn": "!!this.new_next_step && this.new_next_step.step_type != 'end'",
+                  "headers": {
+                    "Authorization": "Bearer ${context.tenantId},${context.authToken}"
+                  },
+                  "messages": {
+                  },
+                  "requestAdaptor": "\nconst { context, next_step, $scopeId } = api.data;\nconst formValues = SteedosUI.getRef($scopeId).getComponentById(\"instance_form\").getValues();\n\napi.data = {\n  instanceId: context._id,\n nextStepId: next_step._id,\n  values: formValues\n}\n\n\n return api;",
+                  "adaptor": "\npayload.data = {value: payload.nextStepUsers.length === 1 ? payload.nextStepUsers[0].id : null, options: payload.nextStepUsers};\nreturn payload;",
+                  "data": {
+                    "&": "$$",
+                    "$scopeId": "$scopeId",
+                    "context": "${context}",
+                    "next_step": "${new_next_step}",
+                  }
                 },
-                "requestAdaptor": "console.log('======requestAdaptor====');\nconst { context, next_step, $scopeId } = api.data;\nconst formValues = SteedosUI.getRef($scopeId).getComponentById(\"instance_form\").getValues();\n\napi.data = {\n  instanceId: context._id,\n nextStepId: next_step._id,\n  values: formValues\n}\n\n\n return api;",
-                "adaptor": "\npayload.data = payload.nextStepUsers;\nreturn payload;",
-                "data": {
-                  "&": "$$",
-                  "$scopeId": "$scopeId",
-                  "context": "${context}",
-                  "next_step": "${new_next_step}",
-                }
-              },
-              "labelField": "name",
-              "valueField": "id",
-              hiddenOn: "this.new_next_step.deal_type === 'pickupAtRuntime'"
+                "labelField": "name",
+                "valueField": "id",
+              }
             }
           ],
           id: "u:81a4913c61cc",
@@ -9347,6 +9365,10 @@ filterService.setData({showFieldsFilter: !!!filterService.props.data.showFieldsF
           clearPersistDataAfterSubmit: true,
           persistData: `workflow_approve_form_${instance.approve._id}`,
           body: [
+            {
+              type: 'hidden',
+              name: 'new_next_step'
+            },
             await getJudgeInput(instance),
             {
               type: "textarea",
@@ -9377,7 +9399,7 @@ filterService.setData({showFieldsFilter: !!!filterService.props.data.showFieldsF
             //     {
             //       "actionType": "reload",
             //       "componentId": "u:nex_users",
-            //       "args": {t
+            //       "args": {
             //       }
             //     }
             //   ]
@@ -9688,7 +9710,7 @@ filterService.setData({showFieldsFilter: !!!filterService.props.data.showFieldsF
    * @Author: baozhoutao@steedos.com
    * @Date: 2022-09-07 16:20:45
    * @LastEditors: baozhoutao@steedos.com
-   * @LastEditTime: 2023-03-22 14:43:18
+   * @LastEditTime: 2023-03-23 16:49:44
    * @Description:
    */
 
@@ -10252,7 +10274,6 @@ filterService.setData({showFieldsFilter: !!!filterService.props.data.showFieldsF
       trs: await getFormTrs(instance),
       id: "u:047f3669468b",
     };
-    console.log(`getFormTableView formSchema=====>`, formSchema);
     return formSchema;
   };