@steedos-widgets/amis-lib 1.2.30 → 1.2.32

package/dist/index.cjs.js

@@ -514,7 +514,7 @@ function getNameTpl(field, ctx){
 
 function getRelatedFieldTpl(field, ctx){
     let tpl = '';
-    if(!field.reference_to && (field.optionsFunction || field._optionsFunction)){
+    if(!field.reference_to && (field.optionsFunction || field._optionsFunction || field.options)){
         if(field.isTableField){
             return `\${${field.name}}`
         }else {
@@ -978,6 +978,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";
@@ -1059,6 +1060,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,
@@ -1141,6 +1143,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 = "查看";
@@ -1223,6 +1226,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,
@@ -2589,7 +2593,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",
@@ -5135,7 +5140,7 @@ const getSettingListviewToolbarButtonSchema = ()=>{
         "trigger": "click",
         "icon": "fa fa-cog",
         "tooltip": i18next__default["default"].t('frontend_button_listview_control_tooltip'),
-        "btnClassName": "antd-Button--iconOnly bg-white p-2 rounded border-gray-300 text-gray-500",
+        "btnClassName": "antd-Button--iconOnly bg-white !p-2 rounded border-gray-300 text-gray-500",
         "align": "right",
         "visibleOn": "${!isLookup}",
         "buttons": [
@@ -5179,7 +5184,7 @@ const getDisplayAsButton = function(objectName, showDisplayAs){
     "type": "dropdown-button",
     "icon": "fa fa-table-columns",
     "tooltip": `${i18next__default["default"].t('frontend_display_as')} ${displayAsLabel}`,
-    "btnClassName": "antd-Button--iconOnly bg-white p-2 rounded border-gray-300 text-gray-500",
+    "btnClassName": "antd-Button--iconOnly bg-white !p-2 rounded border-gray-300 text-gray-500",
     "align": "right",
     "visibleOn": "${window:innerWidth > 768 && !!!isLookup}",
     "buttons": [ 
@@ -5841,6 +5846,14 @@ async function lookupToAmisPicker(field, readonly, ctx){
             }
         }
 
+        if(${referenceTo?.objectName === "space_users"} && ${field.reference_to_field === "user"}){
+            if(filters.length > 0){
+                filters = [ ["user_accepted", "=", true], "and", filters ]
+            }else{
+                filters = [["user_accepted", "=", true]];
+            }
+        }
+
 
         if(allowSearchFields){
             allowSearchFields.forEach(function(key){
@@ -6057,6 +6070,7 @@ async function lookupToAmisPicker(field, readonly, ctx){
 
     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,
         modalMode: 'dialog', //TODO 设置 dialog 或者 drawer，用来配置弹出方式
@@ -6173,6 +6187,14 @@ async function lookupToAmisSelect(field, readonly, ctx){
             filters.push(fieldFilters);
         }
 
+        if(${referenceTo?.objectName === "space_users"} && ${field.reference_to_field === "user"}){
+            if(filters.length > 0){
+                filters = [ ["user_accepted", "=", true], "and", filters ]
+            }else{
+                filters = [["user_accepted", "=", true]];
+            }
+        }
+
         const inFilterForm = ${ctx.inFilterForm};
         const filtersFunction = ${field.filtersFunction || field._filtersFunction};
 
@@ -6212,6 +6234,18 @@ async function lookupToAmisSelect(field, readonly, ctx){
         payload.data.options = options;
         return payload;
         `;
+    }else if(field.options){
+        apiInfo.adaptor = `
+        var options = ${JSON.stringify(field.options)}
+        if(api.data.$term){
+            options = _.filter(options, function(o) {
+                var label = o.label;
+                return label.toLowerCase().indexOf(api.data.$term.toLowerCase()) > -1;
+            });
+        }
+        payload.data.options = options;
+        return payload;
+        `;
     }
 
     const data = {
@@ -6291,11 +6325,6 @@ async function lookupToAmis(field, readonly, ctx){
             // ids人员点选模式
             return await lookupToAmisIdsPicker(field, readonly, ctx);
         }
-        if(!field.filters || field.filters.length == 0){
-            field.filters = [["user_accepted", "=", true]];
-        }else {
-            field.filters = [ ["user_accepted", "=", true], "and", field.filters ];
-        }
         // 左侧树右侧人员列表的下拉框模式，不再支持，而是执行下面的lookupToAmisPicker函数弹出选人窗口
         // return await lookupToAmisSelectUser(field, readonly, ctx);
     }
@@ -6515,8 +6544,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: 
  */
 
@@ -6548,6 +6577,8 @@ function getAmisStaticFieldType(type, readonly, options){
             return `static-images`;
         }
         return `static-${type}`;
+    }else if(type === 'url'){
+        return "input-url"
     }else {
         return 'static';
     }
@@ -6783,13 +6814,13 @@ function getSelectFieldOptions(field){
     ___namespace.each(field.options, (item)=>{
         switch (dataType) {
             case 'number':
-                options.push({label: item.label, value: Number(item.value)});
+                options.push({label: item.label, value: Number(item.value), icon: item.icon});
                 break;
             case 'text':
-                options.push({label: item.label, value: String(item.value)});
+                options.push({label: item.label, value: String(item.value), icon: item.icon});
                 break;
             case 'boolean':
-                options.push({label: item.label, value: item.value === 'false' ? false : true});
+                options.push({label: item.label, value: item.value === 'false' ? false : true, icon: item.icon});
                 break;
         }
     });
@@ -6851,6 +6882,17 @@ async function convertSFieldToAmisField(field, readonly, ctx) {
                     labelField: 'label',
                     valueField: 'value'
                 };
+                const select_menuTpl = `<span class='flex items-center mt-0.5'>
+                    <span role='img' aria-label='smile' class='anticon anticon-smile'>
+                        <span class='slds-icon_container slds-icon-standard-\${REPLACE(icon,'_','-')}'>
+                            <svg class='slds-icon slds-icon_x-small' aria-hidden='true'>
+                                <use xlink:href='/assets/icons/standard-sprite/svg/symbols.svg#\${icon}'></use>
+                            </svg>
+                        </span> 
+                    </span>
+                    <span class='pl-1.5'>\${label}</span>
+                </span>`;
+                convertData.menuTpl = "${icon ? `"+select_menuTpl+"` : label}";
                 if(field.multiple){
                     convertData.multiple = true;
                     convertData.extractValue = true;
@@ -7064,7 +7106,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 = {
@@ -7398,17 +7441,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}"
                                         }
                                     )
@@ -7417,8 +7462,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}"
                                 }
                             `;
@@ -7582,7 +7627,7 @@ async function getTableColumns(fields, options){
                 type: "switch",
                 name: field.name,
                 label: field.label,
-                width: field.width,
+                width: field.width || defaultWidth,
                 toggled: field.toggled,
                 static: true,
                 className:"whitespace-nowrap",
@@ -7603,6 +7648,10 @@ async function getTableColumns(fields, options){
         }
         else if(field.type === 'select'){
             const map = getSelectMap(field.options);
+            let className = "";
+            if(field.wrap === false){
+                className += " whitespace-nowrap";
+            }
             columns.push(Object.assign({}, {
                 type: "mapping",
                 name: field.name,
@@ -7611,7 +7660,7 @@ async function getTableColumns(fields, options){
                 sortable: field.sortable,
                 width: field.width || defaultWidth,
                 toggled: field.toggled,
-                className:"whitespace-nowrap",
+                className,
                 static: true,
                 quickEdit: quickEditSchema
             }, field.amis, {name: field.name}));
@@ -7623,8 +7672,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'){
@@ -8250,7 +8303,10 @@ async function getTableApi(mainObject, fields, options){
             if(item[key]){
                 if(field._optionsFunction){
                     const optionsFunction = eval("(" + field._optionsFunction+ ")")(item);
-                    item[key + '__label'] = _.map(_.filter(optionsFunction, function(option){return _.includes(item[key], option.value)}), 'label').join(' ');
+                    item[key + '__label'] = _.map(_.filter(optionsFunction, function(option){return item[key] == option.value}), 'label').join(' ');
+                }else if(field.options){
+                    const options = field.options;
+                    item[key + '__label'] = _.map(_.filter(options, function(option){return item[key] == option.value}), 'label').join(' ');
                 }
             }
         })
@@ -8305,7 +8361,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;
@@ -8997,17 +9054,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,
@@ -9136,6 +9194,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",
+        }
+      ]
     }
   };
 
@@ -9171,6 +9243,7 @@ async function getObjectCalendar(objectSchema, calendarOptions, options) {
   const amisSchema = {
     "type": "steedos-fullcalendar",
     "label": "",
+    "id": options.id,
     "name": "fullcalendar",
     "placeholder":"${additionalFilters}",//用于触发reload
     "editable": permissions.allowEdit,
@@ -9193,7 +9266,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: 
  */
 
@@ -9252,7 +9325,11 @@ const getSection = async (formFields, permissionFields, fieldSchemaArray, sectio
 
   // 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 = {
@@ -13695,6 +13772,7 @@ exports.getRecordDetailSchema = getRecordDetailSchema;
 exports.getRecordPageInitSchema = getRecordPageInitSchema;
 exports.getRecordPermissions = getRecordPermissions;
 exports.getRecordServiceSchema = getRecordServiceSchema;
+exports.getReferenceTo = getReferenceTo;
 exports.getRelatedFieldValue = getRelatedFieldValue;
 exports.getRelatedListSchema = getRelatedListSchema;
 exports.getRelatedsCount = getRelatedsCount;