@steedos-widgets/amis-object 1.2.10 → 1.2.11

package/dist/amis-object.umd.css

@@ -561,6 +561,9 @@ body {
 .max-w-md {
     max-width: 28rem
 }
+.flex-initial {
+    flex: 0 1 auto
+}
 .flex-auto {
     flex: 1 1 auto
 }
@@ -1235,6 +1238,16 @@ body {
        column-gap: 1rem;
 }
 
+@media (max-width: 768px) {
+  .record-detail-header-name {
+    display: -webkit-box;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    -webkit-line-clamp: 2;
+    -webkit-box-orient: vertical;
+  }
+}
+
 .steedos-context-bar .antd-Nav-list {
   border-bottom: 0px;
   height: 40px;

package/dist/amis-object.umd.js

@@ -788,7 +788,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: 
      */
 
@@ -845,8 +845,9 @@
         let map = {};
         ___default.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>`;
@@ -2252,9 +2253,10 @@
                                       {
                                         name: "template_url",
                                         label: "导入模板",
-                                        type: "tpl",
-                                        // type: "markdown",
-                                        // html: true,
+                                        type: "markdown",
+                                        options: {
+                                          html: true
+                                        },
                                         className: "whitespace-nowrap",
                                       },
                                       null,
@@ -3101,6 +3103,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;
@@ -3117,7 +3120,7 @@
     // // 这会造成handleFilterSubmit时把移除掉的搜索项字段之前的值加到过滤条件中
     // for(var k in filterFormValues){
     //   if(filterFormValues[k] === "" && !filterFormValues.hasOwnProperty(k)){
-    //     removedValues[k] = "";
+    //     removedValues[k] = null;
     //   }
     // }
     // listView.handleFilterSubmit(Object.assign({}, removedValues, filterFormValues));
@@ -3156,7 +3159,7 @@
     const removedValues = {};
     for(var k in filterFormValues){
       if(/^__searchable__/.test(k)){
-        removedValues[k] = "";
+        removedValues[k] = null;
       }
     }
     if(!event.data.isLookup){
@@ -3167,7 +3170,7 @@
       if(localListViewProps){
         localListViewProps = JSON.parse(localListViewProps);
         for(var k in localListViewProps){
-          removedValues[k] = "";
+          removedValues[k] = null;
         }
       }
     }
@@ -3325,7 +3328,7 @@
     });
     const removedValues = {};
     removedKeys.forEach(function(key){
-      removedValues[key] = "";
+      removedValues[key] = null;
     });
     filterForm.setValues(removedValues);//这里使用filterInnerForm也可以
 
@@ -3338,10 +3341,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));
     }
@@ -3375,9 +3382,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": [
@@ -3393,7 +3401,7 @@
                     "type": "button",
                     "label": "取消",
                     "name": "btn_filter_form_cancel",
-                    "visibleOn": "this.filterFormSearchableFields && this.filterFormSearchableFields.length",
+                    // "visibleOn": "this.filterFormSearchableFields && this.filterFormSearchableFields.length",
                     "onEvent": {
                       "click": {
                         "actions": [
@@ -3508,6 +3516,10 @@
                                           "actionType": "custom",
                                           "script": onSearchableFieldsChangeScript
                                         },
+                                        {
+                                          "actionType": "click",
+                                          "componentId": btnSearchId
+                                        },
                                         {
                                           "componentId": "",
                                           "args": {},
@@ -3862,7 +3874,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"
@@ -3871,6 +3883,7 @@
               "className": "flex justify-between"
             }
           ],
+          "columnClassName": "flex-initial",
           "md": "auto",
         });
       }
@@ -3891,7 +3904,7 @@
             {
               "type": "grid",
               "columns": gridBody,
-              "className": "flex justify-between"
+              "className": "flex justify-between flex-nowrap"
             }
           ],
           "hiddenOn": "${recordLoaded != true}"
@@ -4108,12 +4121,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": [
                         {
@@ -4257,12 +4271,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": [
                         {
@@ -4404,7 +4419,8 @@
                       "data": {
                         "targetObjectName": "${objectName}",
                         "recordId": "${uiSchema.list_views[listName]._id}",
-                        "appId": "${appId}"
+                        "appId": "${appId}",
+                        "context": "${context}"
                       },
                       "body": [
                         {
@@ -4461,6 +4477,7 @@
                       "title": "共享设置",
                       "data": {
                         "recordId": "${uiSchema.list_views[listName]._id}",
+                        "context": "${context}"
                       },
                       "body": [
                         {
@@ -4506,7 +4523,8 @@
                         "targetObjectName": "${objectName}",
                         "recordId": "${uiSchema.list_views[listName]._id}",
                         "listName": "${listName}",
-                        "appId": "${appId}"
+                        "appId": "${appId}",
+                        "context": "${context}"
                       },
                       "body": [
                         {
@@ -4650,11 +4668,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": [
                         {
@@ -4803,11 +4822,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": [
                         {
@@ -5497,24 +5517,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));
               `
                   }
                 ]
@@ -5628,7 +5637,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 = [];
             ___default__namespace.each(field.depend_on, (fName)=>{
@@ -5692,9 +5701,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);
@@ -5914,7 +5924,8 @@ else{
             sort = getListViewSort(listView);
         }
 
-        if(apiInfo.url){
+        // 列表视图搜索栏中，即inFilterForm=true时，不需要执行depend_on
+        if(apiInfo.url && !ctx.inFilterForm){
             const depend_on = [];
             const sendOn = [];
             ___default__namespace.each(field.depend_on, (fName)=>{
@@ -5951,9 +5962,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);
@@ -5979,7 +5991,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;
         `;
         }
@@ -6115,7 +6134,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}`;
         }
@@ -6957,7 +6976,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.')}`;
@@ -7050,7 +7069,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;
             }
@@ -8052,7 +8071,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}));
                 }
@@ -13932,13 +13951,6 @@ else{
         });
     }); };
 
-    /*
-     * @Author: baozhoutao@steedos.com
-     * @Date: 2022-12-08 10:32:17
-     * @LastEditors: baozhoutao@steedos.com
-     * @LastEditTime: 2023-04-13 18:40:42
-     * @Description:
-     */
     var AmisRecordDetail = function (props) { return __awaiter(void 0, void 0, void 0, function () {
         var className, $schema, appId, _a, objectApiName, body, schema;
         return __generator(this, function (_b) {
@@ -14522,7 +14534,7 @@ else{
                 schemaApi: {
                     "method": "get",
                     "url": "${context.rootUrl}/service/api/apps/".concat(appId, "/menus"),
-                    "adaptor": "\n                  try {\n                      console.log('payload====>', payload)\n                      if(payload.nav_schema){\n                        payload.data = payload.nav_schema;\n                        return payload\n                      }\n\n                      const data = { nav: [] };\n                      const stacked = ".concat(stacked, ";\n                      const showIcon = ").concat(showIcon, ";\n                      const selectedId = '").concat(selectedId, "';\n                      if(stacked){\n                          _.each(_.groupBy(payload.children, 'group'), (tabs, groupName) => {\n                              if (groupName === 'undefined' || groupName === '') {\n                                  _.each(tabs, (tab) => {\n                                      data.nav.push({\n                                          \"label\": showIcon ? {\n                                          type: 'tpl',\n                                          tpl: `<span class='fill-slate-500  text-slate-700 block -ml-px no-underline group flex items-center text-[15px] font-medium rounded-md'><svg class=\"mr-1 flex-shrink-0 h-6 w-6\"><use xlink:href=\"/assets/icons/standard-sprite/svg/symbols.svg#${tab.icon || 'account'}\"></use></svg>${tab.name}</span>`\n                                          } : tab.name,\n                                          \"to\": tab.path,\n                                          \"target\":tab.target\n                                          // active: selectedId === tab.id,\n                                      })\n                                  })\n                              } else {\n                                  data.nav.push({\n                                      \"label\": groupName,\n                                      \"unfolded\": true,\n                                      \"children\": _.map(tabs, (tab) => {\n                                          return {\n                                          \"label\": showIcon ? {\n                                              type: 'tpl',\n                                              tpl: `<span class='fill-slate-500  text-slate-700 block -ml-px no-underline group flex items-center text-[15px] font-medium rounded-md'><svg class=\"mr-1 flex-shrink-0 h-6 w-6\"><use xlink:href=\"/assets/icons/standard-sprite/svg/symbols.svg#${tab.icon || 'account'}\"></use></svg>${tab.name}</span>`\n                                          }  : tab.name,\n                                          \"to\": tab.path,\n                                          \"target\":tab.target\n                                          // active: selectedId === tab.id,\n                                          }\n                                      })\n                                  })   \n                              }\n                              });\n                      }else{\n                          _.each(payload.children, (tab)=>{\n                              data.nav.push({\n                              \"label\": showIcon ? {\n                                  type: 'tpl',\n                                  tpl: `<span class='fill-slate-500  text-slate-700 block -ml-px no-underline group flex items-center text-[15px] font-medium rounded-md'><svg class=\"mr-1 flex-shrink-0 h-6 w-6\"><use xlink:href=\"/assets/icons/standard-sprite/svg/symbols.svg#${tab.icon || 'account'}\"></use></svg>${tab.name}</span>`\n                              } : tab.name,\n                              \"to\": tab.path,\n                              \"target\":tab.target\n                              // active: selectedId === tab.id,\n                              });\n                          })\n                      }\n                      payload.data = {\n                        \"type\": \"nav\",\n                        className: \"").concat(className, "\",\n                        \"stacked\": ").concat(stacked, ",\n                        \"overflow\": ").concat(JSON.stringify(overflow), ",\n                        \"indentSize\": ").concat(indentSize, ",\n                        \"links\": data.nav,\n                      };\n                  } catch (error) {\n                      console.log(`error`, error)\n                  }\n                  console.log('payload===2==>', payload)\n                  return payload;\n            "),
+                    "adaptor": "\n                  try {\n                      console.log('payload====>', payload)\n                      if(payload.nav_schema){\n                        payload.data = payload.nav_schema;\n                        return payload\n                      }\n\n                      const data = { nav: [] };\n                      const stacked = ".concat(stacked, ";\n                      const showIcon = ").concat(showIcon, ";\n                      const selectedId = '").concat(selectedId, "';\n                      const tab_groups = payload.tab_groups;\n                      if(stacked){\n                          _.each(_.groupBy(payload.children, 'group'), (tabs, groupName) => {\n                              if (groupName === 'undefined' || groupName === '') {\n                                  _.each(tabs, (tab) => {\n                                      data.nav.push({\n                                          \"label\": showIcon ? {\n                                          type: 'tpl',\n                                          tpl: `<span class='fill-slate-500  text-slate-700 block -ml-px no-underline group flex items-center text-[15px] font-medium rounded-md'><svg class=\"mr-1 flex-shrink-0 h-6 w-6\"><use xlink:href=\"/assets/icons/standard-sprite/svg/symbols.svg#${tab.icon || 'account'}\"></use></svg>${tab.name}</span>`\n                                          } : tab.name,\n                                          \"to\": tab.path,\n                                          \"target\":tab.target\n                                          // active: selectedId === tab.id,\n                                      })\n                                  })\n                              } else {\n                                  data.nav.push({\n                                      \"label\": groupName,\n                                      \"unfolded\": _.find(tab_groups, {\"group_name\": groupName})?.default_open != false,\n                                      \"children\": _.map(tabs, (tab) => {\n                                          return {\n                                          \"label\": showIcon ? {\n                                              type: 'tpl',\n                                              tpl: `<span class='fill-slate-500  text-slate-700 block -ml-px no-underline group flex items-center text-[15px] font-medium rounded-md'><svg class=\"mr-1 flex-shrink-0 h-6 w-6\"><use xlink:href=\"/assets/icons/standard-sprite/svg/symbols.svg#${tab.icon || 'account'}\"></use></svg>${tab.name}</span>`\n                                          }  : tab.name,\n                                          \"to\": tab.path,\n                                          \"target\":tab.target\n                                          // active: selectedId === tab.id,\n                                          }\n                                      })\n                                  })   \n                              }\n                              });\n                      }else{\n                          _.each(payload.children, (tab)=>{\n                              data.nav.push({\n                              \"label\": showIcon ? {\n                                  type: 'tpl',\n                                  tpl: `<span class='fill-slate-500  text-slate-700 block -ml-px no-underline group flex items-center text-[15px] font-medium rounded-md'><svg class=\"mr-1 flex-shrink-0 h-6 w-6\"><use xlink:href=\"/assets/icons/standard-sprite/svg/symbols.svg#${tab.icon || 'account'}\"></use></svg>${tab.name}</span>`\n                              } : tab.name,\n                              \"to\": tab.path,\n                              \"target\":tab.target\n                              // active: selectedId === tab.id,\n                              });\n                          })\n                      }\n                      payload.data = {\n                        \"type\": \"nav\",\n                        className: \"").concat(className, "\",\n                        \"stacked\": ").concat(stacked, ",\n                        \"overflow\": ").concat(JSON.stringify(overflow), ",\n                        \"indentSize\": ").concat(indentSize, ",\n                        \"links\": data.nav,\n                      };\n                  } catch (error) {\n                      console.log(`error`, error)\n                  }\n                  console.log('payload===2==>', payload)\n                  return payload;\n            "),
                     "headers": {
                         "Authorization": "Bearer ${context.tenantId},${context.authToken}"
                     }