@steedos-widgets/amis-lib 1.2.31 → 1.2.33

package/dist/index.esm.js

@@ -951,6 +951,7 @@ var frontend_form_cancel$1 = "Cancel";
 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";
@@ -1032,6 +1033,7 @@ var en_us = {
 	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,
@@ -1114,6 +1116,7 @@ var frontend_form_cancel = "取消";
 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 = "查看";
@@ -1196,6 +1199,7 @@ var zh_cn = {
 	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,
@@ -2562,7 +2566,8 @@ const StandardButtons = {
                 } = 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",
@@ -5107,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}",
@@ -5147,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}",
@@ -5233,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": "",
@@ -5255,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,
@@ -5300,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"
       },
@@ -5310,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": [
@@ -5417,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" : "="}";
@@ -6038,8 +6057,11 @@ async function lookupToAmisPicker(field, readonly, ctx){
 
     const data = {
         type: getAmisStaticFieldType('picker', readonly),
+        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",
@@ -6220,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,
@@ -6404,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,
@@ -6432,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: 
  */
 
@@ -6454,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
+                        }
+                      }
+                    ]
+                  }
+                ]
               }
             ]
           }
@@ -6511,8 +6555,8 @@ const getHtmlFieldSchema = (field, readonly, ctx)=>{
 /*
  * @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: 
  */
 
@@ -6544,6 +6588,8 @@ function getAmisStaticFieldType(type, readonly, options){
             return `static-images`;
         }
         return `static-${type}`;
+    }else if(type === 'url'){
+        return "input-url"
     }else {
         return 'static';
     }
@@ -7071,7 +7117,8 @@ async function convertSFieldToAmisField(field, readonly, ctx) {
             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 = {
@@ -7405,17 +7452,19 @@ async function getQuickEditSchema(field, options){
                 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}"
                                         }
                                     )
@@ -7424,8 +7473,8 @@ async function getQuickEditSchema(field, options){
                     } 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}"
                                 }
                             `;
@@ -7538,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;
@@ -7589,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",
@@ -7600,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,
@@ -7620,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,
@@ -7634,8 +7698,12 @@ async function getTableColumns(fields, options){
                 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'){
@@ -7650,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,
@@ -7948,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}"
                     },
@@ -8319,7 +8380,8 @@ async function getTableApi(mainObject, fields, options){
 
     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;
@@ -9011,17 +9073,18 @@ async function getObjectCalendar(objectSchema, calendarOptions, options) {
               "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,
@@ -9150,6 +9213,20 @@ async function getObjectCalendar(objectSchema, calendarOptions, options) {
           "script": "console.log('eventsSet'); console.log(event);"
         }
       ]
+    },
+    "getRef": {
+      "weight": 0,
+      "actions": [
+        {
+          "componentId": `service_${options.id}`,
+          "args": {
+            "value":{
+              "calendarRef": "${event.data.calendarRef}"
+            }
+          },
+          "actionType": "setValue",
+        }
+      ]
     }
   };
 
@@ -9185,6 +9262,7 @@ async function getObjectCalendar(objectSchema, calendarOptions, options) {
   const amisSchema = {
     "type": "steedos-fullcalendar",
     "label": "",
+    "id": options.id,
     "name": "fullcalendar",
     "placeholder":"${additionalFilters}",//用于触发reload
     "editable": permissions.allowEdit,
@@ -9207,7 +9285,7 @@ async function getObjectCalendar(objectSchema, calendarOptions, options) {
  * @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: 
  */
 
@@ -9266,7 +9344,11 @@ const getSection = async (formFields, permissionFields, fieldSchemaArray, sectio
 
   // fieldSet 已支持显隐控制
   const sectionFieldsVisibleOn = _$1.map(_$1.compact(_$1.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 = {