@steedos-widgets/amis-lib 1.2.30 → 1.2.31

package/dist/index.umd.js

@@ -511,7 +511,7 @@
 
   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 {
@@ -5132,7 +5132,7 @@
           "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": [
@@ -5176,7 +5176,7 @@
       "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": [ 
@@ -5838,6 +5838,14 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
             }
         }
 
+        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){
@@ -6170,6 +6178,14 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
             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};
 
@@ -6209,6 +6225,18 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
         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 = {
@@ -6288,11 +6316,6 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
               // 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);
       }
@@ -6780,13 +6803,13 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
       ___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;
           }
       });
@@ -6848,6 +6871,17 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
                       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;
@@ -7579,7 +7613,7 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
                   type: "switch",
                   name: field.name,
                   label: field.label,
-                  width: field.width,
+                  width: field.width || defaultWidth,
                   toggled: field.toggled,
                   static: true,
                   className:"whitespace-nowrap",
@@ -7600,6 +7634,10 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
           }
           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,
@@ -7608,7 +7646,7 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
                   sortable: field.sortable,
                   width: field.width || defaultWidth,
                   toggled: field.toggled,
-                  className:"whitespace-nowrap",
+                  className,
                   static: true,
                   quickEdit: quickEditSchema
               }, field.amis, {name: field.name}));
@@ -8247,7 +8285,10 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
             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(' ');
                 }
             }
         })
@@ -13692,6 +13733,7 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
   exports.getRecordPageInitSchema = getRecordPageInitSchema;
   exports.getRecordPermissions = getRecordPermissions;
   exports.getRecordServiceSchema = getRecordServiceSchema;
+  exports.getReferenceTo = getReferenceTo;
   exports.getRelatedFieldValue = getRelatedFieldValue;
   exports.getRelatedListSchema = getRelatedListSchema;
   exports.getRelatedsCount = getRelatedsCount;