@steedos-widgets/amis-lib 1.2.10 → 1.2.11

package/dist/index.esm.js

@@ -403,7 +403,7 @@ function getContrastColor(bgColor) {
  * @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: 
  */
 
@@ -460,8 +460,9 @@ function getSelectMap(selectOptions){
     let map = {};
     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>`;
@@ -1867,9 +1868,10 @@ const getSchema$1 = (uiSchema) => {
                                   {
                                     name: "template_url",
                                     label: "导入模板",
-                                    type: "tpl",
-                                    // type: "markdown",
-                                    // html: true,
+                                    type: "markdown",
+                                    options: {
+                                      html: true
+                                    },
                                     className: "whitespace-nowrap",
                                   },
                                   null,
@@ -2716,6 +2718,7 @@ async function getObjectFieldsFilterBarSchema(objectSchema, ctx) {
   if (!ctx) {
     ctx = {};
   }
+  const btnSearchId = "btn_filter_form_search_" + new Date().getTime();
   const filterFormSchema = await getObjectFieldsFilterFormSchema(ctx);
   const onSearchScript = `
     const scope = event.context.scoped;
@@ -2732,7 +2735,7 @@ async function getObjectFieldsFilterBarSchema(objectSchema, ctx) {
     // // 这会造成handleFilterSubmit时把移除掉的搜索项字段之前的值加到过滤条件中
     // for(var k in filterFormValues){
     //   if(filterFormValues[k] === "" && !filterFormValues.hasOwnProperty(k)){
-    //     removedValues[k] = "";
+    //     removedValues[k] = null;
     //   }
     // }
     // listView.handleFilterSubmit(Object.assign({}, removedValues, filterFormValues));
@@ -2771,7 +2774,7 @@ async function getObjectFieldsFilterBarSchema(objectSchema, ctx) {
     const removedValues = {};
     for(var k in filterFormValues){
       if(/^__searchable__/.test(k)){
-        removedValues[k] = "";
+        removedValues[k] = null;
       }
     }
     if(!event.data.isLookup){
@@ -2782,7 +2785,7 @@ async function getObjectFieldsFilterBarSchema(objectSchema, ctx) {
       if(localListViewProps){
         localListViewProps = JSON.parse(localListViewProps);
         for(var k in localListViewProps){
-          removedValues[k] = "";
+          removedValues[k] = null;
         }
       }
     }
@@ -2940,7 +2943,7 @@ async function getObjectFieldsFilterBarSchema(objectSchema, ctx) {
     });
     const removedValues = {};
     removedKeys.forEach(function(key){
-      removedValues[key] = "";
+      removedValues[key] = null;
     });
     filterForm.setValues(removedValues);//这里使用filterInnerForm也可以
 
@@ -2953,10 +2956,14 @@ async function getObjectFieldsFilterBarSchema(objectSchema, ctx) {
     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));
     }
@@ -2990,9 +2997,10 @@ async function getObjectFieldsFilterBarSchema(objectSchema, ctx) {
             "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": [
@@ -3008,7 +3016,7 @@ async function getObjectFieldsFilterBarSchema(objectSchema, ctx) {
                 "type": "button",
                 "label": "取消",
                 "name": "btn_filter_form_cancel",
-                "visibleOn": "this.filterFormSearchableFields && this.filterFormSearchableFields.length",
+                // "visibleOn": "this.filterFormSearchableFields && this.filterFormSearchableFields.length",
                 "onEvent": {
                   "click": {
                     "actions": [
@@ -3123,6 +3131,10 @@ async function getObjectFieldsFilterBarSchema(objectSchema, ctx) {
                                       "actionType": "custom",
                                       "script": onSearchableFieldsChangeScript
                                     },
+                                    {
+                                      "actionType": "click",
+                                      "componentId": btnSearchId
+                                    },
                                     {
                                       "componentId": "",
                                       "args": {},
@@ -3477,7 +3489,7 @@ async function getObjectRecordDetailHeader(objectSchema, recordId, options) {
                   // "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"
@@ -3486,6 +3498,7 @@ async function getObjectRecordDetailHeader(objectSchema, recordId, options) {
           "className": "flex justify-between"
         }
       ],
+      "columnClassName": "flex-initial",
       "md": "auto",
     });
   }
@@ -3506,7 +3519,7 @@ async function getObjectRecordDetailHeader(objectSchema, recordId, options) {
         {
           "type": "grid",
           "columns": gridBody,
-          "className": "flex justify-between"
+          "className": "flex justify-between flex-nowrap"
         }
       ],
       "hiddenOn": "${recordLoaded != true}"
@@ -3723,12 +3736,13 @@ const getNewListviewButtonSchema = ()=>{
                   "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": [
                     {
@@ -3872,12 +3886,13 @@ const getCopyListviewButtonSchema = ()=>{
                   "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": [
                     {
@@ -4019,7 +4034,8 @@ const getRenameListviewButtonSchema = ()=>{
                   "data": {
                     "targetObjectName": "${objectName}",
                     "recordId": "${uiSchema.list_views[listName]._id}",
-                    "appId": "${appId}"
+                    "appId": "${appId}",
+                    "context": "${context}"
                   },
                   "body": [
                     {
@@ -4076,6 +4092,7 @@ const getSetListviewShareButtonSchema = ()=>{
                   "title": "共享设置",
                   "data": {
                     "recordId": "${uiSchema.list_views[listName]._id}",
+                    "context": "${context}"
                   },
                   "body": [
                     {
@@ -4121,7 +4138,8 @@ const getSetListviewFiltersButtonSchema = ()=>{
                     "targetObjectName": "${objectName}",
                     "recordId": "${uiSchema.list_views[listName]._id}",
                     "listName": "${listName}",
-                    "appId": "${appId}"
+                    "appId": "${appId}",
+                    "context": "${context}"
                   },
                   "body": [
                     {
@@ -4265,11 +4283,12 @@ const getSetListviewColumnsButtonSchema = ()=>{
                   "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": [
                     {
@@ -4418,11 +4437,12 @@ const getSetListviewSortButtonSchema = ()=>{
                   "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": [
                     {
@@ -5112,24 +5132,13 @@ function getLookupSapceUserTreeSchema(){
                 "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));
               `
               }
             ]
@@ -5243,7 +5252,7 @@ async function lookupToAmisPicker(field, readonly, ctx){
 
     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 = [];
         _$1.each(field.depend_on, (fName)=>{
@@ -5307,9 +5316,10 @@ async function lookupToAmisPicker(field, readonly, ctx){
             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);
@@ -5529,7 +5539,8 @@ async function lookupToAmisSelect(field, readonly, ctx){
         sort = getListViewSort(listView);
     }
 
-    if(apiInfo.url){
+    // 列表视图搜索栏中，即inFilterForm=true时，不需要执行depend_on
+    if(apiInfo.url && !ctx.inFilterForm){
         const depend_on = [];
         const sendOn = [];
         _$1.each(field.depend_on, (fName)=>{
@@ -5566,9 +5577,10 @@ async function lookupToAmisSelect(field, readonly, ctx){
             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);
@@ -5594,7 +5606,14 @@ async function lookupToAmisSelect(field, readonly, ctx){
     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;
         `;
     }
@@ -5730,7 +5749,7 @@ async function getIdsPickerSchema(field, readonly, ctx){
     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}`;
     }
@@ -6572,7 +6591,7 @@ async function convertSFieldToAmisField(field, readonly, ctx) {
             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.')}`;
@@ -6665,7 +6684,7 @@ async function getFieldSearchable(perField, permissionFields, ctx){
         _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;
         }
@@ -7667,7 +7686,7 @@ async function getTableColumns(fields, options){
                     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}));
             }