@steedos-widgets/amis-lib 1.2.6-beta.12 → 1.2.6-beta.14

package/dist/index.umd.js

@@ -2931,8 +2931,8 @@
                     },
                     {
                       "type": "dropdown-button",
-                      "className": "",
-                      "label": "\${uiSchema.list_views[listName].label}",
+                      "className": "", 
+                      "label": "\${listName ? uiSchema.list_views[listName].label : uiSchema.list_views[defaultListName].label}",
                       "rightIcon": "fa fa-caret-down",
                       "size": "sm",
                       "hideCaret": true,
@@ -3340,7 +3340,7 @@
       "icon": "fa fa-table-columns",
       "btnClassName": "antd-Button--iconOnly bg-white p-2 rounded border-gray-300 text-gray-500",
       "align": "right",
-      "visibleOn": "${window:innerWidth > 768}",
+      "visibleOn": "${window:innerWidth > 768 && !!!isLookup}",
       "buttons": [ 
         {
           "label": "显示为",
@@ -4681,6 +4681,8 @@ setTimeout(()=>{
               ...ctx
           });
 
+          pickerSchema.affixHeader = false;
+
           var headerToolbarItems = [];
           const isMobile = window.innerWidth < 768;
           if(referenceTo.objectName === "space_users" && field.reference_to_field === "user" && !isMobile){
@@ -4698,14 +4700,11 @@ setTimeout(()=>{
               pickerSchema.headerToolbar.push(new_button);
           }
           pickerSchema.footerToolbar = refObjectConfig.enable_tree ? [] : getObjectFooterToolbar();
-          //TODO: 等待放大镜bug修复,if会去掉，始终显示放大镜
-          if(referenceTo.objectName != "space_users" || field.reference_to_field != "user"){
-              if (ctx.filterVisible !== false) {
-                  pickerSchema.filter = await getObjectFilter(refObjectConfig, fields, {
-                      isLookup: true,
-                      ...ctx
-                  });
-              }
+          if (ctx.filterVisible !== false) {
+              pickerSchema.filter = await getObjectFilter(refObjectConfig, fields, {
+                  isLookup: true,
+                  ...ctx
+              });
           }
           pickerSchema.data = Object.assign({}, pickerSchema.data, {
               "&": "$$",
@@ -4951,8 +4950,10 @@ setTimeout(()=>{
 
       if(referenceTo.objectName === "space_users" && field.reference_to_field === "user"){
           if(ctx.idsDependOn || field.amis){
+              // ids人员点选模式
               return await lookupToAmisIdsPicker(field, readonly, ctx);
           }
+          // 左侧树右侧人员列表的下拉框模式，不再支持，而是执行下面的lookupToAmisPicker函数弹出选人窗口
           // return await lookupToAmisSelectUser(field, readonly, ctx);
       }
 
@@ -5053,6 +5054,9 @@ setTimeout(()=>{
               top:  top,
               ...ctx
           });
+
+          pickerSchema.affixHeader = false;
+
       }
 
       const data = {
@@ -5082,7 +5086,6 @@ setTimeout(()=>{
       if(readonly){
           data.tpl = await getLookupTpl(field, ctx);
       }
-
       return data;
   }
 
@@ -5912,6 +5915,12 @@ setTimeout(()=>{
       // })
 
       return  `
+    if(payload.data.data.length === 0){
+        return {
+            status: 2,
+            msg: "无法找到记录"
+        }
+    }
     if(payload.data.data){
         var data = payload.data.data[0];
         var gridAndObjectFieldsName = ${JSON.stringify(gridAndObjectFieldsName)};
@@ -6059,7 +6068,7 @@ setTimeout(()=>{
 
       return {
           method: "post",
-          url: getApi$2(),
+          url: getApi$2() + '&objectName=${objectName}' ,
           // sendOn: "!!this.recordId",
           cache: API_CACHE,
           requestAdaptor: `
@@ -6579,7 +6588,8 @@ setTimeout(()=>{
                     "eventName": `@data.changed.${objectSchema.name}`
                   },
                   "data": {
-                    "objectName": `${objectSchema.name}`
+                    "objectName": `${objectSchema.name}`,
+                    "displayAs": "${displayAs}"
                   }
                 },
                 {
@@ -6679,7 +6689,8 @@ setTimeout(()=>{
                   data: {
                     objectName: "${event.data.__objectName}",
                     record: "${event.data.__record}"
-                  }
+                  },
+                  expression: "${event.data.__response.error != true}"
                 },
                 {
                   "actionType": "setValue",
@@ -6687,7 +6698,8 @@ setTimeout(()=>{
                      value: {
                       "recordLoaded": true,
                      }
-                  }
+                  },
+                  expression: "${event.data.__response.error != true}"
               }
               ]
             }
@@ -7248,7 +7260,11 @@ setTimeout(()=>{
             filters = systemFilters;
         };
         if(api.data.$self.additionalFilters){
-            userFilters.push(api.data.$self.additionalFilters)
+            if(_.isString(api.data.$self.additionalFilters)){
+                userFilters.push(eval(api.data.$self.additionalFilters))
+            }else{
+                userFilters.push(api.data.$self.additionalFilters)
+            }
         }
 
         if(api.data.$self._isRelated){
@@ -7281,7 +7297,7 @@ setTimeout(()=>{
             if(_.isEmpty(filters)){
                 filters = userFilters;
             }else{
-                filters.push(userFilters)
+                filters = [filters, 'and', userFilters]
             }
         }
         api.data = {
@@ -8356,7 +8372,7 @@ setTimeout(()=>{
    * @Author: baozhoutao@steedos.com
    * @Date: 2022-07-05 15:55:39
    * @LastEditors: baozhoutao@steedos.com
-   * @LastEditTime: 2023-04-17 15:26:17
+   * @LastEditTime: 2023-04-28 11:11:29
    * @Description:
    */
 
@@ -8554,6 +8570,9 @@ setTimeout(()=>{
       ctx = {}
   ) {
       const uiSchema = await getUISchema(objectName);
+      if(!uiSchema){
+          return {}
+      }
       const listView =  _$1.find(
           uiSchema.list_views,
           (listView, name) => {