@steedos-widgets/amis-lib 1.1.0-beta.1 → 1.1.0

package/dist/index.cjs.js

@@ -928,7 +928,7 @@ function getRecordPermissionsQuery(object, recordId, options){
 function getApi$2 (isMobile){
     if(isMobile);else {
         // return __meteor_runtime_config__.ROOT_URL_PATH_PREFIX + "/graphql"
-        return `\${context.rootUrl}/graphql`
+        return `\${context.rootUrl}/graphql?reload=\${additionalFilters}`
     }
 }
 
@@ -1075,6 +1075,7 @@ async function getSource$1(field, ctx) {
     }
     data.$value = `$${valueField}`;
     // data["&"] = "$$";
+
     const requestAdaptor = `
         var filters = [['parent', '=', null]];
         api.data.query = api.data.query.replace(/{__filters}/g, JSON.stringify(filters));
@@ -1187,7 +1188,7 @@ async function getDeferApi$1(field, ctx) {
     `;
     return {
         "method": "post",
-        "url": getApi$2() + "?ref=${ref}&dep=${value}",
+        "url": getApi$2() + "&ref=${ref}&dep=${value}",
         "requestAdaptor": requestAdaptor,
         "adaptor": adaptor,
         "data": data,
@@ -1296,6 +1297,11 @@ async function getSelectUserSchema(field, readonly, ctx) {
         if (typeof amisSchema.searchable !== "boolean") {
             amisSchema.searchable = true;
         }
+
+        if(ctx.value){
+            amisSchema.value = ctx.value;
+        }
+
         const onEvent = field.onEvent;
         if (onEvent) {
             amisSchema.onEvent = onEvent;
@@ -3695,7 +3701,7 @@ async function getDeferApi(field, ctx) {
     `;
     return {
         "method": "post",
-        "url": getApi$2() + "?dep=${value}",
+        "url": getApi$2() + "&dep=${value}",
         "requestAdaptor": requestAdaptor,
         "adaptor": adaptor,
         "data": data,
@@ -4204,6 +4210,7 @@ async function lookupToAmisSelect(field, readonly, ctx){
         type: getAmisStaticFieldType('select', readonly),
         joinValues: false,
         extractValue: true,
+        clearable: true,
         // labelField: labelField,
         // valueField: valueField,
         source: apiInfo,
@@ -4265,21 +4272,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判断
@@ -4314,7 +4320,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,
@@ -4328,14 +4334,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 = `
@@ -4352,10 +4353,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]);
@@ -4398,6 +4399,14 @@ async function getIdsPickerSchema(field, readonly, ctx){
         data.extractValue = true;
     }
 
+    if(ctx.value){
+        data.value = ctx.value;
+    }
+
+    if(ctx.selectFirst != undefined){
+        data.selectFirst = ctx.selectFirst;
+    }
+
     if(readonly){
         data.tpl = await getLookupTpl(field, ctx);
     }
@@ -5372,15 +5381,17 @@ async function getEditFormInitApi(object, recordId, fields){
                 const dataKeys = _.keys(data);
                 const uiSchema = api.body.uiSchema;
                 const fieldKeys = uiSchema && _.keys(uiSchema.fields);
-                _.each(dataKeys, function(key){
-                    if(fieldKeys.indexOf(key)<0){
-                        delete data[key];
-                    }
-                })
 
                 if(data){
                     ${getScriptForAddUrlPrefixForImgFields(fields)}
                     ${getScriptForRewriteValueForFileFields(fields)}
+
+                    _.each(dataKeys, function(key){
+                        if(fieldKeys.indexOf(key)<0){
+                            delete data[key];
+                        }
+                    })
+                    
                     //初始化接口返回的字段移除字段值为null的字段
                     for (key in data){
                         if(data[key] === null){
@@ -6461,6 +6472,10 @@ async function getTableApi(mainObject, fields, options){
 
         if(!_.isEmpty(systemFilters)){
             filters = systemFilters;
+        };
+
+        if(api.data.$self.additionalFilters){
+            userFilters.push(api.data.$self.additionalFilters)
         }
 
         if(!_.isEmpty(userFilters)){
@@ -6877,7 +6892,7 @@ async function getObjectCalendar(objectSchema, calendarOptions, options) {
         initialView = "dayGridMonth";
         break;
       case "agenda":
-        initialView = "timeGridDay";
+        initialView = "listWeek";
         break;
     }
   }
@@ -7099,6 +7114,30 @@ async function getObjectCalendar(objectSchema, calendarOptions, options) {
           }
         ]
       },
+      "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;
@@ -8929,7 +8968,6 @@ const getJudgeInput = async (instance) => {
               "args": {
                 "value": {
                   new_judge: "${event.data.value}",
-                  new_next_step: undefined,
                   next_step: undefined,
                 }
               },
@@ -8981,6 +9019,11 @@ const getNextStepInput = async (instance) => {
             id: "u:next_step",
             multiple: false,
             required: true,
+            // selectFirst: true,
+            autoFill: {
+              "new_next_step": "${step}",
+              "next_users": null
+            },
             "source": {
               "url": "${context.rootUrl}/api/workflow/v2/nextStep?judge=${new_judge}",
               "headers": {
@@ -8992,10 +9035,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
                     }
                   })
                 };
@@ -9008,44 +9053,29 @@ const getNextStepInput = async (instance) => {
                 "judge": "${new_judge}",
               }
             },
-            // "labelField": "name",
-            // "valueField": "_id",
-            "onEvent": {
-              // "change": {
-              //   "weight": 0,
-              //   "actions": [
-              //     {
-              //       "componentId": "u:next_users",
-              //       "args": {
-              //       },
-              //       "actionType": "reload"
-              //     }
-              //   ]
-              // },
-              "change": {
-                "weight": 0,
-                "actions": [
-                  {
-                    "componentId": "instance_approval",
-                    "args": {
-                      "value": {
-                        new_next_step: "${event.data.value}",
-                      }
-                    },
-                    "actionType": "setValue"
-                  },
-                  {
-                    // "componentId": "u:next_step",
-                    "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",
@@ -9083,56 +9113,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",
@@ -9319,6 +9337,9 @@ const getApprovalDrawerSchema = async (instance) => {
     size: "sm",
     title: `${instance.step.name}`,
     className: "approval-drawer absolute",
+    headerClassName: 'p-2',
+    bodyClassName: 'p-2',
+    footerClassName: 'p-2 pt-0',
     drawerContainer: ()=>{
       return window.$(".antd-Page-content",window.$(".steedos-instance-wrapper"))[0];
     },
@@ -9331,6 +9352,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",
@@ -9361,7 +9386,7 @@ const getApprovalDrawerSchema = async (instance) => {
           //     {
           //       "actionType": "reload",
           //       "componentId": "u:nex_users",
-          //       "args": {t
+          //       "args": {
           //       }
           //     }
           //   ]
@@ -9672,7 +9697,7 @@ const getInstanceApprovalHistory = async ()=>{
  * @Author: baozhoutao@steedos.com
  * @Date: 2022-09-07 16:20:45
  * @LastEditors: baozhoutao@steedos.com
- * @LastEditTime: 2023-03-18 17:29:01
+ * @LastEditTime: 2023-03-23 16:49:44
  * @Description:
  */
 
@@ -10236,7 +10261,6 @@ const getFormTableView = async (instance) => {
     trs: await getFormTrs(instance),
     id: "u:047f3669468b",
   };
-  console.log(`getFormTableView formSchema=====>`, formSchema);
   return formSchema;
 };
 
@@ -10385,6 +10409,7 @@ const getFlowFormSchema = async (instance, box) => {
     type: "page",
     name: "instancePage",
     className: "steedos-amis-instance-view",
+    bodyClassName: "overflow-y-auto h-full",
     "title": {
       "type": "steedos-record-detail-header",
       "label": "标题面板",