@steedos-widgets/amis-lib 1.2.5 → 1.2.6-beta.11

package/dist/index.umd.js

@@ -1394,8 +1394,8 @@
   /*
    * @Author: baozhoutao@steedos.com
    * @Date: 2022-11-01 15:51:00
-   * @LastEditors: baozhoutao@steedos.com
-   * @LastEditTime: 2023-04-19 20:26:27
+   * @LastEditors: Please set LastEditors
+   * @LastEditTime: 2023-04-26 11:52:04
    * @Description: 
    */
 
@@ -1487,7 +1487,8 @@
                                               "schemaApi": {
                                                   "data": {
                                                       "isLookup": "${isLookup}",
-                                                      "_master": "${_master}"
+                                                      "_master": "${_master}",
+                                                      "url": "${context.rootUrl}/api/pageSchema/form?app=${appId}&objectApiName=${objectName}&formFactor=${formFactor}"
                                                   },
                                                   "url": "${context.rootUrl}/api/pageSchema/form?app=${appId}&objectApiName=${objectName}&formFactor=${formFactor}",
                                                   "method": "get",
@@ -1496,7 +1497,7 @@
                                                   "headers": {
                                                       "Authorization": "Bearer ${context.tenantId},${context.authToken}"
                                                   },
-                                                  "requestAdaptor": "",
+                                                  "requestAdaptor": "return { ...api, url: api.body.url }",
                                                   "adaptor": schemaApiAdaptor
                                               }
                                           }
@@ -3437,6 +3438,7 @@ setTimeout(()=>{
     `;
       return [
         // "bulkActions",
+        ...(headerToolbarItems || []),
         hiddenCount ? {} :{
           "type": "tpl",
           "tpl": "${count} 个项目"
@@ -4533,13 +4535,16 @@ setTimeout(()=>{
         var sort = orderBy + ' ' + orderDir;
         sort = orderBy ? sort : "${sort}";
         var allowSearchFields = ${JSON.stringify(searchableFields)};
+        let fieldValue;
         if(api.data.$term){
             filters = [["name", "contains", "'+ api.data.$term +'"]];
         }else if(selfData.op === 'loadOptions' && selfData.value){
             if(selfData.value?.indexOf(',') > 0){
-                filters = [["${referenceTo.valueField.name}", "=", selfData.value.split(',')]];
+                fieldValue = selfData.value.split(',');
+                filters = [["${referenceTo.valueField.name}", "=", fieldValue]];
             }else{
-                filters = [["${referenceTo.valueField.name}", "=", selfData.value]];
+                fieldValue = selfData.value;
+                filters = [["${referenceTo.valueField.name}", "=", fieldValue]];
             }
         }
 
@@ -4593,6 +4598,9 @@ setTimeout(()=>{
         if(enable_tree){
             pageSize = 10000;
         }
+        if(fieldValue && _.isArray(fieldValue) && fieldValue.length > pageSize){
+            pageSize = fieldValue.length;
+        }
         api.data.query = api.data.query.replace(/{__filters}/g, JSON.stringify(filters)).replace('{__top}', pageSize).replace('{__skip}', skip).replace('{__sort}', sort.trim());
         return api;
     `;
@@ -5674,7 +5682,7 @@ setTimeout(()=>{
                       columnsTogglable: false,
                       strictMode:false,
                       affixHeader: false, // 是否固定表头, 不固定表头, 否则form有y轴滚动条时, 表头会跟随滚动条滚动.
-                      // needConfirm: true,  此属性设置为false后，导致table不能编辑。
+                      needConfirm: false,
                       editable: !readonly,
                       addable: !readonly,
                       removable: !readonly,
@@ -6028,12 +6036,12 @@ setTimeout(()=>{
                                 });
                             }
                         }else{
-                            data[item] = {
+                            data[item] = [{
                                 value: fileFieldValue,
                                 name: fileFieldDisplayValue.name,
                                 url: fileFieldDisplayValue.url + "?download=true",
                                 state: "uploaded"
-                            };
+                            }];
                         }
                     }
                 })
@@ -6760,6 +6768,13 @@ setTimeout(()=>{
               }else if(field.type === 'html'){
                   type = 'markdown';
               }
+              let className = "";
+              if(field.type === 'textarea'){
+                  className = 'min-w-56';
+              }
+              if(field.wrap === false){
+                  className += " whitespace-nowrap";
+              }
               if(!field.hidden && !field.extra){
                   columns.push(Object.assign({}, {
                       name: field.name,
@@ -6770,7 +6785,7 @@ setTimeout(()=>{
                       type: type,
                       tpl: tpl,
                       toggled: field.toggled,
-                      className: field.type === 'textarea' ? 'min-w-56 whitespace-pre-wrap textarea' :  "whitespace-nowrap",
+                      className,
                       html: field.type === 'html' ? true : null
                       // toggled: true 
                   }, field.amis, {name: field.name}));
@@ -7266,7 +7281,6 @@ setTimeout(()=>{
             if(_.isEmpty(filters)){
                 filters = userFilters;
             }else{
-                filters.push('and');
                 filters.push(userFilters)
             }
         }
@@ -7694,7 +7708,6 @@ setTimeout(()=>{
     // ObjectForm会认作用域下的变量值
     // TODO: 待组件支持initValues属性后应该改掉，不应该通过data直接传值
     // TODO: 全天事件属性传入doc了但是没有生效，需要手动在ObjectForm中勾选全天事件
-    event.data = doc;
     const title = "新建 ${objectSchema.label}";
     doAction(
       {
@@ -7707,6 +7720,7 @@ setTimeout(()=>{
               "type": "steedos-object-form",
               "objectApiName": "\${objectName}",
               "mode": "edit",
+              "defaultData": doc,
               "onEvent": {
                 "submitSucc": {
                   "weight": 0,