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

package/dist/index.esm.js

@@ -1368,8 +1368,8 @@ var config = {
 /*
  * @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: 
  */
 
@@ -1461,7 +1461,8 @@ const getSchema$4 = async (uiSchema, ctx) => {
                                             "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",
@@ -1470,7 +1471,7 @@ const getSchema$4 = async (uiSchema, ctx) => {
                                                 "headers": {
                                                     "Authorization": "Bearer ${context.tenantId},${context.authToken}"
                                                 },
-                                                "requestAdaptor": "",
+                                                "requestAdaptor": "return { ...api, url: api.body.url }",
                                                 "adaptor": schemaApiAdaptor
                                             }
                                         }
@@ -3411,6 +3412,7 @@ function getObjectHeaderToolbar(mainObject, formFactor, {showDisplayAs = false,
     `;
     return [
       // "bulkActions",
+      ...(headerToolbarItems || []),
       hiddenCount ? {} :{
         "type": "tpl",
         "tpl": "${count} 个项目"
@@ -4507,13 +4509,16 @@ async function lookupToAmisPicker(field, readonly, ctx){
         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]];
             }
         }
 
@@ -4567,6 +4572,9 @@ async function lookupToAmisPicker(field, readonly, ctx){
         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;
     `;
@@ -5648,7 +5656,7 @@ async function convertSFieldToAmisField(field, readonly, ctx) {
                     columnsTogglable: false,
                     strictMode:false,
                     affixHeader: false, // 是否固定表头, 不固定表头, 否则form有y轴滚动条时, 表头会跟随滚动条滚动.
-                    // needConfirm: true,  此属性设置为false后，导致table不能编辑。
+                    needConfirm: false,
                     editable: !readonly,
                     addable: !readonly,
                     removable: !readonly,
@@ -6002,12 +6010,12 @@ function getScriptForRewriteValueForFileFields(fields){
                                 });
                             }
                         }else{
-                            data[item] = {
+                            data[item] = [{
                                 value: fileFieldValue,
                                 name: fileFieldDisplayValue.name,
                                 url: fileFieldDisplayValue.url + "?download=true",
                                 state: "uploaded"
-                            };
+                            }];
                         }
                     }
                 })
@@ -6734,6 +6742,13 @@ async function getTableColumns(fields, options){
             }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,
@@ -6744,7 +6759,7 @@ async function getTableColumns(fields, options){
                     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}));
@@ -7240,7 +7255,6 @@ async function getTableApi(mainObject, fields, options){
             if(_.isEmpty(filters)){
                 filters = userFilters;
             }else{
-                filters.push('and');
                 filters.push(userFilters)
             }
         }
@@ -7668,7 +7682,6 @@ async function getObjectCalendar(objectSchema, calendarOptions, options) {
     // ObjectForm会认作用域下的变量值
     // TODO: 待组件支持initValues属性后应该改掉，不应该通过data直接传值
     // TODO: 全天事件属性传入doc了但是没有生效，需要手动在ObjectForm中勾选全天事件
-    event.data = doc;
     const title = "新建 ${objectSchema.label}";
     doAction(
       {
@@ -7681,6 +7694,7 @@ async function getObjectCalendar(objectSchema, calendarOptions, options) {
               "type": "steedos-object-form",
               "objectApiName": "\${objectName}",
               "mode": "edit",
+              "defaultData": doc,
               "onEvent": {
                 "submitSucc": {
                   "weight": 0,