@steedos-widgets/amis-lib 1.2.31 → 1.2.33

package/dist/index.umd.js

@@ -975,6 +975,7 @@
   var frontend_form_new$1 = "New";
   var frontend_form_edit$1 = "Edit";
   var frontend_form_select$1 = "Select";
+  var frontend_form_please_select$1 = "Please select";
   var frontend_form_confirm$1 = "Confirm";
   var frontend_form_delete$1 = "Delete";
   var frontend_form_view$1 = "view";
@@ -1056,6 +1057,7 @@
   	frontend_form_new: frontend_form_new$1,
   	frontend_form_edit: frontend_form_edit$1,
   	frontend_form_select: frontend_form_select$1,
+  	frontend_form_please_select: frontend_form_please_select$1,
   	frontend_form_confirm: frontend_form_confirm$1,
   	frontend_form_delete: frontend_form_delete$1,
   	frontend_form_view: frontend_form_view$1,
@@ -1138,6 +1140,7 @@
   var frontend_form_new = "新建";
   var frontend_form_edit = "编辑";
   var frontend_form_select = "选择";
+  var frontend_form_please_select = "请选择";
   var frontend_form_confirm = "确认";
   var frontend_form_delete = "删除";
   var frontend_form_view = "查看";
@@ -1220,6 +1223,7 @@
   	frontend_form_new: frontend_form_new,
   	frontend_form_edit: frontend_form_edit,
   	frontend_form_select: frontend_form_select,
+  	frontend_form_please_select: frontend_form_please_select,
   	frontend_form_confirm: frontend_form_confirm,
   	frontend_form_delete: frontend_form_delete,
   	frontend_form_view: frontend_form_view,
@@ -2586,7 +2590,8 @@
                   } = this;
                   const scopeId = this.scopeId || `amis-${appId}-${objectName}-listview`;
                   const scope = this.scope || SteedosUI?.getRef(scopeId);
-                  const listViewRef = scope.getComponentById(`listview_${uiSchema.name}`);
+                  //https://github.com/baidu/amis/pull/6807 .parent的改动是为适应3.2getComponentById的规则改动，不影响2.9
+                  const listViewRef = scope.parent?.getComponentById(`listview_${uiSchema.name}`);
                   if(_.isEmpty(listViewRef.props.store.toJSON().selectedItems)){
                       listViewRef.handleAction({}, {
                           "actionType": "toast",
@@ -5131,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}",
@@ -5171,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}",
@@ -5257,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": "",
@@ -5279,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,
@@ -5324,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"
         },
@@ -5334,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": [
@@ -5441,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" : "="}";
@@ -6062,8 +6081,11 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
 
       const data = {
           type: getAmisStaticFieldType('picker', readonly),
+          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",
@@ -6244,6 +6266,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,
@@ -6428,6 +6452,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,
@@ -6456,7 +6482,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: 
    */
 
@@ -6478,21 +6504,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
+                          }
+                        }
+                      ]
+                    }
+                  ]
                 }
               ]
             }
@@ -6535,8 +6579,8 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
   /*
    * @Author: baozhoutao@steedos.com
    * @Date: 2022-10-28 14:52:55
-   * @LastEditors: Please set LastEditors
-   * @LastEditTime: 2023-05-31 13:25:53
+   * @LastEditors: liaodaxue
+   * @LastEditTime: 2023-07-14 17:18:42
    * @Description: 
    */
 
@@ -6568,6 +6612,8 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
               return `static-images`;
           }
           return `static-${type}`;
+      }else if(type === 'url'){
+          return "input-url"
       }else {
           return 'static';
       }
@@ -7095,7 +7141,8 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
               break;
           case 'url':
               convertData = {
-                  type: getAmisStaticFieldType('url', readonly, field)
+                  type: getAmisStaticFieldType('url', readonly, field),
+                  static: readonly ? true : false
               };
               if(readonly && field.show_as_qr){
                   convertData = {
@@ -7429,17 +7476,19 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
                   return EventType;
               };
               switch (field.type) {
-                  //TODO:amis的picker组件直接点击选项x时不会触发change事件，待处理
+                  //TODO: amis的picker组件直接点击选项x时不会触发change事件，待处理
                   case "lookup":
                   case "master_detail":
+                      let labelField = quickEditSchema.body[0].labelField || "label";
+                      let valueField = quickEditSchema.body[0].valueField || "value";
                       if (field.multiple) {
                           TempDisplayField = `
                                 _display["${field.name}"] = [];
-                                event.data.value.forEach(function(item,index){
+                                event.data.selectedItems.forEach(function(item,index){
                                     _display["${field.name}"].push(
                                         {
-                                            "label": event.data.option[index].${quickEditSchema.body[0].labelField},
-                                            "value": event.data.option[index]._id,
+                                            "label": item.${labelField},
+                                            "value": item.${valueField},
                                             "objectName": "${field.reference_to}"
                                         }
                                     )
@@ -7448,8 +7497,8 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
                       } else {
                           TempDisplayField = `
                                 _display["${field.name}"] = {
-                                    "label": event.data.option.${quickEditSchema.body[0].labelField},
-                                    "value": event.data._id,
+                                    "label": event.data.selectedItems.${labelField},
+                                    "value": event.data.selectedItems.${valueField},
                                     "objectName": "${field.reference_to}"
                                 }
                             `;
@@ -7562,10 +7611,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;
@@ -7613,7 +7677,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",
@@ -7624,7 +7688,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,
@@ -7644,7 +7708,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,
@@ -7658,8 +7722,12 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
                   type = 'tpl';
               }else if(field.type === 'html'){
                   type = 'markdown';
-              }else if(field.type === 'url' && field.show_as_qr){
-                  type = 'qr-code';
+              }else if(field.type === 'url'){
+                  if(field.show_as_qr){
+                      type = 'qr-code';
+                  }else {
+                      type = 'input-url';
+                  }
               }
               let className = "";
               if(field.type === 'textarea'){
@@ -7674,7 +7742,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,
@@ -7972,14 +8040,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}"
                       },
@@ -8343,7 +8404,8 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
 
     const setDataToComponentId = "${setDataToComponentId}";
     if(setDataToComponentId){
-        SteedosUI.getRef(api.body.$self.$scopeId)?.getComponentById(setDataToComponentId)?.setData({$count: payload.data.count})
+        //https://github.com/baidu/amis/pull/6807 .parent的改动是为适应3.2getComponentById的规则改动，不影响2.9
+        SteedosUI.getRef(api.body.$self.$scopeId)?.parent?.getComponentById(setDataToComponentId)?.setData({$count: payload.data.count})
     };
     ${options.adaptor || ''}
     return payload;
@@ -9035,17 +9097,18 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
               "objectApiName": "\${objectName}",
               "mode": "edit",
               "defaultData": doc,
-              "onEvent": {
-                "submitSucc": {
-                  "weight": 0,
-                  "actions": [
-                    {
-                      "actionType": "custom",
-                      "script": "event.data.view?.calendar.refetchEvents();"
-                    }
-                  ]
-                }
-              }
+              //改回为通用的提交事件
+              // "onEvent": {
+              //   "submitSucc": {
+              //     "weight": 0,
+              //     "actions": [
+              //       {
+              //         "actionType": "custom",
+              //         "script": "event.data.view?.calendar.refetchEvents();"
+              //       }
+              //     ]
+              //   }
+              // }
             }
           ],
           "closeOnEsc": false,
@@ -9174,6 +9237,20 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
             "script": "console.log('eventsSet'); console.log(event);"
           }
         ]
+      },
+      "getRef": {
+        "weight": 0,
+        "actions": [
+          {
+            "componentId": `service_${options.id}`,
+            "args": {
+              "value":{
+                "calendarRef": "${event.data.calendarRef}"
+              }
+            },
+            "actionType": "setValue",
+          }
+        ]
       }
     };
 
@@ -9209,6 +9286,7 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
     const amisSchema = {
       "type": "steedos-fullcalendar",
       "label": "",
+      "id": options.id,
       "name": "fullcalendar",
       "placeholder":"${additionalFilters}",//用于触发reload
       "editable": permissions.allowEdit,
@@ -9231,7 +9309,7 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
    * @Author: baozhoutao@steedos.com
    * @Date: 2022-05-26 16:02:08
    * @LastEditors: liaodaxue
-   * @LastEditTime: 2023-06-29 17:27:19
+   * @LastEditTime: 2023-07-12 15:45:55
    * @Description: 
    */
 
@@ -9290,7 +9368,11 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
 
     // fieldSet 已支持显隐控制
     const sectionFieldsVisibleOn = ___namespace.map(___namespace.compact(___namespace.map(fieldSetBody, 'visibleOn')), (visibleOn) => {
-      return visibleOn;
+      let visible = visibleOn;
+      if(visible.indexOf('${')>-1){
+        visible = visible.substring(visible.indexOf('{')+1, visible.indexOf('}'));
+      }
+      return visible ? "("+visible+")" : visible;
     });
 
     let section = {