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

package/dist/index.umd.js

@@ -927,7 +927,7 @@
   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}`
       }
   }
 
@@ -1074,10 +1074,18 @@
       }
       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) { 
@@ -1186,7 +1194,7 @@
     `;
       return {
           "method": "post",
-          "url": getApi$2() + "?ref=${ref}&dep=${value}",
+          "url": getApi$2() + "&ref=${ref}&dep=${value}",
           "requestAdaptor": requestAdaptor,
           "adaptor": adaptor,
           "data": data,
@@ -1295,6 +1303,11 @@
           if (typeof amisSchema.searchable !== "boolean") {
               amisSchema.searchable = true;
           }
+
+          if(ctx.value){
+              amisSchema.value = ctx.value;
+          }
+
           const onEvent = field.onEvent;
           if (onEvent) {
               amisSchema.onEvent = onEvent;
@@ -3694,7 +3707,7 @@ filterService.setData({showFieldsFilter: !!!filterService.props.data.showFieldsF
     `;
       return {
           "method": "post",
-          "url": getApi$2() + "?dep=${value}",
+          "url": getApi$2() + "&dep=${value}",
           "requestAdaptor": requestAdaptor,
           "adaptor": adaptor,
           "data": data,
@@ -4203,6 +4216,7 @@ filterService.setData({showFieldsFilter: !!!filterService.props.data.showFieldsF
           type: getAmisStaticFieldType('select', readonly),
           joinValues: false,
           extractValue: true,
+          clearable: true,
           // labelField: labelField,
           // valueField: valueField,
           source: apiInfo,
@@ -4397,6 +4411,14 @@ filterService.setData({showFieldsFilter: !!!filterService.props.data.showFieldsF
           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);
       }
@@ -5371,15 +5393,17 @@ filterService.setData({showFieldsFilter: !!!filterService.props.data.showFieldsF
                 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){
@@ -6460,6 +6484,10 @@ filterService.setData({showFieldsFilter: !!!filterService.props.data.showFieldsF
 
         if(!_.isEmpty(systemFilters)){
             filters = systemFilters;
+        };
+
+        if(api.data.$self.additionalFilters){
+            userFilters.push(api.data.$self.additionalFilters)
         }
 
         if(!_.isEmpty(userFilters)){
@@ -8980,6 +9008,7 @@ filterService.setData({showFieldsFilter: !!!filterService.props.data.showFieldsF
               id: "u:next_step",
               multiple: false,
               required: true,
+              selectFirst: true,
               "source": {
                 "url": "${context.rootUrl}/api/workflow/v2/nextStep?judge=${new_judge}",
                 "headers": {
@@ -9007,20 +9036,7 @@ filterService.setData({showFieldsFilter: !!!filterService.props.data.showFieldsF
                   "judge": "${new_judge}",
                 }
               },
-              // "labelField": "name",
-              // "valueField": "_id",
               "onEvent": {
-                // "change": {
-                //   "weight": 0,
-                //   "actions": [
-                //     {
-                //       "componentId": "u:next_users",
-                //       "args": {
-                //       },
-                //       "actionType": "reload"
-                //     }
-                //   ]
-                // },
                 "change": {
                   "weight": 0,
                   "actions": [
@@ -9034,7 +9050,6 @@ filterService.setData({showFieldsFilter: !!!filterService.props.data.showFieldsF
                       "actionType": "setValue"
                     },
                     {
-                      // "componentId": "u:next_step",
                       "args": {
                         next_step: "${event.data.value}",
                       },
@@ -9043,7 +9058,6 @@ filterService.setData({showFieldsFilter: !!!filterService.props.data.showFieldsF
                     },
                   ]
                 }
-                
               }
             },
           ],
@@ -9318,6 +9332,9 @@ filterService.setData({showFieldsFilter: !!!filterService.props.data.showFieldsF
       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];
       },
@@ -9671,7 +9688,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-18 17:29:01
+   * @LastEditTime: 2023-03-22 14:43:18
    * @Description:
    */
 
@@ -10384,6 +10401,7 @@ filterService.setData({showFieldsFilter: !!!filterService.props.data.showFieldsF
       type: "page",
       name: "instancePage",
       className: "steedos-amis-instance-view",
+      bodyClassName: "overflow-y-auto h-full",
       "title": {
         "type": "steedos-record-detail-header",
         "label": "标题面板",