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

package/dist/index.esm.js

@@ -2905,8 +2905,8 @@ function getObjectListHeaderFirstLine(objectSchema, listViewName, ctx) {
                   },
                   {
                     "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,
@@ -3314,7 +3314,7 @@ const getDisplayAsButton = function(objectName, showDisplayAs){
     "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": "显示为",
@@ -4655,6 +4655,8 @@ async function lookupToAmisPicker(field, readonly, ctx){
             ...ctx
         });
 
+        pickerSchema.affixHeader = false;
+
         var headerToolbarItems = [];
         const isMobile = window.innerWidth < 768;
         if(referenceTo.objectName === "space_users" && field.reference_to_field === "user" && !isMobile){
@@ -4672,14 +4674,11 @@ async function lookupToAmisPicker(field, readonly, ctx){
             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, {
             "&": "$$",
@@ -4925,8 +4924,10 @@ async function lookupToAmis(field, readonly, ctx){
 
     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);
     }
 
@@ -5027,6 +5028,9 @@ async function getIdsPickerSchema(field, readonly, ctx){
             top:  top,
             ...ctx
         });
+
+        pickerSchema.affixHeader = false;
+
     }
 
     const data = {
@@ -5056,7 +5060,6 @@ async function getIdsPickerSchema(field, readonly, ctx){
     if(readonly){
         data.tpl = await getLookupTpl(field, ctx);
     }
-
     return data;
 }
 
@@ -5886,6 +5889,12 @@ function getReadonlyFormAdaptor(object, fields){
     // })
 
     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)};
@@ -6033,7 +6042,7 @@ async function getEditFormInitApi(object, recordId, fields, options){
 
     return {
         method: "post",
-        url: getApi$2(),
+        url: getApi$2() + '&objectName=${objectName}' ,
         // sendOn: "!!this.recordId",
         cache: API_CACHE,
         requestAdaptor: `
@@ -6553,7 +6562,8 @@ async function getObjectForm(objectSchema, ctx){
                   "eventName": `@data.changed.${objectSchema.name}`
                 },
                 "data": {
-                  "objectName": `${objectSchema.name}`
+                  "objectName": `${objectSchema.name}`,
+                  "displayAs": "${displayAs}"
                 }
               },
               {
@@ -6653,7 +6663,8 @@ async function getObjectDetail(objectSchema, recordId, ctx){
                 data: {
                   objectName: "${event.data.__objectName}",
                   record: "${event.data.__record}"
-                }
+                },
+                expression: "${event.data.__response.error != true}"
               },
               {
                 "actionType": "setValue",
@@ -6661,7 +6672,8 @@ async function getObjectDetail(objectSchema, recordId, ctx){
                    value: {
                     "recordLoaded": true,
                    }
-                }
+                },
+                expression: "${event.data.__response.error != true}"
             }
             ]
           }
@@ -7222,7 +7234,11 @@ async function getTableApi(mainObject, fields, options){
             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){
@@ -7255,7 +7271,7 @@ async function getTableApi(mainObject, fields, options){
             if(_.isEmpty(filters)){
                 filters = userFilters;
             }else{
-                filters.push(userFilters)
+                filters = [filters, 'and', userFilters]
             }
         }
         api.data = {
@@ -8330,7 +8346,7 @@ async function getRelatedListSchema(
  * @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:
  */
 
@@ -8528,6 +8544,9 @@ async function getListSchema(
     ctx = {}
 ) {
     const uiSchema = await getUISchema(objectName);
+    if(!uiSchema){
+        return {}
+    }
     const listView =  find(
         uiSchema.list_views,
         (listView, name) => {