@steedos-widgets/amis-lib 1.2.10 → 1.2.11

package/dist/index.umd.js

@@ -429,7 +429,7 @@
    * @Author: baozhoutao@steedos.com
    * @Date: 2022-05-23 09:53:08
    * @LastEditors: Please set LastEditors
-   * @LastEditTime: 2023-05-18 16:34:39
+   * @LastEditTime: 2023-05-22 15:13:18
    * @Description: 
    */
 
@@ -486,8 +486,9 @@
       let map = {};
       _$1.forEach(selectOptions,(option)=>{
           const optionValue = option.value + '';
-          if(option.color){
-              const background = option.color.charAt(0) === '#' ? option.color : '#'+option.color;
+          const optionColor = option.color + '';
+          if(optionColor){
+              const background = optionColor.charAt(0) === '#' ? optionColor : '#'+optionColor;
               const color = getContrastColor(background);
               const optionColorStyle = 'background:'+background+';color:'+color;
               map[optionValue] = `<span class="rounded-xl px-2 py-1" style='${optionColorStyle}'>${option.label}</span>`;
@@ -1893,9 +1894,10 @@
                                     {
                                       name: "template_url",
                                       label: "导入模板",
-                                      type: "tpl",
-                                      // type: "markdown",
-                                      // html: true,
+                                      type: "markdown",
+                                      options: {
+                                        html: true
+                                      },
                                       className: "whitespace-nowrap",
                                     },
                                     null,
@@ -2742,6 +2744,7 @@
     if (!ctx) {
       ctx = {};
     }
+    const btnSearchId = "btn_filter_form_search_" + new Date().getTime();
     const filterFormSchema = await getObjectFieldsFilterFormSchema(ctx);
     const onSearchScript = `
     const scope = event.context.scoped;
@@ -2758,7 +2761,7 @@
     // // 这会造成handleFilterSubmit时把移除掉的搜索项字段之前的值加到过滤条件中
     // for(var k in filterFormValues){
     //   if(filterFormValues[k] === "" && !filterFormValues.hasOwnProperty(k)){
-    //     removedValues[k] = "";
+    //     removedValues[k] = null;
     //   }
     // }
     // listView.handleFilterSubmit(Object.assign({}, removedValues, filterFormValues));
@@ -2797,7 +2800,7 @@
     const removedValues = {};
     for(var k in filterFormValues){
       if(/^__searchable__/.test(k)){
-        removedValues[k] = "";
+        removedValues[k] = null;
       }
     }
     if(!event.data.isLookup){
@@ -2808,7 +2811,7 @@
       if(localListViewProps){
         localListViewProps = JSON.parse(localListViewProps);
         for(var k in localListViewProps){
-          removedValues[k] = "";
+          removedValues[k] = null;
         }
       }
     }
@@ -2966,7 +2969,7 @@
     });
     const removedValues = {};
     removedKeys.forEach(function(key){
-      removedValues[key] = "";
+      removedValues[key] = null;
     });
     filterForm.setValues(removedValues);//这里使用filterInnerForm也可以
 
@@ -2979,10 +2982,14 @@
     let localListViewProps = sessionStorage.getItem(listViewPropsStoreKey);
     if(localListViewProps){
       localListViewProps = JSON.parse(localListViewProps);
-      // const removedValues = {};
-      removedKeys.forEach(function(key){
-        delete localListViewProps[key];
-        // removedValues[key] = "";
+      _.each(localListViewProps, function(n,k){
+        // __searchable__开头的不在searchableFields范围则清除其值
+        let isRemoved = !!removedFields.find(function(fieldName){
+          return new RegExp("__searchable__\.*" + fieldName + "$").test(k);
+        });
+        if(isRemoved){
+          delete localListViewProps[k];
+        }
       });
       sessionStorage.setItem(listViewPropsStoreKey, JSON.stringify(localListViewProps));
     }
@@ -3016,9 +3023,10 @@
               "body": [
                 {
                   "type": "button",
+                  "id": btnSearchId,
                   "label": "搜索",
                   "icon": "fa fa-search",
-                  "visibleOn": "this.filterFormSearchableFields && this.filterFormSearchableFields.length",
+                  // "visibleOn": "this.filterFormSearchableFields && this.filterFormSearchableFields.length",
                   "onEvent": {
                     "click": {
                       "actions": [
@@ -3034,7 +3042,7 @@
                   "type": "button",
                   "label": "取消",
                   "name": "btn_filter_form_cancel",
-                  "visibleOn": "this.filterFormSearchableFields && this.filterFormSearchableFields.length",
+                  // "visibleOn": "this.filterFormSearchableFields && this.filterFormSearchableFields.length",
                   "onEvent": {
                     "click": {
                       "actions": [
@@ -3149,6 +3157,10 @@
                                         "actionType": "custom",
                                         "script": onSearchableFieldsChangeScript
                                       },
+                                      {
+                                        "actionType": "click",
+                                        "componentId": btnSearchId
+                                      },
                                       {
                                         "componentId": "",
                                         "args": {},
@@ -3503,7 +3515,7 @@
                     // "tpl": "${(record && uiSchema && record[uiSchema.NAME_FIELD_KEY]) || name}",
                     "inline": false,
                     "wrapperComponent": "",
-                    "className": "leading-5 text-xl font-bold"
+                    "className": "record-detail-header-name leading-5 text-xl font-bold"
                   }
                 ],
                 "columnClassName": "p-l-xs"
@@ -3512,6 +3524,7 @@
             "className": "flex justify-between"
           }
         ],
+        "columnClassName": "flex-initial",
         "md": "auto",
       });
     }
@@ -3532,7 +3545,7 @@
           {
             "type": "grid",
             "columns": gridBody,
-            "className": "flex justify-between"
+            "className": "flex justify-between flex-nowrap"
           }
         ],
         "hiddenOn": "${recordLoaded != true}"
@@ -3749,12 +3762,13 @@
                     "type": "dialog",
                     "title": "新建 列表视图",
                     "data": {
-                      "&": "$$",
+                      //"&":"$$",2.7、2.9、3.0在此处失效
                       "all": "${uiSchema.list_views.all}",
                       "list_view": "${uiSchema.list_views[listName]}",
                       "appId": "${appId}",
                       "global": "${global}",
                       "targetObjectName": "${objectName}",
+                      "context": "${context}"
                     },
                     "body": [
                       {
@@ -3898,12 +3912,13 @@
                     "type": "dialog",
                     "title": "复制 列表视图",
                     "data": {
-                      "&": "$$",
+                      //"&":"$$",2.7、2.9、3.0在此处失效
                       "listName": "${listName}",
                       "targetObjectName": "${objectName}",
                       "list_view": "${uiSchema.list_views[listName]}",
                       "appId": "${appId}",
-                      "global": "${global}"
+                      "global": "${global}",
+                      "context": "${context}"
                     },
                     "body": [
                       {
@@ -4045,7 +4060,8 @@
                     "data": {
                       "targetObjectName": "${objectName}",
                       "recordId": "${uiSchema.list_views[listName]._id}",
-                      "appId": "${appId}"
+                      "appId": "${appId}",
+                      "context": "${context}"
                     },
                     "body": [
                       {
@@ -4102,6 +4118,7 @@
                     "title": "共享设置",
                     "data": {
                       "recordId": "${uiSchema.list_views[listName]._id}",
+                      "context": "${context}"
                     },
                     "body": [
                       {
@@ -4147,7 +4164,8 @@
                       "targetObjectName": "${objectName}",
                       "recordId": "${uiSchema.list_views[listName]._id}",
                       "listName": "${listName}",
-                      "appId": "${appId}"
+                      "appId": "${appId}",
+                      "context": "${context}"
                     },
                     "body": [
                       {
@@ -4291,11 +4309,12 @@
                     "type": "dialog",
                     "title": "显示的列",
                     "data": {
-                      "&": "$$",
+                      //"&":"$$",2.7、2.9、3.0在此处失效
                       "targetObjectName": "${objectName}",
                       "recordId": "${uiSchema.list_views[listName]._id}",
                       "listName": "${listName}",
-                      "appId": "${appId}"
+                      "appId": "${appId}",
+                      "context": "${context}"
                     },
                     "body": [
                       {
@@ -4444,11 +4463,12 @@
                     "type": "dialog",
                     "title": "默认排序规则",
                     "data": {
-                      "&": "$$",
+                      //"&":"$$",2.7、2.9、3.0在此处失效
                       "targetObjectName": "${objectName}",
                       "recordId": "${uiSchema.list_views[listName]._id}",
                       "listName": "${listName}",
-                      "appId": "${appId}"
+                      "appId": "${appId}",
+                      "context": "${context}"
                     },
                     "body": [
                       {
@@ -5138,24 +5158,13 @@ else{
                   "actionType": "custom",
                   "script": `
                 const scope = event.context.scoped;
-                //TODO: 将form中的value一同加入筛选内
-                // var filterForm = scope.parent.parent.getComponents().find(function(n){
-                //     return n.props.type === "form";
-                //   });
-                // var filterFormValues = filterForm.getValues();
-                filterFormValues={
+                var filterFormValues={
                     "__searchable__organizations_parents":event.data.value.value
                 }
                 var listView = scope.parent.getComponents().find(function(n){
                   return n.props.type === "crud";
                 });
-                const removedValues = {};
-                // for(var k in filterFormValues){
-                    //   if(filterFormValues[k] === "" && !filterFormValues.hasOwnProperty(k)){
-                    //     removedValues[k] = "";
-                    //   }
-                    // }
-                listView.handleFilterSubmit(Object.assign({}, removedValues, filterFormValues));
+                listView.handleFilterSubmit(Object.assign({}, filterFormValues));
               `
                 }
               ]
@@ -5269,7 +5278,7 @@ else{
 
       const source = await getApi$1(refObjectConfig, null, fields, {expand: true, alias: 'rows', queryOptions: `filters: {__filters}, top: {__top}, skip: {__skip}, sort: "{__sort}"`});
       
-      if(source.url){
+      if(source.url && !ctx.inFilterForm){
           const depend_on = [];
           const sendOn = [];
           ___namespace.each(field.depend_on, (fName)=>{
@@ -5333,9 +5342,10 @@ else{
             filters.push(fieldFilters);
         }
         
+        const inFilterForm = ${ctx.inFilterForm};
         const filtersFunction = ${field.filtersFunction || field._filtersFunction};
 
-        if(filtersFunction){
+        if(filtersFunction && !inFilterForm){
             const _filters = filtersFunction(filters, api.data.$self.__super.__super);
             if(_filters && _filters.length > 0){
                 filters.push(_filters);
@@ -5555,7 +5565,8 @@ else{
           sort = getListViewSort(listView);
       }
 
-      if(apiInfo.url){
+      // 列表视图搜索栏中，即inFilterForm=true时，不需要执行depend_on
+      if(apiInfo.url && !ctx.inFilterForm){
           const depend_on = [];
           const sendOn = [];
           ___namespace.each(field.depend_on, (fName)=>{
@@ -5592,9 +5603,10 @@ else{
             filters.push(fieldFilters);
         }
 
+        const inFilterForm = ${ctx.inFilterForm};
         const filtersFunction = ${field.filtersFunction || field._filtersFunction};
 
-        if(filtersFunction){
+        if(filtersFunction && !inFilterForm){
             const _filters = filtersFunction(filters, api.data.$);
             if(_filters && _filters.length > 0){
                 filters.push(_filters);
@@ -5620,7 +5632,14 @@ else{
       referenceTo ? referenceTo.valueField.name : '';
       if(field.optionsFunction || field._optionsFunction){
           apiInfo.adaptor = `
-        payload.data.options = eval(${field.optionsFunction || field._optionsFunction})(api.data.$);
+        var options = eval(${field.optionsFunction || field._optionsFunction})(api.data.$);
+        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;
         `;
       }
@@ -5756,7 +5775,7 @@ else{
       source.data.$term = "$term";
       source.data.$self = "$$";
 
-      if(idsDependOn && source.url){
+      if(idsDependOn && source.url && !ctx.inFilterForm){
           source.sendOn = `\${${idsDependOn} && ${idsDependOn}.length}`;
           source.url = `${source.url}&depend_on_${idsDependOn}=\${${idsDependOn}|join}`;
       }
@@ -6598,7 +6617,7 @@ else{
               convertData.className = fieldTypeClassName;
           }
 
-          if(field.visible_on){
+          if(field.visible_on && !ctx.inFilterForm){
               // convertData.visibleOn = `\$${field.visible_on.substring(1, field.visible_on.length -1).replace(/formData./g, '')}`;
               if(field.visible_on.startsWith("{{")){
                   convertData.visibleOn = `${field.visible_on.substring(2, field.visible_on.length -2).replace(/formData./g, 'data.')}`;
@@ -6691,7 +6710,7 @@ else{
           _field.multiple = true;
           _field.is_wide = false;
           _field.defaultValue = undefined;
-          const amisField = await convertSFieldToAmisField(_field, false, Object.assign({}, ctx, {fieldNamePrefix: fieldNamePrefix, required: false, showSystemFields: true}));
+          const amisField = await convertSFieldToAmisField(_field, false, Object.assign({}, ctx, {fieldNamePrefix: fieldNamePrefix, required: false, showSystemFields: true, inFilterForm: true}));
           if(amisField){
               return amisField;
           }
@@ -7693,7 +7712,7 @@ else{
                       tpl: tpl,
                       toggled: field.toggled,
                       className,
-                      html: field.type === 'html' ? true : null
+                      options: field.type === 'html' ? {html: true} : null
                       // toggled: true 
                   }, field.amis, {name: field.name}));
               }