@steedos-widgets/amis-lib 1.3.0-beta.10 → 1.3.0-beta.12

package/dist/index.esm.js

@@ -400,7 +400,7 @@ function getContrastColor(bgColor) {
  * @Author: baozhoutao@steedos.com
  * @Date: 2022-05-23 09:53:08
  * @LastEditors: 殷亮辉 yinlianghui@hotoa.com
- * @LastEditTime: 2023-08-03 18:07:54
+ * @LastEditTime: 2023-08-29 15:04:39
  * @Description: 
  */
 
@@ -504,7 +504,7 @@ function getRelatedFieldTpl(field, ctx){
         linkTarget = "target='_blank'";
     }
 
-    const onlyDisplayLabel = ctx.onlyDisplayLabel;
+    const onlyDisplayLookLabel = ctx.onlyDisplayLookLabel;
 
     let fieldDataStrTpl = `data._display.${field.name}`;
 
@@ -515,7 +515,7 @@ function getRelatedFieldTpl(field, ctx){
     if(_.isString(field.reference_to) || !field.reference_to){
         if(field.multiple){
             let labelTpl = `<%=item.label%>`;
-            if(!onlyDisplayLabel){
+            if(!onlyDisplayLookLabel){
                 const href = Router.getObjectDetailPath({
                     formFactor: ctx.formFactor, appId: "<%=data.appId%>", objectName: `<%=item.objectName%>`, recordId: `<%=item.value%>`, _templateType: "JavaScript"
                 });
@@ -533,7 +533,7 @@ function getRelatedFieldTpl(field, ctx){
                 objectNameTpl = `\${${field.name}.objectName}`;
                 recordIdTpl = `\${${field.name}.value}`;
             }
-            if(!onlyDisplayLabel){
+            if(!onlyDisplayLookLabel){
                 const href = Router.getObjectDetailPath({
                     formFactor: ctx.formFactor, appId: "${appId}", objectName: `${objectNameTpl}`, recordId: `${recordIdTpl}`
                 });
@@ -545,7 +545,7 @@ function getRelatedFieldTpl(field, ctx){
         
     }else {
         let labelTpl = `<%=item.label%>`;
-        if(!onlyDisplayLabel){
+        if(!onlyDisplayLookLabel){
             const href = Router.getObjectDetailPath({
                 formFactor: ctx.formFactor, appId: "<%=data.appId%>", objectName: `<%=item.objectName%>`, recordId: `<%=item.value%>`, _templateType: "JavaScript"
             });
@@ -598,7 +598,7 @@ function getLocationTpl(field){
 }
 
 async function getFieldTpl (field, options){
-    if((field.is_name || field.name === options.labelFieldName) && !options.onlyDisplayLabel){
+    if((field.is_name || field.name === options.labelFieldName) && !options.onlyDisplayLookLabel){
         return getNameTpl(field, options)
     }
     switch (field.type) {
@@ -3052,6 +3052,7 @@ const getObjectListViewButtonsSchemas = (objectSchema, ctx)=>{
         return {
             "type": "button",
             "icon": "fa fa-angle-down",
+            "className": "mr-0",
             "onEvent": {
               "click": {
                 "actions": [
@@ -5275,76 +5276,133 @@ function getObjectHeaderToolbar(mainObject, fields, formFactor, {
   if(isMobile){
     showDisplayAs = false;
   }
+  let toolbarCount;
+  if(!hiddenCount){
+    toolbarCount = {
+      "type": "tpl",
+      "tpl":  "${count} " + i18next.t('frontend_record_sum')
+    };
+  }
+  let toolbarReloadButton;
   if(formFactor === 'SMALL'){
-    const onReloadScript = `
-      const scope = event.context.scoped;
-      var listView = scope.parent.getComponents().find(function(n){
-        return n.props.type === "crud";
-      });
-      listView.handleChangePage(1);
-    `;
+    // const onReloadScript = `
+    //   const scope = event.context.scoped;
+    //   var listView = scope.parent.getComponents().find(function(n){
+    //     return n.props.type === "crud";
+    //   });
+    //   listView.handleChangePage(1);
+    // `;
+    // toolbarReloadButton = {
+    //   // "type": "reload",//不可以直接使用reload，因为它不会设置页码到第一页，这在加载更多按钮的翻页模式下会有问题
+    //   "type": "button",
+    //   "align": "right",
+    //   //TODO: dropdown-button只支持在按钮上方配置提示，对于上方按钮的点击会有影响，为保持统一，暂时去除，等待amis优化，https://github.com/baidu/amis/issues/7330
+    //   // "tooltip": i18next.t('frontend_button_reload_tooltip'),
+    //   "tooltipPlacement": "top",
+    //   "className": "bg-white p-2 rounded border-gray-300 text-gray-500",
+    //   "label": "",
+    //   "icon": "fa fa-sync",
+    //   "visibleOn": "${!showFieldsFilter}",
+    //   "onEvent": {
+    //     "click": {
+    //       "actions": [
+    //         {
+    //           "actionType": "custom",
+    //           "script": onReloadScript
+    //         }
+    //       ]
+    //     }
+    //   },
+    // };
+
+    // 后续如果换成加载更多按钮的翻页模式的话，不可以直接使用下面的reload，需要换成上面的自定义脚本模式
+    toolbarReloadButton = {
+      "type": "reload",
+      "align": "right",
+      //TODO: dropdown-button只支持在按钮上方配置提示，对于上方按钮的点击会有影响，为保持统一，暂时去除，等待amis优化，https://github.com/baidu/amis/issues/7330
+      // "tooltip": i18next.t('frontend_button_reload_tooltip'),
+      "tooltip":"",
+      "tooltipPlacement": "top",
+      "className": "bg-white p-2 rounded border-gray-300 text-gray-500"
+    };
+  }
+  else {
+    toolbarReloadButton = {
+      "type": "reload",
+      "align": "right",
+      //TODO: dropdown-button只支持在按钮上方配置提示，对于上方按钮的点击会有影响，为保持统一，暂时去除，等待amis优化，https://github.com/baidu/amis/issues/7330
+      // "tooltip": i18next.t('frontend_button_reload_tooltip'),
+      "tooltip":"",
+      "tooltipPlacement": "top",
+      "className": "bg-white p-2 rounded border-gray-300 text-gray-500"
+    };
+  }
+  let toolbarFilter;
+  if(filterVisible){
+    toolbarFilter ={
+      "label": i18next.t('frontend_button_search_tooltip'),
+      "icon": "fa fa-filter",
+      //TODO: dropdown-button只支持在按钮上方配置提示，对于上方按钮的点击会有影响，为保持统一，暂时去除，等待amis优化，https://github.com/baidu/amis/issues/7330
+      // "tooltip": i18next.t('frontend_button_search_tooltip'),
+      // "tooltipPlacement": "top",
+      "type": "button",
+      "badge": {
+        "offset": [
+          -5,
+          1
+        ],
+        "size":8,
+        "animation": true,
+        "visibleOn": "${isFieldsFilterEmpty == false && isLookup != true}"
+      },
+      "align": "right",
+      "className": "bg-white p-2 rounded border-gray-300 text-gray-500",
+      "onEvent": {
+        "click": {
+          "actions": [
+            {
+              "actionType": "custom",
+              "script": onFieldsFilterToggleScript
+            }
+          ]
+        }
+      }
+    };
+  }
+  let toolbarDisplayAsButton = getDisplayAsButton(mainObject?.name);
+  let toolbarDQuickSearchBox = getObjectHeaderQuickSearchBox(mainObject, fields, formFactor, { isLookup, keywordsSearchBoxName });
+
+  // toolbars返回的数组元素不可以是空对象{}，比如hiddenCount ? {} : {"type": "tpl",...}，因为空对象最终还是会生成一个空的.antd-Crud-toolbar-item dom
+  // 当出现空的.antd-Crud-toolbar-item dom时会影响toolbar元素的maring-right css样式计算，如果有动态需要应该加到动态数组变量toolbars中
+  let toolbars = [];
+  if(formFactor === 'SMALL'){
+    if(toolbarCount){
+      toolbars.push(toolbarCount);
+    }
+    toolbars.push(toolbarReloadButton);
+    if(toolbarFilter){
+      toolbars.push(toolbarFilter);
+    }
+    toolbars.push(toolbarDisplayAsButton);
+    toolbars.push(toolbarDQuickSearchBox);
     return [
       // "bulkActions",
       ...(headerToolbarItems || []),
-      hiddenCount ? {} :{
-        "type": "tpl",
-        "tpl": "${count} " + i18next.t('frontend_record_sum')
-      },
-      {
-        // "type": "reload",//不可以直接使用reload，因为它不会设置页码到第一页
-        "type": "button",
-        "align": "right",
-        //TODO: dropdown-button只支持在按钮上方配置提示，对于上方按钮的点击会有影响，为保持统一，暂时去除，等待amis优化，https://github.com/baidu/amis/issues/7330
-        // "tooltip": i18next.t('frontend_button_reload_tooltip'),
-        "tooltipPlacement": "top",
-        "className": "bg-white p-2 rounded border-gray-300 text-gray-500",
-        "label": "",
-        "icon": "fa fa-sync",
-        "visibleOn": "${!showFieldsFilter}",
-        "onEvent": {
-          "click": {
-            "actions": [
-              {
-                "actionType": "custom",
-                "script": onReloadScript
-              }
-            ]
-          }
-        },
-      },
-      filterVisible ? {
-        "label": i18next.t('frontend_button_search_tooltip'),
-        "icon": "fa fa-search",
-        "type": "button",
-        "tooltipPlacement": "top",
-        //TODO: dropdown-button只支持在按钮上方配置提示，对于上方按钮的点击会有影响，为保持统一，暂时去除，等待amis优化，https://github.com/baidu/amis/issues/7330
-        // "tooltip": i18next.t('frontend_button_search_tooltip'),
-        "badge": {
-          "offset": [
-            -5,
-            1
-          ],
-          "size":8,
-          "animation": true,
-          "visibleOn": "${isFieldsFilterEmpty == false && isLookup != true}"
-        },
-        "align": "right",
-        "className": "bg-white p-2 rounded border-gray-300 text-gray-500",
-        "onEvent": {
-          "click": {
-            "actions": [
-              {
-                "actionType": "custom",
-                "script": onFieldsFilterToggleScript
-              }
-            ]
-          }
-        }
-      } : {},
-      getDisplayAsButton(mainObject?.name),
-      getObjectHeaderQuickSearchBox(mainObject, fields, formFactor, { isLookup, keywordsSearchBoxName })
+      ...toolbars,
   ]
   }else {
+    if(toolbarCount){
+      toolbars.push(toolbarCount);
+    }
+    if(toolbarFilter){
+      toolbars.push(toolbarFilter);
+    }
+    toolbars.push(toolbarReloadButton);
+    if(mainObject?.permissions?.allowCreateListViews){
+      toolbars.push(getSettingListviewToolbarButtonSchema());
+    }
+    toolbars.push(toolbarDisplayAsButton);
+    toolbars.push(toolbarDQuickSearchBox);
     return [
       // "filter-toggler",
       ...(headerToolbarItems || []),
@@ -5353,56 +5411,12 @@ function getObjectHeaderToolbar(mainObject, fields, formFactor, {
         "type": "columns-toggler",
         "className": "hidden"
       },
+      ...toolbars,
       // {
       //     "type": "columns-toggler",
       //     "className": "mr-2"
       // },
-      hiddenCount ? {} : {
-        "type": "tpl",
-        "tpl":  "${count} " + i18next.t('frontend_record_sum')
-      },
-      filterVisible ? {
-        "label": i18next.t('frontend_button_search_tooltip'),
-        "icon": "fa fa-filter",
-        //TODO: dropdown-button只支持在按钮上方配置提示，对于上方按钮的点击会有影响，为保持统一，暂时去除，等待amis优化，https://github.com/baidu/amis/issues/7330
-        // "tooltip": i18next.t('frontend_button_search_tooltip'),
-        // "tooltipPlacement": "top",
-        "type": "button",
-        "badge": {
-          "offset": [
-            -5,
-            1
-          ],
-          "size":8,
-          "animation": true,
-          "visibleOn": "${isFieldsFilterEmpty == false && isLookup != true}"
-        },
-        "align": "right",
-        "className": "bg-white p-2 rounded border-gray-300 text-gray-500",
-        "onEvent": {
-          "click": {
-            "actions": [
-              {
-                "actionType": "custom",
-                "script": onFieldsFilterToggleScript
-              }
-            ]
-          }
-        }
-      } : {},
-      {
-        "type": "reload",
-        "align": "right",
-        //TODO: dropdown-button只支持在按钮上方配置提示，对于上方按钮的点击会有影响，为保持统一，暂时去除，等待amis优化，https://github.com/baidu/amis/issues/7330
-        // "tooltip": i18next.t('frontend_button_reload_tooltip'),
-        "tooltip":"",
-        "tooltipPlacement": "top",
-        "className": "bg-white p-2 rounded border-gray-300 text-gray-500"
-      },
       // getExportExcelToolbarButtonSchema(),
-      mainObject?.permissions?.allowCreateListViews ? getSettingListviewToolbarButtonSchema() : {},
-      getDisplayAsButton(mainObject?.name),
-      getObjectHeaderQuickSearchBox(mainObject, fields, formFactor, { isLookup, keywordsSearchBoxName }),
       // {
       //     "type": "drag-toggler",
       //     "align": "right"
@@ -6020,13 +6034,7 @@ async function lookupToAmisPicker(field, readonly, ctx){
     }
 
     let pickerSchema = null;
-    if(ctx.formFactor === 'SMALL'){
-        pickerSchema = await getListSchema$1(tableFields, {
-            top:  top,
-            ...ctx,
-            actions: false
-        });
-    }else {
+    {
         pickerSchema = await getTableSchema$1(tableFields, {
             labelFieldName: refObjectConfig.NAME_FIELD_KEY,
             top:  top,
@@ -6395,6 +6403,7 @@ async function lookupToAmis(field, readonly, ctx){
     }
 
     if(referenceTo.objectName === "space_users" && field.reference_to_field === "user"){
+        ctx.onlyDisplayLookLabel = true;
         if(ctx.idsDependOn){
             // ids人员点选模式
             return await lookupToAmisIdsPicker(field, readonly, ctx);
@@ -6498,6 +6507,7 @@ async function getIdsPickerSchema(field, readonly, ctx){
         pickerSchema = await getTableSchema$1(tableFields, {
             labelFieldName: refObjectConfig.NAME_FIELD_KEY,
             top:  top,
+            isLookup: true,
             ...ctx
         });
 
@@ -6540,8 +6550,8 @@ async function getIdsPickerSchema(field, readonly, ctx){
 /*
  * @Author: baozhoutao@steedos.com
  * @Date: 2023-01-13 17:27:54
- * @LastEditors: liaodaxue
- * @LastEditTime: 2023-07-27 17:33:54
+ * @LastEditors: 殷亮辉 yinlianghui@hotoa.com
+ * @LastEditTime: 2023-08-28 17:45:38
  * @Description: 
  */
 
@@ -6603,14 +6613,29 @@ const getMarkdownFieldSchema = (field, readonly, ctx)=>{
 
 const getHtmlFieldSchema = (field, readonly, ctx)=>{
     if(readonly){
+        // return {
+        //     "type": "control",
+        //     "label": field.label,
+        //     "body": {
+        //       "type": "html",
+        //       "name": field.name
+        //     }
+        //   }
         return {
-            "type": "control",
-            "label": field.label,
-            "body": {
-              "type": "html",
-              "name": field.name
-            }
+          "type": "input-rich-text",
+          "receiver": "${context.rootUrl}/s3/images",
+          "name": field.name,
+          "options": {
+            "plugins": [
+              "autoresize"
+            ],
+            // "max_height": 2000,
+            "statusbar": false,
+            "readonly": true,
+            "toolbar": false,
+            "menubar": false
           }
+        }
     }else {
         return {
             "type": "input-rich-text",
@@ -7388,7 +7413,7 @@ async function convertSFieldToAmisField(field, readonly, ctx) {
             convertData.className = 'm-1';
         }
         if(readonly){
-            convertData.className = `${convertData.className} md:border-b`;
+            convertData.className = `${convertData.className} border-b`;
         }
         if(readonly){
             convertData.quickEdit = false;
@@ -8093,7 +8118,7 @@ async function getMobileTableColumns(fields, options){
         let tpl = "";
         if(field.is_name || field.name === options.labelFieldName){
             nameField = field;
-            options.onlyDisplayLabel = true;
+            options.onlyDisplayLookLabel = true;
             tpl = await getFieldTpl(field, options);
         }
         else if(field.type === 'avatar' || field.type === 'image' || field.type === 'file'){
@@ -8102,7 +8127,7 @@ async function getMobileTableColumns(fields, options){
         }
         else {
             if(field.type === 'lookup' || field.type === 'master_detail'){
-                options.onlyDisplayLabel = true;
+                options.onlyDisplayLookLabel = true;
             }
             tpl = await getFieldTpl(field, options);
         }
@@ -8304,7 +8329,12 @@ async function getTableSchema$1(fields, options){
         options = {};
     }
     let columns = [];
-    if(options.formFactor === 'SMALL' || ["split"].indexOf(options.displayAs) > -1){
+    let useMobileColumns = options.formFactor === 'SMALL' || ["split"].indexOf(options.displayAs) > -1;
+    if(isLookup){
+        // 在lookup手机端列表模式调式好之前不使用getMobileTableColumns
+        useMobileColumns = false;
+    }
+    if(useMobileColumns){
         columns = await getMobileTableColumns(fields, options);
     }
     else {
@@ -8324,7 +8354,7 @@ async function getTableSchema$1(fields, options){
         columns: columns,
         syncLocation: false,
         keepItemSelectionOnPageChange: true,
-        checkOnItemClick: false,
+        checkOnItemClick: isLookup ? true : false,
         labelTpl: `\${${options.labelFieldName}}`,
         autoFillHeight: false, // 自动高度效果不理想,先关闭
         columnsTogglable: false,
@@ -10291,7 +10321,7 @@ const getRecordPermissions = async (objectName, recordId)=>{
  * @Author: baozhoutao@steedos.com
  * @Date: 2022-07-05 15:55:39
  * @LastEditors: liaodaxue
- * @LastEditTime: 2023-08-21 14:50:21
+ * @LastEditTime: 2023-08-28 14:55:23
  * @Description:
  */
 
@@ -10437,11 +10467,16 @@ async function getRecordDetailRelatedListSchema(objectName, recordId, relatedObj
     // }
     const recordRelatedListHeader = await getObjectRecordDetailRelatedListHeader(relatedObjectUiSchema, relatedLabel, ctx);
     const componentId = `steedos-record-related-list-${relatedObjectName}`;
+    const isMobile = window.innerWidth < 768;
+    let headerToolbar = [];
+    if(!isMobile){
+        headerToolbar.push("bulkActions");
+    }
     const options = {
         globalFilter,
         defaults: {
             listSchema: { 
-                headerToolbar:["bulkActions"],
+                headerToolbar,
                 columnsTogglable: false,
                 onEvent: {
                     [`@data.changed.${relatedObjectName}`]: {