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

package/dist/amis-object.esm.js

@@ -1408,17 +1408,10 @@ async function getSource$1(field, ctx) {
     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) { 
@@ -4307,6 +4300,11 @@ async function lookupToAmisPicker(field, readonly, ctx){
     `;
     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 = [];
@@ -4611,21 +4609,20 @@ async function lookupToAmis(field, readonly, ctx){
         // 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判断
@@ -4660,7 +4657,7 @@ async function getIdsPickerSchema(field, readonly, ctx){
     }
     const refObjectConfig = await getUISchema(referenceTo.objectName);
 
-    const { ids, idsTrackOn } = ctx;
+    const { idsDependOn } = ctx;
 
     const fields = {
         [referenceTo.labelField.name]: referenceTo.labelField,
@@ -4674,14 +4671,9 @@ async function getIdsPickerSchema(field, readonly, ctx){
     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 = `
@@ -4698,10 +4690,10 @@ async function getIdsPickerSchema(field, readonly, ctx){
             }
         }
 
-        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]);
@@ -6980,7 +6972,7 @@ async function getCalendarApi(mainObject, fields, options) {
   const searchableFields = [];
   let { filter, sort, top, setDataToComponentId = '' } = options;
 
-  if(!top){
+  if (!top) {
     // 日历请求不翻页
     top = 200;
   }
@@ -7106,7 +7098,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;
@@ -7179,7 +7172,7 @@ function getCalendarRecordSaveApi(object, calendarOptions) {
         return payload;
     `,
     headers: {
-        Authorization: "Bearer ${context.tenantId},${context.authToken}"
+      Authorization: "Bearer ${context.tenantId},${context.authToken}"
     }
   };
 }
@@ -7198,9 +7191,9 @@ async function getObjectCalendar(objectSchema, calendarOptions, options) {
   calendarOptions = Object.assign({}, DEFAULT_CALENDAR_OPTIONS, omitBy(calendarOptions, isNil));
 
   const titleFields = calendarOptions.title || [
-    calendarOptions.startDateExpr, 
-    calendarOptions.endDateExpr, 
-    calendarOptions.allDayExpr, 
+    calendarOptions.startDateExpr,
+    calendarOptions.endDateExpr,
+    calendarOptions.allDayExpr,
     calendarOptions.textExpr
   ];
   let fields = [];
@@ -7224,9 +7217,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;
@@ -7237,7 +7230,7 @@ async function getObjectCalendar(objectSchema, calendarOptions, options) {
         initialView = "dayGridMonth";
         break;
       case "agenda":
-        initialView = "timeGridDay";
+        initialView = "listWeek";
         break;
     }
   }
@@ -7333,19 +7326,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(!isEmpty(calendarOptions.startDayHour)){
+  if (!isEmpty(calendarOptions.startDayHour)) {
     businessHours.startTime = `${calendarOptions.startDayHour}:00`;
   }
-  if(!isEmpty(calendarOptions.endDayHour)){
+  if (!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": "",
@@ -7355,111 +7483,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);"
-          }
-        ]
-      },
-    }
+    ...config,
+    "onEvent": onEvent
   };
   return amisSchema;
 }
@@ -9289,7 +9314,6 @@ const getJudgeInput = async (instance) => {
               "args": {
                 "value": {
                   new_judge: "${event.data.value}",
-                  new_next_step: undefined,
                   next_step: undefined,
                 }
               },
@@ -9341,7 +9365,11 @@ const getNextStepInput = async (instance) => {
             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": {
@@ -9353,10 +9381,12 @@ const getNextStepInput = async (instance) => {
               "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
                     }
                   })
                 };
@@ -9369,29 +9399,29 @@ const getNextStepInput = async (instance) => {
                 "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",
@@ -9429,56 +9459,44 @@ const getNextStepUsersInput = async (instance) => {
         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",
@@ -9680,6 +9698,10 @@ const getApprovalDrawerSchema = async (instance) => {
         clearPersistDataAfterSubmit: true,
         persistData: `workflow_approve_form_${instance.approve._id}`,
         body: [
+          {
+            type: 'hidden',
+            name: 'new_next_step'
+          },
           await getJudgeInput(instance),
           {
             type: "textarea",
@@ -9710,7 +9732,7 @@ const getApprovalDrawerSchema = async (instance) => {
           //     {
           //       "actionType": "reload",
           //       "componentId": "u:nex_users",
-          //       "args": {t
+          //       "args": {
           //       }
           //     }
           //   ]
@@ -10021,7 +10043,7 @@ const getInstanceApprovalHistory = async ()=>{
  * @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:
  */
 
@@ -10585,7 +10607,6 @@ const getFormTableView = async (instance) => {
     trs: await getFormTrs(instance),
     id: "u:047f3669468b",
   };
-  console.log(`getFormTableView formSchema=====>`, formSchema);
   return formSchema;
 };
 
@@ -12027,11 +12048,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, {
@@ -12041,7 +12063,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;
@@ -12208,15 +12230,14 @@ var AmisRecordDetailRelatedLists = function (props) { return __awaiter(void 0, v
 }); };
 
 var AmisSelectUser = function (props) { return __awaiter(void 0, void 0, void 0, function () {
-    var $schema, ids, idsTrackOn, _a, readonly, _b, selectFirst, amis, _c, ctx, value, amisSchema, steedosField, options, error_1;
-    return __generator(this, function (_d) {
-        switch (_d.label) {
+    var $schema, idsDependOn, _a, readonly, amis, _b, ctx, amisSchema, steedosField, options, error_1;
+    return __generator(this, function (_c) {
+        switch (_c.label) {
             case 0:
-                $schema = props.$schema, props.data, ids = props.ids, idsTrackOn = props.idsTrackOn, _a = props.readonly, readonly = _a === void 0 ? false : _a, _b = props.selectFirst, selectFirst = _b === void 0 ? false : _b, amis = props.amis, _c = props.ctx, ctx = _c === void 0 ? {} : _c;
-                value = $schema.value;
-                _d.label = 1;
+                $schema = props.$schema, props.data, idsDependOn = props.idsDependOn, _a = props.readonly, readonly = _a === void 0 ? false : _a, amis = props.amis, _b = props.ctx, ctx = _b === void 0 ? {} : _b;
+                _c.label = 1;
             case 1:
-                _d.trys.push([1, 3, , 4]);
+                _c.trys.push([1, 3, , 4]);
                 steedosField = {
                     type: "lookup",
                     reference_to: "users",
@@ -12225,20 +12246,16 @@ var AmisSelectUser = function (props) { return __awaiter(void 0, void 0, void 0,
                     multiple: $schema.multiple,
                     required: $schema.required,
                     searchable: $schema.searchable,
-                    onEvent: $schema.onEvent,
                     filters: $schema.filters,
                     amis: amis
                 };
-                options = Object.assign.apply(Object, __spreadArray(__spreadArray([{}], __read(ctx), false), [{ ids: ids, idsTrackOn: idsTrackOn, selectFirst: selectFirst }], false));
-                if (value) {
-                    options.value = value;
-                }
+                options = Object.assign.apply(Object, __spreadArray(__spreadArray([{}], __read(ctx), false), [{ idsDependOn: idsDependOn }], false));
                 return [4 /*yield*/, index.convertSFieldToAmisField(steedosField, readonly, options)];
             case 2:
-                amisSchema = _d.sent();
+                amisSchema = _c.sent();
                 return [3 /*break*/, 4];
             case 3:
-                error_1 = _d.sent();
+                error_1 = _c.sent();
                 console.log("error", error_1);
                 return [3 /*break*/, 4];
             case 4: return [2 /*return*/, amisSchema];
@@ -12998,28 +13015,34 @@ var AmisSteedosField = function (props) { return __awaiter(void 0, void 0, void
  * @Author: baozhoutao@steedos.com
  * @Date: 2023-01-14 16:41:24
  * @LastEditors: baozhoutao@steedos.com
- * @LastEditTime: 2023-02-23 09:48:53
+ * @LastEditTime: 2023-03-23 11:37:25
  * @Description:
  */
 var getSelectFlowSchema = function (id, props) {
-    var label = props.label, data = props.data, name = props.name, required = props.required, _a = props.action, action = _a === void 0 ? 'query' : _a, _b = props.distributeInstanceId, distributeInstanceId = _b === void 0 ? "" : _b, _c = props.distributeStepId, distributeStepId = _c === void 0 ? "" : _c, _d = props.mode, mode = _d === void 0 ? 'input-tree' : _d, className = props.className, onEvent = props.onEvent, _e = props.multiple, multiple = _e === void 0 ? false : _e, delimiter = props.delimiter, joinValues = props.joinValues, extractValue = props.extractValue, searchable = props.searchable, _f = props.showIcon, showIcon = _f === void 0 ? true : _f, _g = props.showRadio, showRadio = _g === void 0 ? false : _g, showOutline = props.showOutline, initiallyOpen = props.initiallyOpen, unfoldedLevel = props.unfoldedLevel, treeContainerClassName = props.treeContainerClassName;
-    return {
-        "type": mode,
-        "id": id,
-        "label": label,
-        "name": name,
-        "options": [],
-        "multiple": multiple,
-        "delimiter": delimiter,
-        "joinValues": joinValues,
-        "extractValue": extractValue,
-        "searchable": searchable,
-        "showOutline": showOutline,
-        "initiallyOpen": initiallyOpen,
-        "unfoldedLevel": unfoldedLevel,
-        "className": className,
-        "required": required,
-        "treeContainerClassName": treeContainerClassName,
+    var label = props.label, data = props.data, name = props.name, required = props.required, _a = props.action, action = _a === void 0 ? 'query' : _a, _b = props.distributeInstanceId, distributeInstanceId = _b === void 0 ? "" : _b, _c = props.distributeStepId, distributeStepId = _c === void 0 ? "" : _c, _d = props.mode, mode = _d === void 0 ? 'input-tree' : _d, className = props.className, onEvent = props.onEvent, _e = props.multiple, multiple = _e === void 0 ? false : _e, delimiter = props.delimiter, joinValues = props.joinValues, extractValue = props.extractValue, searchable = props.searchable, _f = props.showIcon, showIcon = _f === void 0 ? true : _f, _g = props.showRadio, showRadio = _g === void 0 ? false : _g, showOutline = props.showOutline, initiallyOpen = props.initiallyOpen, unfoldedLevel = props.unfoldedLevel, treeContainerClassName = props.treeContainerClassName, _h = props.amis, amis = _h === void 0 ? {} : _h;
+    return __assign$2({ "type": mode, "id": id, "label": label, "name": name, "options": [], "multiple": multiple, "delimiter": delimiter, "joinValues": joinValues, "extractValue": extractValue, "searchable": searchable, "showOutline": showOutline, "initiallyOpen": initiallyOpen, "unfoldedLevel": unfoldedLevel, "className": className, "required": required, "treeContainerClassName": treeContainerClassName, 
+        // "menuTpl": {
+        //     type: "tpl",
+        //     tpl: "<div class='flex justify-between'><span>${label}</span><span class='rounded p-1 text-xs text-center w-14 ${children != null ? \'hidden\' : \'\'}'><button onClick='console.log(11111)'><i class='fa-regular fa-star'></i></button></span></div>",
+        //     "onEvent": {
+        //         "click": {
+        //           "weight": 0,
+        //           "actions": [
+        //             {
+        //               "args": {
+        //                 "api": {
+        //                   "url": "/aaa",
+        //                   "method": "get",
+        //                   "messages": {
+        //                   }
+        //                 }
+        //               },
+        //               "actionType": "download"
+        //             }
+        //           ]
+        //         }
+        //       }
+        // },
         "source": {
             "method": "post",
             "url": "${context.rootUrl}/graphql?keywords=${keywords}",
@@ -13027,12 +13050,7 @@ var getSelectFlowSchema = function (id, props) {
             "headers": {
                 "Authorization": "Bearer ${context.tenantId},${context.authToken}"
             }
-        },
-        "showIcon": showIcon,
-        "showRadio": showRadio,
-        "onlyLeaf": true,
-        "onEvent": onEvent,
-    };
+        }, "showIcon": showIcon, "showRadio": showRadio, "onlyLeaf": true, "onEvent": onEvent }, amis);
 };
 /**
  *