@steedos-widgets/amis-lib 1.2.32 → 1.2.33

package/dist/index.esm.js

@@ -5112,7 +5112,8 @@ const getSettingListviewToolbarButtonSchema = ()=>{
         "type": "dropdown-button",
         "trigger": "click",
         "icon": "fa fa-cog",
-        "tooltip": i18next.t('frontend_button_listview_control_tooltip'),
+        //TODO: dropdown-button只支持在按钮上方配置提示，对于上方按钮的点击会有影响，为保持统一，暂时去除，等待amis优化，https://github.com/baidu/amis/issues/7330
+        // "tooltip": i18next.t('frontend_button_listview_control_tooltip'),
         "btnClassName": "antd-Button--iconOnly bg-white !p-2 rounded border-gray-300 text-gray-500",
         "align": "right",
         "visibleOn": "${!isLookup}",
@@ -5152,11 +5153,12 @@ const getDisplayAsButton = function(objectName, showDisplayAs){
       "rightIconClassName": "m-l-sm"
     }
   ];
-  const displayAsLabel = displayAs === 'split'? i18next.t('frontend_display_type_is_split') : i18next.t('frontend_display_type_is_table');
+  displayAs === 'split'? i18next.t('frontend_display_type_is_split') : i18next.t('frontend_display_type_is_table');
   return {
     "type": "dropdown-button",
     "icon": "fa fa-table-columns",
-    "tooltip": `${i18next.t('frontend_display_as')} ${displayAsLabel}`,
+    //TODO: dropdown-button只支持在按钮上方配置提示，对于上方按钮的点击会有影响，暂时去除，等待amis优化，https://github.com/baidu/amis/issues/7330
+    // "tooltip": `${i18next.t('frontend_display_as')} ${displayAsLabel}`,
     "btnClassName": "antd-Button--iconOnly bg-white !p-2 rounded border-gray-300 text-gray-500",
     "align": "right",
     "visibleOn": "${window:innerWidth > 768 && !!!isLookup}",
@@ -5238,7 +5240,8 @@ function getObjectHeaderToolbar(mainObject, formFactor, {showDisplayAs = false,
         // "type": "reload",//不可以直接使用reload，因为它不会设置页码到第一页
         "type": "button",
         "align": "right",
-        "tooltip": i18next.t('frontend_button_reload_tooltip'),
+        //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": "",
@@ -5260,7 +5263,8 @@ function getObjectHeaderToolbar(mainObject, formFactor, {showDisplayAs = false,
         "icon": "fa fa-search",
         "type": "button",
         "tooltipPlacement": "top",
-        "tooltip": i18next.t('frontend_button_search_tooltip'),
+        //TODO: dropdown-button只支持在按钮上方配置提示，对于上方按钮的点击会有影响，为保持统一，暂时去除，等待amis优化，https://github.com/baidu/amis/issues/7330
+        // "tooltip": i18next.t('frontend_button_search_tooltip'),
         "badge": {
           "offset": [
             -5,
@@ -5305,7 +5309,9 @@ function getObjectHeaderToolbar(mainObject, formFactor, {showDisplayAs = false,
       {
         "type": "reload",
         "align": "right",
-        "tooltip": i18next.t('frontend_button_reload_tooltip'),
+        //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"
       },
@@ -5315,8 +5321,9 @@ function getObjectHeaderToolbar(mainObject, formFactor, {showDisplayAs = false,
       filterVisible ? {
         "label": i18next.t('frontend_button_search_tooltip'),
         "icon": "fa fa-search",
-        "tooltip": i18next.t('frontend_button_search_tooltip'),
-        "tooltipPlacement": "top",
+        //TODO: dropdown-button只支持在按钮上方配置提示，对于上方按钮的点击会有影响，为保持统一，暂时去除，等待amis优化，https://github.com/baidu/amis/issues/7330
+        // "tooltip": i18next.t('frontend_button_search_tooltip'),
+        // "tooltipPlacement": "top",
         "type": "button",
         "badge": {
           "offset": [
@@ -5422,9 +5429,16 @@ async function getSource(field, ctx) {
         valueField = `${ctx.fieldNamePrefix}${valueField}`;
     }
     data.$value = `$${valueField}`;
-    // data["&"] = "$$";
+    data['$'] = `$$`;
     const requestAdaptor = `
         var filters = [['parent', '=', null]];
+        const filtersFunction = ${field.filtersFunction || field._filtersFunction};
+        if(filtersFunction){
+            const _filters = filtersFunction(filters, api.data.$);
+            if(_filters && _filters.length > 0){
+                filters.push(_filters);
+            }
+        }
         api.data.query = api.data.query.replace(/{__filters}/g, JSON.stringify(filters));
         var defaultValue = api.data.$value;
         var optionsFiltersOp = "${field.multiple ? "in" : "="}";
@@ -6046,6 +6060,8 @@ async function lookupToAmisPicker(field, readonly, ctx){
         modalTitle:  i18next.t('frontend_form_please_select') + " " + refObjectConfig.label,
         labelField: referenceTo.labelField.name,
         valueField: referenceTo.valueField.name,
+        // disabledOn: this._master目的是相关表新建时禁止编辑关联字段； this.relatedKey目的是相关表编辑时禁止编辑关联字段。
+        disabledOn:  `${readonly} || ( (this._master && (this._master.relatedKey ==='${field.name}')) || (this.relatedKey ==='${field.name}') )`,
         modalMode: 'dialog', //TODO 设置 dialog 或者 drawer，用来配置弹出方式
         source: source,
         size: "lg",
@@ -6226,6 +6242,8 @@ async function lookupToAmisSelect(field, readonly, ctx){
         joinValues: false,
         extractValue: true,
         clearable: true,
+        // disabledOn: this._master目的是相关表新建时禁止编辑关联字段； this.relatedKey目的是相关表编辑时禁止编辑关联字段。
+        disabledOn:  `${readonly} || ( (this._master && (this._master.relatedKey ==='${field.name}')) || (this.relatedKey ==='${field.name}') )`,
         // labelField: labelField,
         // valueField: valueField,
         source: apiInfo,
@@ -6410,6 +6428,8 @@ async function getIdsPickerSchema(field, readonly, ctx){
         valueField: referenceTo.valueField.name,
         modalMode: 'dialog', 
         source: source,
+        // disabledOn: this._master目的是相关表新建时禁止编辑关联字段； this.relatedKey目的是相关表编辑时禁止编辑关联字段。
+        disabledOn:  `${readonly} || ( (this._master && (this._master.relatedKey ==='${field.name}')) || (this.relatedKey ==='${field.name}') )`,
         size: "lg",
         pickerSchema: pickerSchema,
         joinValues: false,
@@ -6438,7 +6458,7 @@ async function getIdsPickerSchema(field, readonly, ctx){
  * @Author: baozhoutao@steedos.com
  * @Date: 2023-01-13 17:27:54
  * @LastEditors: liaodaxue
- * @LastEditTime: 2023-06-30 10:29:52
+ * @LastEditTime: 2023-07-24 15:23:12
  * @Description: 
  */
 
@@ -6460,21 +6480,39 @@ const getMarkdownFieldSchema = (field, readonly, ctx)=>{
           }
     }else {
         return {
-            "type": "group",
+            "type": "control",
+            "label": field.label,
             "body": [
               {
-                "type": "editor",
-                "name": field.name,
-                "language": "markdown",
-              },
-              {
-                "type": "markdown",
-                "name": field.name,
-                "options": {
-                    "linkify": true,
-                    "html": true,
-                    "breaks": true
-                }
+                "type": "tabs",
+                "tabsMode": "strong",
+                "className": "steedos-markdown",
+                "tabs": [
+                  {
+                    "title": "Write",
+                    "tab": [
+                      {
+                        "type": "editor",
+                        "name": field.name,
+                        "language": "markdown",
+                      }
+                    ]
+                  },
+                  {
+                    "title": "Preview",
+                    "tab": [
+                      {
+                        "type": "markdown",
+                        "name": field.name,
+                        "options": {
+                          "linkify": true,
+                          "html": true,
+                          "breaks": true
+                        }
+                      }
+                    ]
+                  }
+                ]
               }
             ]
           }
@@ -7549,10 +7587,25 @@ async function getQuickEditSchema(field, options){
     return quickEditSchema;
 }
 
+function getFieldWidth(width){
+    const defaultWidth = "unset";//用于使table内的td标签下生成div，实现将快速编辑按钮固定在右侧的效果，并不是为了unset效果
+    if(typeof width == 'string'){
+        if(isNaN(width)){
+            return width;
+        }else {
+            return Number(width);
+        }
+    }else if(typeof width == 'number'){
+        return width;
+    }else {
+        return defaultWidth;
+    }
+}
+
 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;
@@ -7600,7 +7653,7 @@ async function getTableColumns(fields, options){
                 type: "switch",
                 name: field.name,
                 label: field.label,
-                width: field.width || defaultWidth,
+                width: getFieldWidth(field.width),
                 toggled: field.toggled,
                 static: true,
                 className:"whitespace-nowrap",
@@ -7611,7 +7664,7 @@ async function getTableColumns(fields, options){
                 type: "switch",
                 name: field.name,
                 label: field.label,
-                width: field.width || defaultWidth,
+                width: getFieldWidth(field.width),
                 toggled: field.toggled,
                 quickEdit: quickEditSchema,
                 static: true,
@@ -7631,7 +7684,7 @@ async function getTableColumns(fields, options){
                 label: field.label,
                 map: map,
                 sortable: field.sortable,
-                width: field.width || defaultWidth,
+                width: getFieldWidth(field.width),
                 toggled: field.toggled,
                 className,
                 static: true,
@@ -7665,7 +7718,7 @@ async function getTableColumns(fields, options){
                     label: field.label,
                     sortable: field.sortable,
                     // searchable: field.searchable,
-                    width: field.width || defaultWidth,
+                    width: getFieldWidth(field.width),
                     type: type,
                     tpl: tpl,
                     toggled: field.toggled,
@@ -7963,14 +8016,7 @@ async function getTableOperation(ctx){
                 onOpenApi: {
                     url: `\${context.rootUrl}/service/api/@\${objectName}/recordPermissions/\${_id}`,
                     method: "get",
-                    data: {
-                        $: "$$",
-                        objectName: "${objectName}",
-                        listViewId: "${listViewId}",
-                        appId: "${appId}",
-                        formFactor: "${formFactor}",
-                        context: `\${context}`
-                    },
+                    requestAdaptor: "api.data={}; return api;",
                     headers: {
                         Authorization: "Bearer ${context.tenantId},${context.authToken}"
                     },