@steedos-widgets/amis-lib 1.2.26 → 1.2.28

package/dist/index.umd.js

@@ -671,6 +671,10 @@
               if(_$1.includes(['percent','time','filesize','date','datetime','boolean','number','currency', 'select', 'file', 'image', 'avatar', 'formula', 'summary', 'object', 'grid'], field.type)){
                   displayFields.push(`${field.name}`);
               }
+          }else {
+              objectFieldName = field.name.split('.')[0];
+              fieldsName.push(objectFieldName);
+              displayFields.push(objectFieldName);
           }
       }
 
@@ -1751,8 +1755,8 @@
   /*
    * @Author: baozhoutao@steedos.com
    * @Date: 2022-11-01 15:51:00
-   * @LastEditors: liaodaxue
-   * @LastEditTime: 2023-06-06 11:12:33
+   * @LastEditors: 殷亮辉 yinlianghui@hotoa.com
+   * @LastEditTime: 2023-06-28 23:19:41
    * @Description: 
    */
 
@@ -1803,6 +1807,16 @@
         return {
             data: formSchema
         };
+    `;
+      const onDialogCancelScript = `
+        // 这里加setTimeout是因为amis的Bug，它会先触发cancel事件执行此脚本关闭父窗口然后再关闭子窗口
+        // 正确的顺序应该是先关闭子窗口再关闭父窗口，顺序错了会造成第二次点击新建按钮的时候异常
+        setTimeout(function(){
+            doAction({
+                "actionType": "cancel",
+                "componentId": "object_actions_drawer_${uiSchema.name}"
+            });
+        }, 200);
     `;
       return {
           "type": "service",
@@ -1864,6 +1878,17 @@
                                       "closeOnEsc": false,
                                       "closeOnOutside": false,
                                       "size": "lg",
+                                      "onEvent": {
+                                          "cancel": {
+                                              "actions": [
+                                                  {
+                                                      "actionType": "custom",
+                                                      "script": onDialogCancelScript,
+                                                      "expression": "${window:innerWidth < 768}",
+                                                  }
+                                              ]
+                                          }
+                                      },
                                       "actions": [
                                           {
                                               type: 'button',
@@ -1926,7 +1951,7 @@
    * @Author: baozhoutao@steedos.com
    * @Date: 2022-11-01 15:49:58
    * @LastEditors: 殷亮辉 yinlianghui@hotoa.com
-   * @LastEditTime: 2023-03-27 11:36:49
+   * @LastEditTime: 2023-06-28 23:22:31
    * @Description:
    */
 
@@ -1955,6 +1980,17 @@
         ? JSON.parse(page.schema)
         : page.schema;
     }
+    
+    const onDialogCancelScript = `
+    // 这里加setTimeout是因为amis的Bug，它会先触发cancel事件执行此脚本关闭父窗口然后再关闭子窗口
+    // 正确的顺序应该是先关闭子窗口再关闭父窗口，顺序错了会造成第二次点击编辑按钮的时候异常
+    setTimeout(function(){
+      doAction({
+        "actionType": "cancel",
+        "componentId": "object_actions_drawer_${uiSchema.name}"
+      });
+    }, 200);
+  `;
 
     return {
       type: "service",
@@ -1978,6 +2014,17 @@
                     closeOnOutside: false,
                     showCloseButton: true,
                     size: "lg",
+                    "onEvent": {
+                      "cancel": {
+                        "actions": [
+                          {
+                            "actionType": "custom",
+                            "script": onDialogCancelScript,
+                            "expression": "${window:innerWidth < 768}",
+                          }
+                        ]
+                      }
+                    },
                   },
                 },
               ],
@@ -2274,6 +2321,7 @@
                                 label: i18next__default["default"].t('frontend_import_data_file'),
                                 required: true,
                                 type: "input-file",
+                                accept: ".xlsx,.xls",
                                 className: "m-1",
                                 labelClassName: "text-left",
                                 clearValueOnHidden: true,
@@ -2938,6 +2986,7 @@
                       "drawer": {
                         "type": "drawer",
                         "title": "操作",
+                        "id": "object_actions_drawer_" + objectSchema.name,
                         "body": [
                           {
                             "type": "button-group",
@@ -2960,7 +3009,6 @@
                             "size": "lg"
                           }
                         ],
-                        "id": "u:9815f7366b9f",
                         "position": "bottom",
                         "closeOnOutside": true,
                         "resizable": false,
@@ -2971,8 +3019,7 @@
                     }
                   ]
                 }
-              },
-              "id": "u:ee7c7929e6ae"
+              }
             }
       }else {
           if(moreButtons.length > 0){
@@ -3004,6 +3051,7 @@
                       "drawer": {
                         "type": "drawer",
                         "title": "操作",
+                        "id": "object_actions_drawer_" + objectSchema.name,
                         "body": [
                           {
                             "type": "button-group",
@@ -3027,7 +3075,6 @@
                             "size": "lg"
                           }
                         ],
-                        "id": "u:9815f7366b9f",
                         "position": "bottom",
                         "closeOnOutside": true,
                         "resizable": false,
@@ -3038,8 +3085,7 @@
                     }
                   ]
                 }
-              },
-              "id": "u:ee7c7929e6ae"
+              }
             }
       }else {
           return ___default["default"].map(buttons, (button) => {
@@ -3068,6 +3114,7 @@
                       "drawer": {
                         "type": "drawer",
                         "title": "操作",
+                        "id": "object_actions_drawer_" + objectSchema.name,
                         "body": [
                           {
                             "type": "button-group",
@@ -5644,6 +5691,8 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
       const fieldsArr = [];
 
       const listName = "all";
+      
+      const isMobile = window.innerWidth < 768;
 
       const listView = ___namespace.find(
           refObjectConfig.list_views,
@@ -5720,6 +5769,7 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
       
       source.data.$term = "$term";
       source.data.$self = "$$";
+
      
       source.requestAdaptor = `
         const selfData = JSON.parse(JSON.stringify(api.data.$self));
@@ -5755,6 +5805,7 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
             }
         }
 
+
         if(allowSearchFields){
             allowSearchFields.forEach(function(key){
                 const keyValue = selfData[key];
@@ -5870,7 +5921,6 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
           pickerSchema.affixHeader = false;
 
           var headerToolbarItems = [];
-          const isMobile = window.innerWidth < 768;
           if(referenceTo.objectName === "space_users" && field.reference_to_field === "user" && !isMobile){
                headerToolbarItems = getLookupSapceUserTreeSchema();
                pickerSchema["style"] = {
@@ -5951,7 +6001,7 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
                     }
                     
                     const ctx = ${JSON.stringify(ctx)};
-                    const componentId = ctx.defaults.formSchema.id ? 'service-'+ctx.defaults.formSchema.id : 'new-'+ctx.defaults.formSchema.objectApiName;
+                    const componentId = ctx.defaults.formSchema.id;
                     doAction({
                         actionType: 'setValue',
                         componentId: componentId, 
@@ -6205,6 +6255,11 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
               // ids人员点选模式
               return await lookupToAmisIdsPicker(field, readonly, ctx);
           }
+          if(!field.filters || field.filters.length == 0){
+              field.filters = [["user_accepted", "=", true]];
+          }else {
+              field.filters = [ ["user_accepted", "=", true], "and", field.filters ];
+          }
           // 左侧树右侧人员列表的下拉框模式，不再支持，而是执行下面的lookupToAmisPicker函数弹出选人窗口
           // return await lookupToAmisSelectUser(field, readonly, ctx);
       }
@@ -6345,7 +6400,7 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
    * @Author: baozhoutao@steedos.com
    * @Date: 2023-01-13 17:27:54
    * @LastEditors: liaodaxue
-   * @LastEditTime: 2023-06-16 15:58:21
+   * @LastEditTime: 2023-06-30 10:29:52
    * @Description: 
    */
 
@@ -6353,12 +6408,16 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
   const getMarkdownFieldSchema = (field, readonly, ctx)=>{
       if(readonly){
           return {
-              "type": "markdown",
-              "name": field.name,
-              "options": {
-                  "linkify": true,
-                  "html": true,
-                  "breaks": true
+              "type": "control",
+              "label": field.label,
+              "body": {
+                "type": "markdown",
+                "name": field.name,
+                "options": {
+                    "linkify": true,
+                    "html": true,
+                    "breaks": true
+                }
               }
             }
       }else {
@@ -7439,6 +7498,7 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
   async function getTableColumns(fields, options){
       const columns = [{name: '_index',type: 'text', width: 32, placeholder: ""}];
       const allowEdit = options.permissions?.allowEdit && options.permissions?.modifyAllRecords && !options.isLookup && options.enable_inline_edit != false;
+      const defaultWidth = "unset";//用于使table内的td标签下生成div，实现将快速编辑按钮固定在右侧的效果，并不是为了unset效果
       for (const field of fields) {
           //增加quickEdit属性，实现快速编辑
           const quickEditSchema = allowEdit ? await getQuickEditSchema(field, options) : allowEdit;
@@ -7495,7 +7555,7 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
                   type: "switch",
                   name: field.name,
                   label: field.label,
-                  width: field.width,
+                  width: field.width || defaultWidth,
                   toggled: field.toggled,
                   quickEdit: quickEditSchema,
                   className:"whitespace-nowrap",
@@ -7510,7 +7570,7 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
                   label: field.label,
                   map: map,
                   sortable: field.sortable,
-                  width: field.width,
+                  width: field.width || defaultWidth,
                   toggled: field.toggled,
                   className:"whitespace-nowrap",
                   quickEdit: quickEditSchema
@@ -7539,7 +7599,7 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
                       label: field.label,
                       sortable: field.sortable,
                       // searchable: field.searchable,
-                      width: field.width,
+                      width: field.width || defaultWidth,
                       type: type,
                       tpl: tpl,
                       toggled: field.toggled,
@@ -7946,6 +8006,7 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
       let valueField = mainObject.key_field || '_id';
       const api = await getApi(mainObject, null, fields, {count: options.queryCount, alias: 'rows', limit: top, queryOptions: `filters: {__filters}, top: {__top}, skip: {__skip}, sort: "{__sort}"`});
 
+      api.url += "&objectName=${objectName}";//设计器上对象表格组件需要切换对象重新请求列表数据
       if(options.isRelated){
           api.url += "&recordId=${_master.recordId}";
       }
@@ -8275,12 +8336,18 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
       //     }
       // })
 
+      var fieldNames = ___namespace.map(fields, function(n){return n.name});
       return  `
     if(payload.data.data.length === 0){
         var isEditor = !!${options && options.isEditor};
         if(isEditor){
+            var fieldNames = ${JSON.stringify(fieldNames)};
+            var emptyDoc = {};//这里如果不把每个字段值设置为空的话，表单上会显示上一次表单上的字段值
+            fieldNames.forEach(function(n){
+                emptyDoc[n] = null;
+            });
             // 设计器中始终显示表单，有记录则显示第一条记录，没记录时显示为空表单
-            payload.data.data = [{}];
+            payload.data.data = [emptyDoc];
         }
         else{
             return {
@@ -9084,8 +9151,8 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
   /*
    * @Author: baozhoutao@steedos.com
    * @Date: 2022-05-26 16:02:08
-   * @LastEditors: 殷亮辉 yinlianghui@hotoa.com
-   * @LastEditTime: 2023-06-04 15:49:23
+   * @LastEditors: liaodaxue
+   * @LastEditTime: 2023-06-29 17:27:19
    * @Description: 
    */
 
@@ -9179,7 +9246,7 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
       const section = await getSection(formFields, permissionFields, fieldSchemaArray, key, ctx);
       if (section.body.length > 0) {
         if (section.visibleOn) {
-          sectionVisibleOns.push(section.visibleOn);
+          sectionVisibleOns.push("("+section.visibleOn+")");
         }
         else {
           sectionVisibleOns.push("true");
@@ -9517,8 +9584,12 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
       if(___default["default"].has(formSchema, 'className')){
         formSchema.className = 'steedos-amis-form';
       }
+      if(!formSchema.id){
+        formSchema.id = 'form_' + objectSchema.name;
+      }
       const amisSchema =  {
         type: 'service',
+        id: `service_${formSchema.id}`,
         className: 'p-0',
         name: `page_edit_${recordId}`,
         api: await getEditFormInitApi(objectSchema, recordId, fields, ctx),
@@ -9589,11 +9660,6 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
           }
         })]
       };
-      if(formSchema.id){
-        amisSchema.id = `service-${formSchema.id}`;
-      }else {
-        amisSchema.id = `new-${objectSchema.name}`;
-      }
       return amisSchema;
   }