@steedos-widgets/amis-lib 1.2.32 → 1.2.34

package/dist/index.umd.js

@@ -5136,7 +5136,8 @@
           "type": "dropdown-button",
           "trigger": "click",
           "icon": "fa fa-cog",
-          "tooltip": i18next__default["default"].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}",
@@ -5176,11 +5177,12 @@
         "rightIconClassName": "m-l-sm"
       }
     ];
-    const displayAsLabel = displayAs === 'split'? i18next__default["default"].t('frontend_display_type_is_split') : i18next__default["default"].t('frontend_display_type_is_table');
+    displayAs === 'split'? i18next__default["default"].t('frontend_display_type_is_split') : i18next__default["default"].t('frontend_display_type_is_table');
     return {
       "type": "dropdown-button",
       "icon": "fa fa-table-columns",
-      "tooltip": `${i18next__default["default"].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}",
@@ -5262,7 +5264,8 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
           // "type": "reload",//不可以直接使用reload，因为它不会设置页码到第一页
           "type": "button",
           "align": "right",
-          "tooltip": i18next__default["default"].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": "",
@@ -5284,7 +5287,8 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
           "icon": "fa fa-search",
           "type": "button",
           "tooltipPlacement": "top",
-          "tooltip": i18next__default["default"].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,
@@ -5329,7 +5333,9 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
         {
           "type": "reload",
           "align": "right",
-          "tooltip": i18next__default["default"].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"
         },
@@ -5339,8 +5345,9 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
         filterVisible ? {
           "label": i18next__default["default"].t('frontend_button_search_tooltip'),
           "icon": "fa fa-search",
-          "tooltip": i18next__default["default"].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": [
@@ -5446,9 +5453,16 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
           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" : "="}";
@@ -5646,7 +5660,7 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
       const tree = [{
           "type": "input-tree",
           "className": "",
-          "inputClassName": "pl-0",
+          "inputClassName": "p-0",
           "id": "u:7fd77b7915b0",
           "source": {
             "method": "post",
@@ -5707,7 +5721,7 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
             "left": "-200px",
             "width": "190px",
             "bottom": 0,
-            "top": "-14px",
+            "top": "2px",
             "overflow": "auto",
             "min-height":"300px"
           },
@@ -5973,7 +5987,9 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
                   "margin-left":"200px",
                   "min-height": "300px"
                };
+               pickerSchema.className = pickerSchema.className || "" + " steedos-select-user";
           }
+
           pickerSchema.headerToolbar = getObjectHeaderToolbar(refObjectConfig, ctx.formFactor, { headerToolbarItems });
           const isAllowCreate = refObjectConfig.permissions.allowCreate;
           if (isAllowCreate) {
@@ -6070,6 +6086,8 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
           modalTitle:  i18next__default["default"].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",
@@ -6250,6 +6268,8 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
           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,
@@ -6434,6 +6454,8 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
           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,
@@ -6462,7 +6484,7 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
    * @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: 
    */
 
@@ -6484,21 +6506,39 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
             }
       }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
+                          }
+                        }
+                      ]
+                    }
+                  ]
                 }
               ]
             }
@@ -7444,26 +7484,45 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
                       let labelField = quickEditSchema.body[0].labelField || "label";
                       let valueField = quickEditSchema.body[0].valueField || "value";
                       if (field.multiple) {
+                          /*
+                              多选分两种情况。
+                              第一种是减少选项时（判断新的数据是否比老的数据短），按照index删除_display中对应选项，保证回显没问题；
+                              第二种是增加选项时，按照value的值，找到对应选项，并按照_display的规则为其赋值
+                          */
                           TempDisplayField = `
+                            const preData = event.data.__super.${field.name};
+                            if(preData && event.data.${field.name}.length < preData.length){
+                                let deletedIndex;
+                                preData.forEach(function(item,index){
+                                    if(_.indexOf(event.data.${field.name}, item) == -1) _display["${field.name}"].splice(index, 1);
+                                })
+                            }else{
                                 _display["${field.name}"] = [];
-                                event.data.selectedItems.forEach(function(item,index){
+                                event.data.value.forEach(function(val,index){
+                                    const item = _.find(event.data.selectedItems, { ${valueField}: val });
                                     _display["${field.name}"].push(
                                         {
                                             "label": item.${labelField},
-                                            "value": item.${valueField},
+                                            "value": item[event.data.uiSchema.idFieldName],
                                             "objectName": "${field.reference_to}"
                                         }
                                     )
                                 })
-                            `;
+                            }
+                            
+                        `;
                       } else {
                           TempDisplayField = `
+                            if(event.data.value){
                                 _display["${field.name}"] = {
                                     "label": event.data.selectedItems.${labelField},
-                                    "value": event.data.selectedItems.${valueField},
+                                    "value": event.data.selectedItems[event.data.uiSchema.idFieldName],
                                     "objectName": "${field.reference_to}"
                                 }
-                            `;
+                            }else{
+                                _display["${field.name}"] = {}
+                            }
+                        `;
                       }
                       quickEditSchema.body[0].onEvent["change"] = quickEditOnEvent(TempDisplayField);
                       break;
@@ -7573,10 +7632,25 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
       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;
@@ -7624,7 +7698,7 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
                   type: "switch",
                   name: field.name,
                   label: field.label,
-                  width: field.width || defaultWidth,
+                  width: getFieldWidth(field.width),
                   toggled: field.toggled,
                   static: true,
                   className:"whitespace-nowrap",
@@ -7635,7 +7709,7 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
                   type: "switch",
                   name: field.name,
                   label: field.label,
-                  width: field.width || defaultWidth,
+                  width: getFieldWidth(field.width),
                   toggled: field.toggled,
                   quickEdit: quickEditSchema,
                   static: true,
@@ -7655,7 +7729,7 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
                   label: field.label,
                   map: map,
                   sortable: field.sortable,
-                  width: field.width || defaultWidth,
+                  width: getFieldWidth(field.width),
                   toggled: field.toggled,
                   className,
                   static: true,
@@ -7689,7 +7763,7 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
                       label: field.label,
                       sortable: field.sortable,
                       // searchable: field.searchable,
-                      width: field.width || defaultWidth,
+                      width: getFieldWidth(field.width),
                       type: type,
                       tpl: tpl,
                       toggled: field.toggled,
@@ -7987,14 +8061,7 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
                   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}"
                       },