@steedos-widgets/amis-lib 1.2.27 → 1.2.28

package/dist/index.cjs.js

@@ -1758,8 +1758,8 @@ i18next__default["default"]
 /*
  * @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: 
  */
 
@@ -1811,6 +1811,16 @@ const getSchema$5 = async (uiSchema, ctx) => {
             data: formSchema
         };
     `;
+    const onDialogCancelScript = `
+        // 这里加setTimeout是因为amis的Bug，它会先触发cancel事件执行此脚本关闭父窗口然后再关闭子窗口
+        // 正确的顺序应该是先关闭子窗口再关闭父窗口，顺序错了会造成第二次点击新建按钮的时候异常
+        setTimeout(function(){
+            doAction({
+                "actionType": "cancel",
+                "componentId": "object_actions_drawer_${uiSchema.name}"
+            });
+        }, 200);
+    `;
     return {
         "type": "service",
         "body": [
@@ -1871,6 +1881,17 @@ const getSchema$5 = async (uiSchema, ctx) => {
                                     "closeOnEsc": false,
                                     "closeOnOutside": false,
                                     "size": "lg",
+                                    "onEvent": {
+                                        "cancel": {
+                                            "actions": [
+                                                {
+                                                    "actionType": "custom",
+                                                    "script": onDialogCancelScript,
+                                                    "expression": "${window:innerWidth < 768}",
+                                                }
+                                            ]
+                                        }
+                                    },
                                     "actions": [
                                         {
                                             type: 'button',
@@ -1933,7 +1954,7 @@ async function getPage({type, pageId = '', appId, objectName = '', recordId = ''
  * @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:
  */
 
@@ -1962,6 +1983,17 @@ const getSchema$4 = async (uiSchema, ctx) => {
       ? 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",
@@ -1985,6 +2017,17 @@ const getSchema$4 = async (uiSchema, ctx) => {
                   closeOnOutside: false,
                   showCloseButton: true,
                   size: "lg",
+                  "onEvent": {
+                    "cancel": {
+                      "actions": [
+                        {
+                          "actionType": "custom",
+                          "script": onDialogCancelScript,
+                          "expression": "${window:innerWidth < 768}",
+                        }
+                      ]
+                    }
+                  },
                 },
               },
             ],
@@ -2281,6 +2324,7 @@ const getSchema$2 = (uiSchema) => {
                               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,
@@ -2945,6 +2989,7 @@ const getObjectDetailButtonsSchemas = (objectSchema, recordId, ctx)=>{
                     "drawer": {
                       "type": "drawer",
                       "title": "操作",
+                      "id": "object_actions_drawer_" + objectSchema.name,
                       "body": [
                         {
                           "type": "button-group",
@@ -2967,7 +3012,6 @@ const getObjectDetailButtonsSchemas = (objectSchema, recordId, ctx)=>{
                           "size": "lg"
                         }
                       ],
-                      "id": "u:9815f7366b9f",
                       "position": "bottom",
                       "closeOnOutside": true,
                       "resizable": false,
@@ -2978,8 +3022,7 @@ const getObjectDetailButtonsSchemas = (objectSchema, recordId, ctx)=>{
                   }
                 ]
               }
-            },
-            "id": "u:ee7c7929e6ae"
+            }
           }
     }else {
         if(moreButtons.length > 0){
@@ -3011,6 +3054,7 @@ const getObjectListViewButtonsSchemas = (objectSchema, ctx)=>{
                     "drawer": {
                       "type": "drawer",
                       "title": "操作",
+                      "id": "object_actions_drawer_" + objectSchema.name,
                       "body": [
                         {
                           "type": "button-group",
@@ -3034,7 +3078,6 @@ const getObjectListViewButtonsSchemas = (objectSchema, ctx)=>{
                           "size": "lg"
                         }
                       ],
-                      "id": "u:9815f7366b9f",
                       "position": "bottom",
                       "closeOnOutside": true,
                       "resizable": false,
@@ -3045,8 +3088,7 @@ const getObjectListViewButtonsSchemas = (objectSchema, ctx)=>{
                   }
                 ]
               }
-            },
-            "id": "u:ee7c7929e6ae"
+            }
           }
     }else {
         return ___default["default"].map(buttons, (button) => {
@@ -3075,6 +3117,7 @@ const getObjectRecordDetailRelatedListButtonsSchemas = (objectSchema, ctx)=>{
                     "drawer": {
                       "type": "drawer",
                       "title": "操作",
+                      "id": "object_actions_drawer_" + objectSchema.name,
                       "body": [
                         {
                           "type": "button-group",
@@ -5651,6 +5694,8 @@ async function lookupToAmisPicker(field, readonly, ctx){
     const fieldsArr = [];
 
     const listName = "all";
+    
+    const isMobile = window.innerWidth < 768;
 
     const listView = ___namespace.find(
         refObjectConfig.list_views,
@@ -5727,6 +5772,7 @@ async function lookupToAmisPicker(field, readonly, ctx){
     
     source.data.$term = "$term";
     source.data.$self = "$$";
+
    
     source.requestAdaptor = `
         const selfData = JSON.parse(JSON.stringify(api.data.$self));
@@ -5762,6 +5808,7 @@ async function lookupToAmisPicker(field, readonly, ctx){
             }
         }
 
+
         if(allowSearchFields){
             allowSearchFields.forEach(function(key){
                 const keyValue = selfData[key];
@@ -5877,7 +5924,6 @@ async function lookupToAmisPicker(field, readonly, ctx){
         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"] = {
@@ -5958,7 +6004,7 @@ async function lookupToAmisPicker(field, readonly, ctx){
                     }
                     
                     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, 
@@ -6212,6 +6258,11 @@ async function lookupToAmis(field, readonly, ctx){
             // 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);
     }
@@ -6352,7 +6403,7 @@ async function getIdsPickerSchema(field, readonly, ctx){
  * @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: 
  */
 
@@ -6360,12 +6411,16 @@ async function getIdsPickerSchema(field, readonly, ctx){
 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 {
@@ -7446,6 +7501,7 @@ async function getQuickEditSchema(field, options){
 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;
@@ -7502,7 +7558,7 @@ async function getTableColumns(fields, options){
                 type: "switch",
                 name: field.name,
                 label: field.label,
-                width: field.width,
+                width: field.width || defaultWidth,
                 toggled: field.toggled,
                 quickEdit: quickEditSchema,
                 className:"whitespace-nowrap",
@@ -7517,7 +7573,7 @@ async function getTableColumns(fields, options){
                 label: field.label,
                 map: map,
                 sortable: field.sortable,
-                width: field.width,
+                width: field.width || defaultWidth,
                 toggled: field.toggled,
                 className:"whitespace-nowrap",
                 quickEdit: quickEditSchema
@@ -7546,7 +7602,7 @@ async function getTableColumns(fields, options){
                     label: field.label,
                     sortable: field.sortable,
                     // searchable: field.searchable,
-                    width: field.width,
+                    width: field.width || defaultWidth,
                     type: type,
                     tpl: tpl,
                     toggled: field.toggled,
@@ -9098,8 +9154,8 @@ async function getObjectCalendar(objectSchema, calendarOptions, options) {
 /*
  * @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: 
  */
 
@@ -9193,7 +9249,7 @@ const getSections = async (permissionFields, formFields, ctx) => {
     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");
@@ -9531,8 +9587,12 @@ async function getObjectForm(objectSchema, ctx){
     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),
@@ -9603,11 +9663,6 @@ async function getObjectForm(objectSchema, ctx){
         }
       })]
     };
-    if(formSchema.id){
-      amisSchema.id = `service-${formSchema.id}`;
-    }else {
-      amisSchema.id = `new-${objectSchema.name}`;
-    }
     return amisSchema;
 }