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

package/dist/index.esm.js

@@ -901,7 +901,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}`
     }
 }
 
@@ -1048,10 +1048,18 @@ 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) { 
@@ -1160,7 +1168,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,
@@ -1269,6 +1277,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;
@@ -3668,7 +3681,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,
@@ -4177,6 +4190,7 @@ async function lookupToAmisSelect(field, readonly, ctx){
         type: getAmisStaticFieldType('select', readonly),
         joinValues: false,
         extractValue: true,
+        clearable: true,
         // labelField: labelField,
         // valueField: valueField,
         source: apiInfo,
@@ -4371,6 +4385,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);
     }
@@ -5345,15 +5367,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){
@@ -6434,6 +6458,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)){
@@ -8954,6 +8982,7 @@ const getNextStepInput = async (instance) => {
             id: "u:next_step",
             multiple: false,
             required: true,
+            selectFirst: true,
             "source": {
               "url": "${context.rootUrl}/api/workflow/v2/nextStep?judge=${new_judge}",
               "headers": {
@@ -8981,20 +9010,7 @@ 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": [
@@ -9008,7 +9024,6 @@ const getNextStepInput = async (instance) => {
                     "actionType": "setValue"
                   },
                   {
-                    // "componentId": "u:next_step",
                     "args": {
                       next_step: "${event.data.value}",
                     },
@@ -9017,7 +9032,6 @@ const getNextStepInput = async (instance) => {
                   },
                 ]
               }
-              
             }
           },
         ],
@@ -9292,6 +9306,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];
     },
@@ -9645,7 +9662,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-22 14:43:18
  * @Description:
  */
 
@@ -10358,6 +10375,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": "标题面板",