@steedos-widgets/fullcalendar 1.0.14 → 1.0.16

package/dist/fullcalendar.esm.js

@@ -66783,7 +66783,7 @@ const getBuilderContext=()=>"undefined"==typeof window?{}:Builder.settings.conte
     </span>
     <% } %>`}function getPasswordTpl(e){return `<% if (data.${e.name}) { %>
         <span>······</span>
-        <% } %>`}async function getFieldTpl(e,t){if(e.is_name||e.name===t.labelFieldName)return getNameTpl(e,t);switch(e.type){case"password":return getPasswordTpl(e);case"boolean":return getSwitchTpl(e);case"select":return getSelectTpl(e);case"time":return getTimeTpl(e);case"date":return getDateTpl(e);case"datetime":return getDateTimeTpl(e);case"lookup":case"master_detail":return getRelatedFieldTpl(e,t);case"number":case"currency":return getNumberTpl(e);case"formula":case"summary":return getUiFieldTpl(e);case"filesize":return getUiFileSizeTpl(e)}}async function getListBody(e,t){var a=[];for(const r of e){var i=await getFieldTpl(r,t);let e=i?"tpl":"text";r.hidden||r.extra||a.push({name:r.name,label:r.label,sortable:r.sortable,width:r.width,type:e,tpl:i,toggled:r.toggled});}return {type:"hbox",columns:a}}function getDefaultParams$1(e){return {perPage:e.top||e.perPage||10}}async function getListSchema$1(e,t){e=(await getListBody(e,t)).columns;return {mode:"list",name:"thelist",draggable:!1,headerToolbar:["reload"],defaultParams:getDefaultParams$1(t),syncLocation:!1,keepItemSelectionOnPageChange:!0,checkOnItemClick:!1,labelTpl:"${name}",listItem:{body:[...e],actions:!1===t.actions?null:[{icon:"fa fa-eye",label:"查看",type:"button",actionType:"link",link:Router.getObjectDetailPath({formFactor:t.formFactor,appId:t.appId,objectName:t.tabId,listView:t.listView,recordId:"${_id}"})}]}}}var config={listView:{newRecordMode:"modal",editRecordMode:"modal",perPage:20}};async function getObjectListHeaderFieldsFilterBar(t,e,a){var i=lodash.exports.keys(t.fields),i=lodash.exports.sortBy(lodash.exports.compact(lodash.exports.map(i,e=>t.fields[e])),"sort_no");return await getObjectFieldsFilterBarSchema(t,i,a)}function getObjectHeaderToolbar(e,t){return "SMALL"===t?[{type:"tpl",tpl:"${count} 个项目"},{type:"reload",align:"right",className:"bg-white p-2 rounded border-gray-300 text-gray-500"}]:["bulkActions",{type:"tpl",tpl:"${count} 个项目"},{type:"reload",align:"right",className:"bg-white p-2 rounded border-gray-300 text-gray-500"},{label:"",icon:"fa fa-search",type:"button",align:"right",className:"bg-white p-2 rounded border-gray-300 text-gray-500",onEvent:{click:{actions:[{actionType:"custom",script:`
+        <% } %>`}async function getFieldTpl(e,t){if(e.is_name||e.name===t.labelFieldName)return getNameTpl(e,t);switch(e.type){case"password":return getPasswordTpl(e);case"boolean":return getSwitchTpl(e);case"select":return getSelectTpl(e);case"time":return getTimeTpl(e);case"date":return getDateTpl(e);case"datetime":return getDateTimeTpl(e);case"lookup":case"master_detail":return getRelatedFieldTpl(e,t);case"number":case"currency":return getNumberTpl(e);case"formula":case"summary":return getUiFieldTpl(e);case"filesize":return getUiFileSizeTpl(e)}}async function getListBody(e,t){var a=[];for(const r of e){var i=await getFieldTpl(r,t);let e=i?"tpl":"text";r.hidden||r.extra||a.push({name:r.name,label:r.label,sortable:r.sortable,width:r.width,type:e,tpl:i,toggled:r.toggled});}return {type:"hbox",columns:a}}function getDefaultParams$1(e){return {perPage:e.top||e.perPage||10}}async function getListSchema$1(e,t){e=(await getListBody(e,t)).columns;return {mode:"list",name:"thelist",draggable:!1,headerToolbar:["reload"],defaultParams:getDefaultParams$1(t),syncLocation:!1,keepItemSelectionOnPageChange:!0,checkOnItemClick:!1,labelTpl:"${name}",listItem:{body:[...e],actions:!1===t.actions?null:[{icon:"fa fa-eye",label:"查看",type:"button",actionType:"link",link:Router.getObjectDetailPath({formFactor:t.formFactor,appId:t.appId,objectName:t.tabId,listView:t.listView,recordId:"${_id}"})}]}}}var config={listView:{newRecordMode:"modal",editRecordMode:"modal",perPage:20}};async function getObjectListHeaderFieldsFilterBar(t,e,a){var i=lodash.exports.keys(t.fields),i=lodash.exports.sortBy(lodash.exports.compact(lodash.exports.map(i,e=>t.fields[e])),"sort_no");return await getObjectFieldsFilterBarSchema(t,i,a)}function getObjectHeaderToolbar(e,t){return "SMALL"===t?[{type:"tpl",tpl:"${count} 个项目"},{type:"reload",align:"right",className:"bg-white p-2 rounded border-gray-300 text-gray-500"}]:["bulkActions",{type:"columns-toggler",className:"hidden"},{type:"tpl",tpl:"${count} 个项目"},{type:"reload",align:"right",className:"bg-white p-2 rounded border-gray-300 text-gray-500"},{label:"",icon:"fa fa-search",type:"button",align:"right",className:"bg-white p-2 rounded border-gray-300 text-gray-500",onEvent:{click:{actions:[{actionType:"custom",script:`
       const scope = event.context.scoped;
       const filterForm = scope.getComponents().find(function(n){
         return n.props.type === "form";
@@ -66810,10 +66810,11 @@ const getBuilderContext=()=>"undefined"==typeof window?{}:Builder.settings.conte
                     }
                 }
                 return payload;
-            `,headers:{Authorization:"Bearer ${context.tenantId},${context.authToken}"}}};return e.multiple&&(t.multiple=!0,t.joinValues=!1,t.extractValue=!0),t},getAmisFileSchema=(e,t)=>(t?getAmisFileReadonlySchema:getAmisFileEditSchema)(e);async function getTableColumns(e,t){var a=[{name:"_index",type:"text",width:32,placeholder:""}];for(const r of e)if(!r.is_name&&r.name!==t.labelFieldName||"cms_files"!==t.objectName)if("toggle"===r.type)a.push({type:"switch",name:r.name,label:r.label,width:r.width,toggled:r.toggled,disabled:!0,className:"whitespace-nowrap"});else if("avatar"===r.type||"image"===r.type||"file"===r.type)a.push({type:"switch",name:r.name,label:r.label,width:r.width,toggled:r.toggled,disabled:!0,className:"whitespace-nowrap",...getAmisFileReadonlySchema(r)});else {var i=await getFieldTpl(r,t);let e="text";i?e="tpl":"html"===r.type&&(e="markdown"),r.hidden||r.extra||a.push({name:r.name,label:r.label,sortable:r.sortable,width:r.width,type:e,tpl:i,toggled:r.toggled,className:"textarea"===r.type?"w-56 whitespace-pre-wrap textarea":"whitespace-nowrap",html:"html"===r.type||null});}else a.push({type:"button",className:"whitespace-nowrap",label:`<%=data.versions ? data.name : "${r.label}"%>`,type:"button",actionType:"ajax",api:{url:"${context.rootUrl}/api/files/files/${versions[0]}?download=true",method:"get",headers:{Authorization:"Bearer ${context.tenantId},${context.authToken}"},responseType:"blob",dataType:"form-data"},id:"u:6c8291d1029f",level:"link"});return a}function getDefaultParams(e){return {perPage:e.top||e.perPage||config.listView.perPage}}function getButtonVisibleOn(e){let t=e.visible;if(e._visible&&(t=e._visible),t=lodash.exports.isBoolean(t)?t.toString():t)return t.trim().startsWith("function")?t+"(objectName, _id, recordPermissions, data)":t;if("amis_button"===e.type){e=e.amis_schema;if(e&&e.body&&0<e.body.length)return e.body[0].visibleOn}}async function getTableOperation(e){e=e.buttons;const t=[];if(lodash.exports.each(e,e=>{lodash.exports.isBoolean(e.visible)&&(e.visible=e.visible.toString()),t.push({type:"steedos-object-button",name:e.name,objectName:e.objectName,visibleOn:getButtonVisibleOn(e),className:"antd-Button--default"});}),!(t.length<1))return {type:"operation",label:"操作",fixed:"right",labelClassName:"text-center",className:"text-center steedos-listview-operation w-20",buttons:[{type:"steedos-dropdown-button",label:"xxx",buttons:t,placement:"bottomRight",overlayClassName:"shadow !min-w-[160px]",trigger:["click"],id:"u:c2140a365019",onOpenApi:{url:"${context.rootUrl}/service/api/@${objectName}/recordPermissions/${_id}",method:"get",data:{$:"$$",objectName:"${objectName}",listViewId:"${listViewId}",appId:"${appId}",formFactor:"${formFactor}",context:"${context}"},responseData:{recordPermissions:"$$"},headers:{Authorization:"Bearer ${context.tenantId},${context.authToken}"},adaptor:`
+            `,headers:{Authorization:"Bearer ${context.tenantId},${context.authToken}"}}};return e.multiple&&(t.multiple=!0,t.joinValues=!1,t.extractValue=!0),t},getAmisFileSchema=(e,t)=>(t?getAmisFileReadonlySchema:getAmisFileEditSchema)(e);async function getTableColumns(e,t){var a=[{name:"_index",type:"text",width:32,placeholder:""}];for(const r of e)if(!r.is_name&&r.name!==t.labelFieldName||"cms_files"!==t.objectName)if("toggle"===r.type)a.push({type:"switch",name:r.name,label:r.label,width:r.width,toggled:r.toggled,disabled:!0,className:"whitespace-nowrap"});else if("avatar"===r.type||"image"===r.type||"file"===r.type)a.push({type:"switch",name:r.name,label:r.label,width:r.width,toggled:r.toggled,disabled:!0,className:"whitespace-nowrap",...getAmisFileReadonlySchema(r)});else {var i=await getFieldTpl(r,t);let e="text";i?e="tpl":"html"===r.type&&(e="markdown"),r.hidden||r.extra||a.push({name:r.name,label:r.label,sortable:r.sortable,width:r.width,type:e,tpl:i,toggled:r.toggled,className:"textarea"===r.type?"min-w-56 whitespace-pre-wrap textarea":"whitespace-nowrap",html:"html"===r.type||null});}else a.push({type:"button",className:"whitespace-nowrap",label:`<%=data.versions ? data.name : "${r.label}"%>`,type:"button",actionType:"ajax",api:{url:"${context.rootUrl}/api/files/files/${versions[0]}?download=true",method:"get",headers:{Authorization:"Bearer ${context.tenantId},${context.authToken}"},responseType:"blob",dataType:"form-data"},id:"u:6c8291d1029f",level:"link"});return a}function getDefaultParams(e){return {perPage:e.top||e.perPage||config.listView.perPage}}function getButtonVisibleOn(e){let t=e.visible;if(e._visible&&(t=e._visible),t=lodash.exports.isBoolean(t)?t.toString():t)return t.trim().startsWith("function")?t+"(objectName, _id, recordPermissions, data)":t;if("amis_button"===e.type){e=e.amis_schema;if(e&&e.body&&0<e.body.length)return e.body[0].visibleOn}}async function getTableOperation(e){e=e.buttons;const t=[];if(lodash.exports.each(e,e=>{lodash.exports.isBoolean(e.visible)&&(e.visible=e.visible.toString()),t.push({type:"steedos-object-button",name:e.name,objectName:e.objectName,visibleOn:getButtonVisibleOn(e),className:"antd-Button--default"});}),!(t.length<1))return {type:"operation",label:"操作",fixed:"right",labelClassName:"text-center",className:"text-center steedos-listview-operation w-20",buttons:[{type:"steedos-dropdown-button",label:"xxx",buttons:t,placement:"bottomRight",overlayClassName:"shadow !min-w-[160px]",trigger:["click"],id:"u:c2140a365019",onOpenApi:{url:"${context.rootUrl}/service/api/@${objectName}/recordPermissions/${_id}",method:"get",data:{$:"$$",objectName:"${objectName}",listViewId:"${listViewId}",appId:"${appId}",formFactor:"${formFactor}",context:"${context}"},responseData:{recordPermissions:"$$"},headers:{Authorization:"Bearer ${context.tenantId},${context.authToken}"},adaptor:`
                         payload.recordPermissions = payload;
                         return payload;
-                    `}}]}}async function getTableSchema$1(e,t){e=await getTableColumns(e,t=t||{});return e.push(await getTableOperation(t)),{mode:"table",name:"thelist",headerToolbarClassName:"py-2 px-0",className:"",draggable:!1,defaultParams:getDefaultParams(t),columns:e,syncLocation:!1,keepItemSelectionOnPageChange:!0,checkOnItemClick:!1,labelTpl:`\${${t.labelFieldName}}`,autoFillHeight:!1}}async function getSource(e){var t=await getFindQuery({name:"organizations"},null,[{name:"_id",alias:"value"},{name:"name",alias:"label"},{name:"children"}],{alias:"leftOptions",filters:"{__filters}"}),a=(t.query=t.query.replace(/,count\:.+/,"}"),await getFindQuery({name:"organizations"},null,[{name:"_id",alias:"ref"}],{alias:"children",filters:"{__filters}"})),a=(a.query=a.query.replace(/,count\:.+/,"}"),t.query=t.query.replace(/}$/,","+a.query.replace(/{(.+)}/,"$1}")),await getFindQuery({name:"space_users"},null,[{name:"user"},{name:"name"}],{alias:"defaultValueOptions",filters:"{__options_filters}"})),a=(a.query=a.query.replace(/,count\:.+/,"}"),t.query=t.query.replace(/}$/,","+a.query.replace(/{(.+)}/,"$1}")),t.$value="$"+e.name,`
+                    `}}]}}async function getTableSchema$1(e,t){e=await getTableColumns(e,t=t||{});return e.push(await getTableOperation(t)),{mode:"table",name:"thelist",headerToolbarClassName:"py-2 px-0",className:"",draggable:!1,defaultParams:getDefaultParams(t),columns:e,syncLocation:!1,keepItemSelectionOnPageChange:!0,checkOnItemClick:!1,labelTpl:`\${${t.labelFieldName}}`,autoFillHeight:!1}}const refUsersObjectName="space_users",refOrgsObjectName="organizations";async function getSource(e,t){var a=await getFindQuery({name:refOrgsObjectName},null,[{name:"_id",alias:"value"},{name:"name",alias:"label"},{name:"children"}],{alias:"leftOptions",filters:"{__filters}"}),i=(a.query=a.query.replace(/,count\:.+/,"}"),await getFindQuery({name:refOrgsObjectName},null,[{name:"_id",alias:"ref"}],{alias:"children",filters:"{__filters}"})),i=(i.query=i.query.replace(/,count\:.+/,"}"),a.query=a.query.replace(/}$/,","+i.query.replace(/{(.+)}/,"$1}")),await getFindQuery({name:refUsersObjectName},null,[{name:"user"},{name:"name"}],{alias:"defaultValueOptions",filters:"{__options_filters}"}));i.query=i.query.replace(/,count\:.+/,"}"),a.query=a.query.replace(/}$/,","+i.query.replace(/{(.+)}/,"$1}"));let r=""+e.name;t.fieldNamePrefix&&(r=""+t.fieldNamePrefix+e.name),a.$value="$"+r,a.__selectUserLoaded__="${__selectUserLoaded__}";i=`
+        console.log("select user field '${e.name}' requestAdaptor api:", api);
         var filters = [['parent', '=', null]];
         api.data.query = api.data.query.replace(/{__filters}/g, JSON.stringify(filters));
         var defaultValue = api.data.$value;
@@ -66824,7 +66825,7 @@ const getBuilderContext=()=>"undefined"==typeof window?{}:Builder.settings.conte
         }
         api.data.query = api.data.query.replace(/{__options_filters}/g, JSON.stringify(optionsFilters));
         return api;
-    `);return {method:"post",url:getApi$2()+"?_id=${_id}",requestAdaptor:a,adaptor:`
+    `;return {method:"post",url:getApi$2()+`?value=\${${e.multiple?r+"|join":r}}`,requestAdaptor:i,adaptor:`
         const data = payload.data;
         data.children = data.children.map(function (child) { 
             // child.defer = !!(child.children && child.children.length);
@@ -66842,30 +66843,33 @@ const getBuilderContext=()=>"undefined"==typeof window?{}:Builder.settings.conte
         delete data.defaultValueOptions;
         payload.data = { options: [data] };
         return payload;
-    `,data:t,sendOn:"!!this._id || !!!this."+e.name,headers:{Authorization:"Bearer ${context.tenantId},${context.authToken}"}}}async function getDeferApi(e){var t=await getFindQuery({name:"{__object_name}"},null,[],{alias:"options",filters:"{__filters}"});let a=e.filters;"function"==typeof(a="string"==typeof a?(a=new Function("return "+a))():a)&&(a=a(e)),t.query=t.query.replace(/,count\:.+/,"}"),t.query=t.query.replace("{_id}","{{__fields}}");e=`
+    `,data:a,sendOn:"!this.__selectUserLoaded__",headers:{Authorization:"Bearer ${context.tenantId},${context.authToken}"}}}async function getDeferApi(e,t){var a=await getFindQuery({name:"{__object_name}"},null,[],{alias:"options",queryOptions:'filters: {__filters}, sort: "{__sort}"'});let i=e.filters;"function"==typeof(i="string"==typeof i?(i=new Function("return "+i))():i)&&(i=i(e)),a.query=a.query.replace(/,count\:.+/,"}"),a.query=a.query.replace("{_id}","{{__fields}}");e=`
         var dep = api.query.dep;
         var ref = api.query.ref;
         var term = api.query.term;
         var filters;
         var objectName;
         var fields;
+        var sort = "";
         if (dep) {
-            objectName = "organizations";
+            objectName = "${refOrgsObjectName}";
             fields = "value:_id,label:name,children";
             filters = [['parent', '=', dep]];
+            sort = "${t.orgsSort}";
         }
         else if (ref) { 
-            objectName = "space_users";
+            objectName = "${refUsersObjectName}";
             // 这里要额外把字段转为value和label是因为valueField和labelField在deferApi/searchApi中不生效，所以字段要取两次
             fields = "user,name,value:user,label:name";
             filters = [['user_accepted', '=', true]];
-            var defaultFilters = ${a&&JSON.stringify(a)};
+            var defaultFilters = ${i&&JSON.stringify(i)};
             if(defaultFilters){
                 filters.push(defaultFilters);
             }
             filters.push(['organizations_parents', '=', ref]);
+            sort = "${t.usersSort}";
         }
-        api.data.query = api.data.query.replace(/{__object_name}/g, objectName).replace(/{__fields}/g, fields).replace(/{__filters}/g, JSON.stringify(filters));
+        api.data.query = api.data.query.replace(/{__object_name}/g, objectName).replace(/{__fields}/g, fields).replace(/{__filters}/g, JSON.stringify(filters)).replace('{__sort}', sort.trim());
         return api;
     `;return {method:"post",url:getApi$2()+"?ref=${ref}&dep=${value}",requestAdaptor:e,adaptor:`
         if (api.query.dep) {
@@ -66879,9 +66883,10 @@ const getBuilderContext=()=>"undefined"==typeof window?{}:Builder.settings.conte
             payload.data = data;
         }
         return payload;
-    `,data:t,headers:{Authorization:"Bearer ${context.tenantId},${context.authToken}"}}}async function getSearchApi(e){var t=await getFindQuery({name:"space_users"},null,[{name:"user"},{name:"name"},{name:"user",alias:"value"},{name:"name",alias:"label"}],{alias:"options",filters:"{__filters}"}),e=(t.query=t.query.replace(/,count\:.+/,"}"),e.filters),e=`
+    `,data:a,headers:{Authorization:"Bearer ${context.tenantId},${context.authToken}"}}}async function getSearchApi(e,t){var a=await getFindQuery({name:refUsersObjectName},null,[{name:"user"},{name:"name"},{name:"user",alias:"value"},{name:"name",alias:"label"}],{alias:"options",queryOptions:'filters: {__filters}, sort: "{__sort}"'}),e=(a.query=a.query.replace(/,count\:.+/,"}"),e.filters),e=`
         var term = api.query.term;
         var filters;
+        var sort = "";
         if (term) { 
             filters = [['user_accepted', '=', true]];
             var defaultFilters = ${e&&JSON.stringify(e)};
@@ -66896,10 +66901,26 @@ const getBuilderContext=()=>"undefined"==typeof window?{}:Builder.settings.conte
             });
             termFilters.pop();
             filters.push(termFilters);
+            sort = "${t.usersSort}";
         }
-        api.data.query = api.data.query.replace(/{__filters}/g, JSON.stringify(filters));
+        api.data.query = api.data.query.replace(/{__filters}/g, JSON.stringify(filters)).replace('{__sort}', sort.trim());
         return api;
-    `;return {method:"post",url:getApi$2()+"?term=${term}",requestAdaptor:e,data:t,headers:{Authorization:"Bearer ${context.tenantId},${context.authToken}"}}}async function getSelectUserSchema(e,t,a){if(!e)return {};a=a||{};var i={type:getAmisStaticFieldType("select",t)};return t?i.tpl=await getLookupTpl(e,a):(Object.assign(i,{labelField:"name",valueField:"user",multiple:e.multiple,searchable:e.searchable,selectMode:"associated",leftMode:"tree",joinValues:!1,extractValue:!0,clearable:!0,source:await getSource(e),deferApi:await getDeferApi(e),searchApi:await getSearchApi(e)}),!_.has(e,"defaultValue")||_.isString(e.defaultValue)&&e.defaultValue.startsWith("{")||(i.value=e.defaultValue),"boolean"!=typeof i.searchable&&(i.searchable=!0),(t=e.onEvent)&&(i.onEvent=t)),i}const getReferenceTo=async a=>{let i=a.reference_to;if(i){"users"===i&&(i="space_users",a.reference_to_field="user");var r=await getUISchema(i);let e=null,t=a.reference_to_field;return t=t||r.idFieldName||"_id",e="_id"===t?{name:"_id",label:"ID",type:"text",toggled:!1}:r.fields[t]||{name:t},{objectName:i,valueField:e,labelField:r.fields[r.NAME_FIELD_KEY||"name"]}}};async function lookupToAmisPicker(i,r,l){var s=await getReferenceTo(i);if(s){const d=await getUISchema(s.objectName),c=[];let e=0;const p=[],m=[];var o=lodash.exports.find(d.list_views,(e,t)=>"all"===t);o&&o.columns?lodash.exports.each(o.columns,function(e){lodash.exports.isString(e)&&d.fields[e]?m.push(d.fields[e]):lodash.exports.isObject(e)&&d.fields[e.field]&&m.push(Object.assign({},d.fields[e.field],{width:e.width,wrap:e.wrap}));}):lodash.exports.each(d.fields,(e,t)=>{"_id"==t||e.hidden||(lodash.exports.has(e,"name")||(e.name=t),m.push(e));}),lodash.exports.each(lodash.exports.sortBy(m,"sort_no"),function(t){e<5&&(lodash.exports.find(c,function(e){return e.name===t.name})||(e++,c.push(t),t.searchable&&p.push(t.name)));});const u={[s.labelField.name]:s.labelField,[s.valueField.name]:s.valueField};lodash.exports.each(c,e=>{e.hidden||(u[e.name]=e);});o=await getApi(d,null,u,{expand:!0,alias:"rows",queryOptions:'filters: {__filters}, top: {__top}, skip: {__skip}, sort: "{__sort}"'});o.data.$term="$term",o.data.$self="$$",o.requestAdaptor=`
+    `;return {method:"post",url:getApi$2()+"?term=${term}",requestAdaptor:e,data:a,headers:{Authorization:"Bearer ${context.tenantId},${context.authToken}"}}}function getRefListViewSort(e){e=lodash.exports.find(e.list_views,(e,t)=>"all"===t);let t="";return t=e?getListViewSort(e):t}async function getSelectUserSchema(t,a,i){if(!t)return {};i=i||{};var r={type:getAmisStaticFieldType("select",a)};if(a)r.tpl=await getLookupTpl(t,i);else {a=await getUISchema(refUsersObjectName),a=(i.usersSort=getRefListViewSort(a),await getUISchema(refOrgsObjectName));i.orgsSort=getRefListViewSort(a),Object.assign(r,{labelField:"name",valueField:"user",multiple:t.multiple,searchable:t.searchable,selectMode:"associated",leftMode:"tree",extractValue:!0,clearable:!0,source:await getSource(t,i),deferApi:await getDeferApi(t,i),searchApi:await getSearchApi(t,i)}),t.multiple&&Object.assign(r,{joinValues:!1});let e=t.defaultValue;!lodash.exports.has(t,"defaultValue")||lodash.exports.isString(e)&&e.startsWith("{")||(lodash.exports.isString(e)&&e.startsWith("{{")&&(e="$"+e.substring(1,e.length-1)),r.value=e),"boolean"!=typeof r.searchable&&(r.searchable=!0);a=t.onEvent,i=(a&&(r.onEvent=a),{actionType:"custom",script:`
+            // 往上找到form，设置__selectUserLoaded__标记已经加载过选人字段不能再调用source接口初始化选人组件了
+            const getClosestAmisComponentByType = function(scope, type){
+                const re = scope.getComponents().find(function(n){
+                    return n.props.type === type;
+                });
+                if(re){
+                    return re;
+                }
+                else{
+                    return getClosestAmisComponentByType(scope.parent, type);
+                }
+            }
+            const form = getClosestAmisComponentByType(event.context.scoped, "form");
+            form.setData({"__selectUserLoaded__":true});
+        `});r.onEvent?r.onEvent.change?.actions?.length?r.onEvent.change.actions.unshift(i):r.onEvent.change={weight:0,actions:[i]}:Object.assign(r,{onEvent:{change:{weight:0,actions:[i]}}});}return r}const getReferenceTo=async a=>{let i=a.reference_to;if(i){"users"===i&&(i="space_users",a.reference_to_field="user");var r=await getUISchema(i);let e=null,t=a.reference_to_field;return t=t||r.idFieldName||"_id",e="_id"===t?{name:"_id",label:"ID",type:"text",toggled:!1}:r.fields[t]||{name:t},{objectName:i,valueField:e,labelField:r.fields[r.NAME_FIELD_KEY||"name"],NAME_FIELD_KEY:r.NAME_FIELD_KEY||"name"}}};async function lookupToAmisPicker(r,l,s){var o=await getReferenceTo(r);if(o){const c=await getUISchema(o.objectName),p=[];let e=0;const m=[],u=[];var n=lodash.exports.find(c.list_views,(e,t)=>"all"===t);n&&n.columns?lodash.exports.each(n.columns,function(e){lodash.exports.isString(e)&&c.fields[e]?u.push(c.fields[e]):lodash.exports.isObject(e)&&c.fields[e.field]&&u.push(Object.assign({},c.fields[e.field],{width:e.width,wrap:e.wrap}));}):lodash.exports.each(c.fields,(e,t)=>{"_id"==t||e.hidden||(lodash.exports.has(e,"name")||(e.name=t),u.push(e));}),lodash.exports.each(lodash.exports.sortBy(u,"sort_no"),function(t){e<5&&(lodash.exports.find(p,function(e){return e.name===t.name})||(e++,p.push(t),t.searchable&&m.push(t.name)));});const f={[o.labelField.name]:o.labelField,[o.valueField.name]:o.valueField};lodash.exports.each(p,e=>{e.hidden||(f[e.name]=e);});let t="";n&&(t=getListViewSort(n));n=await getApi(c,null,f,{expand:!0,alias:"rows",queryOptions:'filters: {__filters}, top: {__top}, skip: {__skip}, sort: "{__sort}"'});if(n.url){const g=[],y=[];lodash.exports.each(r.depend_on,e=>{g.push(`depend_on_${e}=\${${e}}`),y.push("this."+e);}),0<g.length&&(n.url=n.url+"?"+g.join("&"),n.sendOn=""+y.join(" && "));}n.data.$term="$term",n.data.$self="$$",n.requestAdaptor=`
         const selfData = JSON.parse(JSON.stringify(api.data.$self));
         var filters = [];
         var pageSize = api.data.pageSize || 10;
@@ -66908,14 +66929,15 @@ const getBuilderContext=()=>"undefined"==typeof window?{}:Builder.settings.conte
         var orderBy = api.data.orderBy || '';
         var orderDir = api.data.orderDir || '';
         var sort = orderBy + ' ' + orderDir;
-        var allowSearchFields = ${JSON.stringify(p)};
+        sort = orderBy ? sort : "${t}";
+        var allowSearchFields = ${JSON.stringify(m)};
         if(api.data.$term){
             filters = [["name", "contains", "'+ api.data.$term +'"]];
         }else if(selfData.op === 'loadOptions' && selfData.value){
             if(selfData.value?.indexOf(',') > 0){
-                filters = [["${s.valueField.name}", "=", selfData.value.split(',')]];
+                filters = [["${o.valueField.name}", "=", selfData.value.split(',')]];
             }else{
-                filters = [["${s.valueField.name}", "=", selfData.value]];
+                filters = [["${o.valueField.name}", "=", selfData.value]];
             }
         }
 
@@ -66951,7 +66973,7 @@ const getBuilderContext=()=>"undefined"==typeof window?{}:Builder.settings.conte
             })
         }
 
-        const filtersFunction = ${i._filtersFunction};
+        const filtersFunction = ${r._filtersFunction};
 
         if(filtersFunction){
             const _filters = filtersFunction(filters, api.data.$self.__super.__super);
@@ -66962,8 +66984,8 @@ const getBuilderContext=()=>"undefined"==typeof window?{}:Builder.settings.conte
 
         api.data.query = api.data.query.replace(/{__filters}/g, JSON.stringify(filters)).replace('{__top}', pageSize).replace('{__skip}', skip).replace('{__sort}', sort.trim());
         return api;
-    `,o.adaptor=`
-    const enable_tree = ${d.enable_tree};
+    `,n.adaptor=`
+    const enable_tree = ${c.enable_tree};
     if(enable_tree){
         const records = payload.data.rows;
         const treeRecords = [];
@@ -66990,54 +67012,30 @@ const getBuilderContext=()=>"undefined"==typeof window?{}:Builder.settings.conte
         payload.data.rows = treeRecords;
     }
     return payload;
-    `;let t=20,a=(d.paging&&!1===d.paging.enabled&&(t=1e3),null);"SMALL"===l.formFactor?a=await getListSchema$1(c,{top:t,...l,actions:!1}):((a=await getTableSchema$1(c,{labelFieldName:d.NAME_FIELD_KEY,top:t,...l})).headerToolbar=getObjectHeaderToolbar(d,l.formFactor),a.footerToolbar=getObjectFooterToolbar(),!1!==l.filterVisible&&(n=l.filterLoopCount||0,n++,a.filter=await getObjectFilter(d,u,{isLookup:!0,...l,filterLoopCount:n})),a.data=Object.assign({},a.data,{"&":"$$",objectName:d.name,uiSchema:d,listName:"all",isLookup:!0}));var n={type:getAmisStaticFieldType("picker",r),labelField:s.labelField.name,valueField:s.valueField.name,modalMode:"dialog",source:o,size:"lg",pickerSchema:a,joinValues:!1,extractValue:!0};return i.multiple&&(n.multiple=!0,n.extractValue=!0),r&&(n.tpl=await getLookupTpl(i,l)),n}}async function lookupToAmisSelect(e,t,a){var i=await getReferenceTo(e);let r;(r=i?await getApi({name:i.objectName},null,{[i.labelField.name]:Object.assign({},i.labelField,{alias:"label"}),[i.valueField.name]:Object.assign({},i.valueField,{alias:"value"})},{expand:!1,alias:"options",queryOptions:"filters: {__filters}, top: {__top}"}):{method:"post",url:getApi$2(),data:{query:'{objects(filters: ["_id", "=", "-1"]){_id}}',$:"$$"}}).data.$term="$term",r.data.$value=`$${e.name}.`+(i?i.valueField.name:"_id"),lodash.exports.each(e.depend_on,function(e){r.data[e]="$"+e;}),r.data.$="$$",r.data.rfield="${object_name}",r.requestAdaptor=`
-        var filters = '[]';
+    `;let a=20,i=(c.paging&&!1===c.paging.enabled&&(a=1e3),null);"SMALL"===s.formFactor?i=await getListSchema$1(p,{top:a,...s,actions:!1}):((i=await getTableSchema$1(p,{labelFieldName:c.NAME_FIELD_KEY,top:a,...s})).headerToolbar=getObjectHeaderToolbar(c,s.formFactor),i.footerToolbar=getObjectFooterToolbar(),!1!==s.filterVisible&&(d=s.filterLoopCount||0,d++,i.filter=await getObjectFilter(c,f,{isLookup:!0,...s,filterLoopCount:d})),i.data=Object.assign({},i.data,{"&":"$$",objectName:c.name,uiSchema:c,listName:"all",isLookup:!0}));var d={type:getAmisStaticFieldType("picker",l),labelField:o.labelField.name,valueField:o.valueField.name,modalMode:"dialog",source:n,size:"lg",pickerSchema:i,joinValues:!1,extractValue:!0};return r.multiple&&(d.multiple=!0,d.extractValue=!0),l&&(d.tpl=await getLookupTpl(r,s)),d}}async function lookupToAmisSelect(e,t,a){var i=await getReferenceTo(e);let r;r=i?await getApi({name:i.objectName},null,{[i.labelField.name]:Object.assign({},i.labelField,{alias:"label"}),[i.valueField.name]:Object.assign({},i.valueField,{alias:"value"})},{expand:!1,alias:"options",queryOptions:'filters: {__filters}, top: {__top}, sort: "{__sort}"'}):{method:"post",url:getApi$2(),data:{query:'{objects(filters: ["_id", "=", "-1"]){_id}}',$:"$$"}};var l=i&&await getUISchema(i.objectName),l=l&&lodash.exports.find(l.list_views,(e,t)=>"all"===t);let s="";if(l&&(s=getListViewSort(l)),r.url){const n=[],d=[];lodash.exports.each(e.depend_on,e=>{n.push(`depend_on_${e}=\${${e}}`),d.push("this."+e);}),0<n.length&&(r.url=r.url+"?"+n.join("&"),r.sendOn=""+d.join(" && "));}r.data.$term="$term",r.data.$value=`$${e.name}.`+(i?i.valueField.name:"_id"),lodash.exports.each(e.depend_on,function(e){r.data[e]="$"+e;}),r.data.$="$$",r.data.rfield="${object_name}",r.requestAdaptor=`
+        var filters = [];
         var top = 10;
         if(api.data.$term){
-            filters = '["name", "contains", "'+ api.data.$term +'"]';
+            filters = [["${i?.NAME_FIELD_KEY||"name"}", "contains", api.data.$term]];
         }else if(api.data.$value){
-            filters = '["_id", "=", "'+ api.data.$value +'"]';
+            filters = [["_id", "=", api.data.$value]];
+        }
+
+        const filtersFunction = ${e._filtersFunction};
+
+        if(filtersFunction){
+            const _filters = filtersFunction(filters, api.data.$);
+            if(_filters && _filters.length > 0){
+                filters.push(_filters);
+            }
         }
-        api.data.query = api.data.query.replace(/{__filters}/g, filters).replace('{__top}', top);
+        var sort = "${s}";
+        api.data.query = api.data.query.replace(/{__filters}/g, JSON.stringify(filters)).replace('{__top}', top).replace('{__sort}', sort.trim());
         return api;
     `,i&&i.labelField.name,i&&i.valueField.name,e._optionsFunction&&(r.adaptor=`
         payload.data.options = eval(${e._optionsFunction})(api.data);
         return payload;
-        `);i={type:getAmisStaticFieldType("select",t),joinValues:!1,extractValue:!0,autoComplete:r};return !lodash.exports.has(e,"defaultValue")||lodash.exports.isString(e.defaultValue)&&e.defaultValue.startsWith("{")||(i.value=e.defaultValue),e.multiple&&(i.multiple=!0,i.extractValue=!0),t&&(i.tpl=await getLookupTpl(e,a)),i}async function getApi(e,t,a,i){e=await getFindQuery(e,t,a,i);return {method:"post",url:getApi$2(),data:e,headers:{Authorization:"Bearer ${context.tenantId},${context.authToken}"}}}async function lookupToAmis(e,t,a){var i,r;return t?{type:getAmisStaticFieldType("picker",t),tpl:getRelatedFieldTpl(e,a)}:!e.reference_to||lodash.exports.isString(e.reference_to)||t?((i=await getReferenceTo(e))?(r=await getUISchema(i.objectName),"space_users"===i.objectName?lookupToAmisSelectUser:1==r.enable_enhanced_lookup?lookupToAmisPicker:lookupToAmisSelect):lookupToAmisSelect)(e,t,a):{type:"steedos-field-lookup",field:e,readonly:t,ctx:{}}}async function lookupToAmisSelectUser(e,t,a){return getSelectUserSchema(e,t,a)}const OMIT_FIELDS=["created","created_by","modified","modified_by"];function getBaseFields(e){let t="m-1";return [{name:"createdInfo",label:"创建人",type:"static",labelClassName:"text-left",className:t=e?""+t:t,tpl:getCreatedInfoTpl()},{name:"modifiedInfo",label:"修改人",type:"static",labelClassName:"text-left",className:t,tpl:getModifiedInfoTpl()}]}function getAmisFieldType(e){switch(e.type){case"text":return "text";case"textarea":return "textarea";case"html":return "html";case"select":return "select";case"boolean":return "checkbox";case"date":return "date";case"datetime":return "datetime";case"number":case"currency":case"percent":return "number";case"password":return "password";case"lookup":return "select";case"master_detail":return "picker";case"autonumber":return "text";case"url":return "url";case"email":return "email";case"image":return "image";case"formula":case"summary":break;case"grid":return "table";default:console.log("convertData default",e.type);}}function getObjectFieldSubFields(t,e){var a=Object.assign({subFields:[]},t),e=lodash.exports.filter(e,function(e){return e.name.startsWith(t.name+".")});return a.subFields=e,a}function getGridFieldSubFields(t,e){var a=Object.assign({subFields:[]},t),e=lodash.exports.filter(e,function(e){return e.name.startsWith(t.name+".")});return a.subFields=e,a}function getPermissionFields(e,t){const a=[],i=[];return lodash.exports.each(e.fields,(e,t)=>{lodash.exports.has(e,"name")||(e.name=t),i.push(e);}),lodash.exports.each(lodash.exports.sortBy(i,"sort_no"),function(e){e.hidden||a.push(Object.assign({},e,{permission:{allowEdit:!0}}));}),a}function getSelectFieldOptions(e){const t=e.data_type||"text",a=[];return lodash.exports.each(e.options,e=>{switch(t){case"number":a.push({label:e.label,value:Number(e.value)});break;case"text":a.push({label:e.label,value:String(e.value)});break;case"boolean":a.push({label:e.label,value:"false"!==e.value});}}),a}async function convertSFieldToAmisField(r,l,e){if(!lodash.exports.includes(OMIT_FIELDS,r.name)||1==e.showSystemFields){var t,a={name:e.fieldNamePrefix?""+e.fieldNamePrefix+r.name:r.name,label:r.label,labelRemark:r.inlineHelpText,required:(lodash.exports.has(e,"required")?e:r).required};let i={};switch(r.type){case"text":i.type=getAmisStaticFieldType("text",l);break;case"textarea":i.type=getAmisStaticFieldType("textarea",l),i.tpl=`<b><%=data.${r.name}%></b>`;break;case"html":i={type:"editor",language:"html",value:r.defaultValue||""};break;case"select":i={type:getAmisStaticFieldType("select",l),joinValues:!1,options:getSelectFieldOptions(r),extractValue:!0,clearable:!0,labelField:"label",valueField:"value",tpl:l?getSelectTpl(r):null},!lodash.exports.has(r,"defaultValue")||lodash.exports.isString(r.defaultValue)&&r.defaultValue.startsWith("{")||(t=r.data_type||"text",null!=r.defaultValue&&("text"===t?i.value=String(r.defaultValue):"number"===t?i.value=Number(r.defaultValue):"boolean"===t&&(i.value="false"!==r.defaultValue))),r.multiple&&(i.multiple=!0,i.extractValue=!0);break;case"boolean":i={type:getAmisStaticFieldType("checkbox",l),option:r.inlineHelpText,tpl:l?getSwitchTpl(r):null};break;case"input-date-range":i={type:"input-date-range",inputFormat:"YYYY-MM-DD",format:"YYYY-MM-DDT00:00:00.000[Z]",tpl:l?getDateTpl(r):null};break;case"date":i={type:getAmisStaticFieldType("date",l),inputFormat:"YYYY-MM-DD",format:"YYYY-MM-DDT00:00:00.000[Z]",tpl:l?getDateTpl(r):null};break;case"input-datetime-range":i={type:"input-datetime-range",inputFormat:"YYYY-MM-DD HH:mm",format:"YYYY-MM-DDTHH:mm:ss.SSS[Z]",tpl:l?getDateTimeTpl(r):null,utc:!0};break;case"datetime":i={type:getAmisStaticFieldType("datetime",l),inputFormat:"YYYY-MM-DD HH:mm",format:"YYYY-MM-DDTHH:mm:ss.SSS[Z]",tpl:l?getDateTimeTpl(r):null,utc:!0};break;case"input-time-range":i={type:"input-time-range",inputFormat:"HH:mm",timeFormat:"1970-01-01THH:mm:00.000[Z]",format:"1970-01-01THH:mm:00.000[Z]",tpl:l?getDateTimeTpl(r):null};break;case"time":i={type:getAmisStaticFieldType("time",l),inputFormat:"HH:mm",timeFormat:"1970-01-01THH:mm:00.000[Z]",format:"1970-01-01THH:mm:00.000[Z]",tpl:l?getDateTimeTpl(r):null};break;case"currency":case"number":i=l?{type:"static-tpl",tpl:getNumberTpl(r)}:{type:getAmisStaticFieldType("number",l),min:r.min,max:r.max,precision:r.scale};break;case"input-array":i=Object.assign({},r,a);break;case"input-range":i={type:"input-range",min:r.min,max:r.max,value:[0,0],multiple:!0,showInput:!0};break;case"percent":i={type:getAmisStaticFieldType("number",l),min:r.min,max:r.max,precision:r.scale};break;case"password":i={type:getAmisStaticFieldType("password",l),tpl:l?getPasswordTpl(r):null};break;case"lookup":case"master_detail":i=await lookupToAmis(r,l,e);break;case"autonumber":l&&(i={type:"static-text"});break;case"url":i={type:getAmisStaticFieldType("url",l)};break;case"email":i={type:getAmisStaticFieldType("email",l)};break;case"avatar":case"image":case"file":i=getAmisFileSchema(r,l);break;case"formula":case"summary":l&&(i.type=getAmisStaticFieldType(r.data_type,l));break;case"code":i={type:"editor",language:r.language,value:r.defaultValue||""};break;case"toggle":i={type:"switch",name:r.name,label:r.label,width:r.width,toggled:r.toggled,disabled:l};break;case"grid":i={type:"input-table",strictMode:!1,affixHeader:!1,editable:!l,addable:!l,removable:!l,draggable:!l,columns:[]},lodash.exports.each(r.subFields,function(e){var t=e.name.replace(r.name+".$.","").replace(r.name+".",""),a=convertSFieldToAmisField(Object.assign({},e,{name:t}),l);a&&(delete a.name,delete a.label,i.columns.push({name:t,label:e.label,quickEdit:!l&&a}));});}return lodash.exports.isEmpty(i)?void 0:(r.is_wide?i.className="col-span-2 m-1":i.className="m-1",l&&(i.className=i.className+" md:border-b"),i.labelClassName="text-left",l&&(i.quickEdit=!1),r.visible_on&&(i.visibleOn="$"+r.visible_on.substring(1,r.visible_on.length-1).replace(/formData./g,"")),Object.assign({},a,i,{clearValueOnHidden:!0,fieldName:r.name}))}}async function getFieldSearchable(e,t,a){var i=a.filterLoopCount||0;let r=e,l=("grid"===r.type?r=await getGridFieldSubFields(e,t):"object"===e.type&&(r=await getObjectFieldSubFields(e,t)),"__searchable__");if(r.name.indexOf(".")<0){e=lodash.exports.cloneDeep(r),t=(lodash.exports.includes(["textarea","html","code","autonumber"],r.type)&&(e.type="text"),"number"!==r.type&&"currency"!==r.type||(e.type="input-array",e.inline=!0,e.addable=!1,e.removable=!1,e.value=[null,null],e.items={type:"input-number"},e.is_wide=!0,l+="between__"),"date"===r.type&&(e.type="input-date-range",e.is_wide=!0,l+="between__"),"datetime"===r.type&&(e.type="input-datetime-range",e.is_wide=!0,l+="between__"),"time"===r.type&&(e.type="input-time-range",e.is_wide=!0,l+="between__"),"users"===r.reference_to&&(e.reference_to="space_users",e.reference_to_field="user"),e.readonly=!1,e.disabled=!1,e.multiple=!0,e.is_wide=!1,e.defaultValue=void 0,await convertSFieldToAmisField(e,!1,Object.assign({},a,{fieldNamePrefix:l,required:!1,showSystemFields:!0,filterVisible:i<5})));if(t)return t}}Object.freeze({__proto__:null,OMIT_FIELDS:OMIT_FIELDS,getBaseFields:getBaseFields,getAmisFieldType:getAmisFieldType,getObjectFieldSubFields:getObjectFieldSubFields,getGridFieldSubFields:getGridFieldSubFields,getPermissionFields:getPermissionFields,getSelectFieldOptions:getSelectFieldOptions,convertSFieldToAmisField:convertSFieldToAmisField,getFieldSearchable:getFieldSearchable,getAmisStaticFieldType:getAmisStaticFieldType});async function getObjectFieldsFilterFormSchema(e,t,a){a=a||{};var i,r,l=[];for(i of t)lodash.exports.includes(["grid","avatar","image","object","[object]","[Object]","[grid]","[text]","audio","file"],i.type)||(delete i.defaultValue,delete i.required,delete i.is_wide,delete i.readonly,delete i.hidden,delete i.omit,(r=await getFieldSearchable(i,t,a))&&l.push(r));lodash.exports.map(l,"name"),a.enableSearchableFieldsVisibleOn&&l.forEach(function(e){e.visibleOn=`this.filterFormSearchableFields && this.filterFormSearchableFields.indexOf("${e.fieldName}") > -1`;});return {title:"",type:"form",name:"listview-filter-form",id:"listview_filter_form_"+e.name,mode:"normal",wrapWithPanel:!1,className:"sm:grid sm:gap-2 sm:grid-cols-4 mb-2",data:{"&":"${filterFormValues || {}}",...a.initData},body:l,onEvent:{broadcastSearchableFieldsChange:{actions:[{actionType:"custom",script:`
-    const data = event.data;
-    const listViewId = data.listViewId;
-    const searchableFields = data.fields;
-    const preSearchableFields = data.__super.__super.fields;
-    const removedFields = _.difference(preSearchableFields, searchableFields);
-    const listViewPropsStoreKey = location.pathname + "/crud/" + listViewId ;
-    let localListViewProps = localStorage.getItem(listViewPropsStoreKey);
-    if(localListViewProps){
-      // 当变更可搜索字段时，如果被移除的可搜索字段在本地存储中已经存入过滤条件中则应该清除本地存储中相关字段的过滤条件。
-      localListViewProps = JSON.parse(localListViewProps);
-      let removedKeys = [];
-      _.each(localListViewProps, function(n,k){
-        // __searchable__开头的不在searchableFields范围则清除其值
-        let isRemoved = !!removedFields.find(function(fieldName){
-          return new RegExp("__searchable__.*" + fieldName + "$").test(k);
-        });
-        if(isRemoved){
-          removedKeys.push(k);
-        }
-      });
-      const removedValues = {};
-      removedKeys.forEach(function(key){
-        delete localListViewProps[key];
-        removedValues[key] = "";
-      });
-      doAction({
-        actionType: 'setValue',
-        args: {
-          value: removedValues
-        }
-      });
-      localStorage.setItem(listViewPropsStoreKey, JSON.stringify(localListViewProps));
-    }
-  `}]}}}}async function getObjectFieldsFilterBarSchema(e,t,a){a=a||{};t=await getObjectFieldsFilterFormSchema(e,t,Object.assign({},{enableSearchableFieldsVisibleOn:!0},a));return {type:"service",data:{},id:"service_listview_filter_form_"+e.name,dataProvider:{inited:`
+        `);l={type:getAmisStaticFieldType("select",t),joinValues:!1,extractValue:!0,source:r,autoComplete:r,searchable:!0};let o=e.defaultValue;return !lodash.exports.has(e,"defaultValue")||lodash.exports.isString(e.defaultValue)&&e.defaultValue.startsWith("{")||(lodash.exports.isString(o)&&o.startsWith("{{")&&(o="$"+o.substring(1,o.length-1)),l.value=o),e.multiple&&(l.multiple=!0,l.extractValue=!0),t&&(l.tpl=await getLookupTpl(e,a)),l}async function getApi(e,t,a,i){e=await getFindQuery(e,t,a,i);return {method:"post",url:getApi$2(),data:e,headers:{Authorization:"Bearer ${context.tenantId},${context.authToken}"}}}async function lookupToAmis(e,t,a){var i,r;return t?{type:getAmisStaticFieldType("picker",t),tpl:getRelatedFieldTpl(e,a)}:!e.reference_to||lodash.exports.isString(e.reference_to)||t?((i=await getReferenceTo(e))?(r=await getUISchema(i.objectName),"space_users"===i.objectName?lookupToAmisSelectUser:1==r.enable_enhanced_lookup&&lodash.exports.isEmpty(e.depend_on)?lookupToAmisPicker:lookupToAmisSelect):lookupToAmisSelect)(e,t,a):{type:"steedos-field-lookup",field:e,readonly:t,ctx:{}}}async function lookupToAmisSelectUser(e,t,a){return getSelectUserSchema(e,t,a)}const getMarkdownFieldSchema=(e,t,a)=>t?{type:"markdown",name:e.name,options:{linkify:!0,html:!0,breaks:!0}}:{type:"group",body:[{type:"editor",name:e.name,language:"markdown"},{type:"markdown",name:e.name,options:{linkify:!0,html:!0,breaks:!0}}]},getHtmlFieldSchema=(e,t,a)=>t?{type:"html",name:e.name}:{type:"input-rich-text",name:e.name},OMIT_FIELDS=["created","created_by","modified","modified_by"];function getBaseFields(e){let t="m-1";return [{name:"createdInfo",label:"创建人",type:"static",labelClassName:"text-left",className:t=e?""+t:t,tpl:getCreatedInfoTpl()},{name:"modifiedInfo",label:"修改人",type:"static",labelClassName:"text-left",className:t,tpl:getModifiedInfoTpl()}]}function getAmisFieldType(e){switch(e.type){case"text":return "text";case"textarea":return "textarea";case"html":return "html";case"markdown":return "markdown";case"select":return "select";case"boolean":return "checkbox";case"date":return "date";case"datetime":return "datetime";case"number":case"currency":case"percent":return "number";case"password":return "password";case"lookup":return "select";case"master_detail":return "picker";case"autonumber":return "text";case"url":return "url";case"email":return "email";case"image":return "image";case"formula":case"summary":break;case"grid":return "table";default:console.log("convertData default",e.type);}}function getObjectFieldSubFields(t,e){var a=Object.assign({subFields:[]},t),e=lodash.exports.filter(e,function(e){return e.name.startsWith(t.name+".")});return a.subFields=e,a}function getGridFieldSubFields(t,e){var a=Object.assign({subFields:[]},t),e=lodash.exports.filter(e,function(e){return e.name.startsWith(t.name+".")});return a.subFields=e,a}function getPermissionFields(e,t){const a=[],i=[];return lodash.exports.each(e.fields,(e,t)=>{lodash.exports.has(e,"name")||(e.name=t),i.push(e);}),lodash.exports.each(lodash.exports.sortBy(i,"sort_no"),function(e){e.hidden||a.push(Object.assign({},e,{permission:{allowEdit:!0}}));}),a}function getSelectFieldOptions(e){const t=e.data_type||"text",a=[];return lodash.exports.each(e.options,e=>{switch(t){case"number":a.push({label:e.label,value:Number(e.value)});break;case"text":a.push({label:e.label,value:String(e.value)});break;case"boolean":a.push({label:e.label,value:"false"!==e.value});}}),a}async function convertSFieldToAmisField(a,i,r){if(!lodash.exports.includes(OMIT_FIELDS,a.name)||1==r.showSystemFields){var l,s={name:r.fieldNamePrefix?""+r.fieldNamePrefix+a.name:a.name,label:a.label,labelRemark:a.inlineHelpText,required:(lodash.exports.has(r,"required")?r:a).required};let t={};switch(a.type){case"text":t.type=getAmisStaticFieldType("text",i);break;case"textarea":t.type=getAmisStaticFieldType("textarea",i),t.tpl=`<b><%=data.${a.name}%></b>`;break;case"html":t=getHtmlFieldSchema(a,i);break;case"markdown":t=getMarkdownFieldSchema(a,i);break;case"select":t={type:getAmisStaticFieldType("select",i),joinValues:!1,options:getSelectFieldOptions(a),extractValue:!0,clearable:!0,labelField:"label",valueField:"value",tpl:i?getSelectTpl(a):null};let e=a.defaultValue;!lodash.exports.has(a,"defaultValue")||lodash.exports.isString(a.defaultValue)&&a.defaultValue.startsWith("{")||(lodash.exports.isString(e)&&e.startsWith("{{")&&(e="$"+e.substring(1,e.length-1)),l=a.data_type||"text",null!=e&&("text"===l?t.value=String(e):"number"===l?t.value=Number(e):"boolean"===l&&(t.value="false"!==e))),a.multiple&&(t.multiple=!0,t.extractValue=!0);break;case"boolean":t={type:getAmisStaticFieldType("checkbox",i),tpl:i?getSwitchTpl(a):null};break;case"input-date-range":t={type:"input-date-range",inputFormat:"YYYY-MM-DD",format:"YYYY-MM-DDT00:00:00.000[Z]",tpl:i?getDateTpl(a):null,joinValues:!1};break;case"date":t={type:getAmisStaticFieldType("date",i),inputFormat:"YYYY-MM-DD",format:"YYYY-MM-DDT00:00:00.000[Z]",tpl:i?getDateTpl(a):null};break;case"input-datetime-range":t={type:"input-datetime-range",inputFormat:"YYYY-MM-DD HH:mm",format:"YYYY-MM-DDTHH:mm:ss.SSSZ",tpl:i?getDateTimeTpl(a):null,utc:!0,joinValues:!1};break;case"datetime":t={type:getAmisStaticFieldType("datetime",i),inputFormat:"YYYY-MM-DD HH:mm",format:"YYYY-MM-DDTHH:mm:ss.SSSZ",tpl:i?getDateTimeTpl(a):null,utc:!0};break;case"input-time-range":t={type:"input-time-range",inputFormat:"HH:mm",timeFormat:"HH:mm",format:"1970-01-01THH:mm:00.000[Z]",tpl:i?getDateTimeTpl(a):null,joinValues:!1};break;case"time":t={type:getAmisStaticFieldType("time",i),inputFormat:"HH:mm",timeFormat:"HH:mm",format:"1970-01-01THH:mm:00.000[Z]",tpl:i?getDateTimeTpl(a):null};break;case"currency":case"number":t=i?{type:"static-tpl",tpl:getNumberTpl(a)}:{type:getAmisStaticFieldType("number",i),min:a.min,max:a.max,precision:a.scale};break;case"input-array":t=Object.assign({},a,s);break;case"input-range":t={type:"input-range",min:a.min,max:a.max,value:[0,0],multiple:!0,showInput:!0};break;case"percent":t={type:getAmisStaticFieldType("number",i),min:a.min,max:a.max,precision:a.scale};break;case"password":t={type:getAmisStaticFieldType("password",i),tpl:i?getPasswordTpl(a):null};break;case"lookup":case"master_detail":t=await lookupToAmis(a,i,r);break;case"autonumber":i&&(t={type:"static-text"});break;case"url":t={type:getAmisStaticFieldType("url",i)};break;case"email":t={type:getAmisStaticFieldType("email",i)};break;case"avatar":case"image":case"file":t=getAmisFileSchema(a,i);break;case"formula":case"summary":i&&(t.type=getAmisStaticFieldType(a.data_type,i));break;case"code":t={type:"editor",language:a.language,value:a.defaultValue||""};break;case"toggle":t={type:"switch",name:a.name,label:a.label,width:a.width,toggled:a.toggled,disabled:i};break;case"grid":t={type:"input-table",strictMode:!1,affixHeader:!1,editable:!i,addable:!i,removable:!i,draggable:!i,columns:[]};for(const d of a.subFields){var o=d.name.replace(a.name+".$.","").replace(a.name+".",""),n=await convertSFieldToAmisField(Object.assign({},d,{name:o}),i,r);n&&(delete n.name,delete n.label,t.columns.push({name:o,label:d.label,quickEdit:!i&&n}));}}return lodash.exports.isEmpty(t)?void 0:(a.is_wide||"group"===t.type?t.className="col-span-2 m-1":t.className="m-1",i&&(t.className=t.className+" md:border-b"),i&&(t.quickEdit=!1),a.visible_on&&(a.visible_on.startsWith("{{")?t.visibleOn=""+a.visible_on.substring(2,a.visible_on.length-2).replace(/formData./g,"data."):t.visibleOn=""+a.visible_on.replace(/formData./g,"data.")),"group"===t.type?(t.body[0]=Object.assign({},s,t.body[0],{labelClassName:"text-left",clearValueOnHidden:!0,fieldName:a.name}),t):Object.assign({},s,t,{labelClassName:"text-left",clearValueOnHidden:!0,fieldName:a.name}))}}async function getFieldSearchable(e,t,a){var i=a.filterLoopCount||0;let r=e,l=("grid"===r.type?r=await getGridFieldSubFields(e,t):"object"===e.type&&(r=await getObjectFieldSubFields(e,t)),"__searchable__");if(r.name.indexOf(".")<0){e=lodash.exports.cloneDeep(r),t=(lodash.exports.includes(["textarea","html","code","autonumber"],r.type)&&(e.type="text"),"number"!==r.type&&"currency"!==r.type||(e.type="input-array",e.inline=!0,e.addable=!1,e.removable=!1,e.value=[null,null],e.items={type:"input-number"},e.is_wide=!0,l+="between__"),"date"===r.type&&(e.type="input-date-range",e.is_wide=!0,l+="between__"),"datetime"===r.type&&(e.type="input-datetime-range",e.is_wide=!0,l+="between__"),"time"===r.type&&(e.type="input-time-range",e.is_wide=!0,l+="between__"),"users"===r.reference_to&&(e.reference_to="space_users",e.reference_to_field="user"),e.readonly=!1,e.disabled=!1,e.multiple=!0,e.is_wide=!1,e.defaultValue=void 0,await convertSFieldToAmisField(e,!1,Object.assign({},a,{fieldNamePrefix:l,required:!1,showSystemFields:!0,filterVisible:i<5})));if(t)return t}}Object.freeze({__proto__:null,OMIT_FIELDS:OMIT_FIELDS,getBaseFields:getBaseFields,getAmisFieldType:getAmisFieldType,getObjectFieldSubFields:getObjectFieldSubFields,getGridFieldSubFields:getGridFieldSubFields,getPermissionFields:getPermissionFields,getSelectFieldOptions:getSelectFieldOptions,convertSFieldToAmisField:convertSFieldToAmisField,getFieldSearchable:getFieldSearchable,getAmisStaticFieldType:getAmisStaticFieldType});async function getObjectFieldsFilterFormSchema(e,t,a){a=a||{};var i,r,l=[];for(i of t)lodash.exports.includes(["grid","avatar","image","object","[object]","[Object]","[grid]","[text]","audio","file"],i.type)||(delete i.defaultValue,delete i.required,delete i.is_wide,delete i.readonly,delete i.hidden,delete i.omit,(r=await getFieldSearchable(i,t,a))&&l.push(r));return lodash.exports.map(l,"name"),a.enableSearchableFieldsVisibleOn&&l.forEach(function(e){e.visibleOn=`this.filterFormSearchableFields && this.filterFormSearchableFields.indexOf("${e.fieldName}") > -1`;}),{title:"",type:"form",name:"listview-filter-form",id:"listview_filter_form_"+e.name,mode:"normal",wrapWithPanel:!1,className:"sm:grid sm:gap-2 sm:grid-cols-4 mb-2",data:{"&":"${filterFormValues || {}}",...a.initData},body:l}}async function getObjectFieldsFilterBarSchema(e,t,a){a=a||{};t=await getObjectFieldsFilterFormSchema(e,t,Object.assign({},{enableSearchableFieldsVisibleOn:!0},a));return {type:"service",name:"service_listview_filter_form",data:{},id:"service_listview_filter_form_"+e.name,dataProvider:{inited:`
     const objectName = data.objectName;
     const isLookup = data.isLookup;
     const listViewId = data.listViewId;
@@ -67101,7 +67099,15 @@ const getBuilderContext=()=>"undefined"==typeof window?{}:Builder.settings.conte
     var listView = scope.parent.parent.parent.getComponents().find(function(n){
       return n.props.type === "crud";
     });
-    listView.handleFilterSubmit(filterFormValues);
+    const removedValues = {};
+    // 设置搜索项中移除搜索项后，filterFormValues未把其字段的空值保存为own property，即hasOwnProperty属性中
+    // 这会造成handleFilterSubmit时把移除掉的搜索项字段之前的值加到过滤条件中
+    for(var k in filterFormValues){
+      if(filterFormValues[k] === "" && !filterFormValues.hasOwnProperty(k)){
+        removedValues[k] = "";
+      }
+    }
+    listView.handleFilterSubmit(Object.assign({}, removedValues, filterFormValues));
   `}]}}},{type:"button",label:"设置搜索项",onEvent:{click:{actions:[{actionType:"dialog",dialog:{type:"dialog",size:"md",title:"设置搜索项",body:[{type:"form",title:"",body:[{label:"",type:"transfer",name:"fields",id:"u:92c0b3cccca0",source:{method:"get",url:"${context.rootUrl}/service/api/amis-metadata-objects/objects/${objectName}/fields/options",dataType:"json",headers:{Authorization:"Bearer ${context.tenantId},${context.authToken}"},data:null,requestAdaptor:"",adaptor:""},options:[],required:!0,placeholder:"-",className:"col-span-2 m-0",checkAll:!1,searchable:!0,sortable:!0,joinValues:!1,extractValue:!0,multiple:!0}],id:"u:e5ac506d5683",mode:"normal",persistData:!1,promptPageLeave:!0,name:"form",debug:!1,actions:[],panelClassName:"m-0",bodyClassName:"p-4",className:"steedos-amis-form"}],id:"u:ca99fa9fe1b1",actions:[{type:"button",label:"取消",onEvent:{click:{actions:[{componentId:"",args:{},actionType:"closeDialog"}]}},id:"u:4e447b5ca72a"},{type:"button",label:"确认",onEvent:{click:{actions:[{actionType:"custom",script:`
     const data = context.props.data;
     const listName = data.listName;
@@ -67110,6 +67116,7 @@ const getBuilderContext=()=>"undefined"==typeof window?{}:Builder.settings.conte
     const listViewId = data.listViewId;
     const value = data.fields;
     const scope = event.context.scoped;
+    // 这里的filterForm不是name为"listview-filter-form"的内部form，而是crud自带的filter form
     const filterForm = scope.parent.parent.getComponents().find(function(n){
       return n.props.type === "form";
     });
@@ -67125,7 +67132,74 @@ const getBuilderContext=()=>"undefined"==typeof window?{}:Builder.settings.conte
       searchableFieldsStoreKey += listViewId;
     }
     localStorage.setItem(searchableFieldsStoreKey, value);
-  `},{actionType:"broadcast",eventName:"broadcastSearchableFieldsChange",args:{eventName:"broadcastSearchableFieldsChange"},data:{fields:"${event.data.fields}"}},{componentId:"",args:{},actionType:"closeDrawer"}]}},id:"u:14e7388fecd3",level:"primary"}],closeOnEsc:!1,closeOnOutside:!1,showCloseButton:!0,data:{"&":"$$",objectName:"${objectName}",listName:"${listName}",listViewId:"${listViewId}",uiSchema:"${uiSchema}",isLookup:"${isLookup}",context:"${context}",fields:"${filterFormSearchableFields}"}}}]}},id:"u:b96d84868a5a",level:"link"}],size:"xs",className:"space-x-4"},size:"xs",className:"slds-filters__footer slds-grid slds-shrink-none flex justify-between p-0"}],size:"xs",className:"slds-filters"},size:"xs",className:"border-gray-300 border-y slds-grid slds-grid_vertical slds-nowrap "+(!a.isLookup&&"mt-2"),visibleOn:"this.showFieldsFilter"},className:"bg-white"}}let UI_SCHEMA_CACHE={},UISchemaFunction;const setUISchemaCache=("undefined"!=typeof window&&(window.UI_SCHEMA_CACHE||(window.UI_SCHEMA_CACHE=UI_SCHEMA_CACHE),UI_SCHEMA_CACHE=window.UI_SCHEMA_CACHE),(e,t)=>{UI_SCHEMA_CACHE[e]=t;}),getUISchemaCache=e=>lodash.exports.cloneDeep(UI_SCHEMA_CACHE[e]),hasUISchemaCache=e=>lodash.exports.has(UI_SCHEMA_CACHE,e);async function getUISchema(t,e){if(t){if(!hasUISchemaCache(t)||e){let a=null;try{if(!(a=UISchemaFunction?await UISchemaFunction(t,e):await fetchAPI(`/service/api/@${t.replace(/\./g,"_")}/uiSchema`,{method:"get"})))return;setUISchemaCache(t,a),lodash.exports.each(a.list_views,(e,t)=>{e.name=t,lodash.exports.has(e,"columns")||(e.columns=a.list_views.all.columns);});}catch(e){console.error("getUISchema",t,e),setUISchemaCache(t,null);}}return getUISchemaCache(t)}}var __assign=function(){return (__assign=Object.assign||function(e){for(var t,a=1,i=arguments.length;a<i;a++)for(var r in t=arguments[a])Object.prototype.hasOwnProperty.call(t,r)&&(e[r]=t[r]);return e}).apply(this,arguments)};function createObject(e,t,a){var i=(e=e&&Object.isFrozen(e)?cloneObject(e):e)?Object.create(e,__assign(__assign({},a),{__super:{value:e,writable:!1,enumerable:!1}})):Object.create(Object.prototype,a);return t&&isObject(t)&&Object.keys(t).forEach(function(e){return i[e]=t[e]}),i}function cloneObject(t,e){void 0===e&&(e=!0);var a=t&&t.__super?Object.create(t.__super,{__super:{value:t.__super,writable:!1,enumerable:!1}}):Object.create(Object.prototype);return e&&t&&Object.keys(t).forEach(function(e){return a[e]=t[e]}),a}function isObject(e){var t=typeof e;return e&&"string"!=t&&"number"!=t&&"boolean"!=t&&"function"!=t&&!Array.isArray(e)}
+
+    // ===START===:当变更可搜索字段时，如果被移除的可搜索字段在本地存储中已经存入过滤条件中则应该清除本地存储中相关字段的过滤条件。
+    const searchableFields = data.fields;
+    let preSearchableFields = data.__super.fields;
+    if(typeof preSearchableFields === "string"){
+      preSearchableFields = preSearchableFields.split(",");
+    }
+    const removedFields = _.difference(preSearchableFields, searchableFields);
+
+    // const getClosestAmisComponentByType = function (scope, type, name) {
+    //   // 递归children找到listview-filter-form
+    //   let re = scope.getComponents().find(function (n) {
+    //     return n.props.type === type && n.props.name === name;
+    //   });
+    //   if (re) {
+    //     return re;
+    //   }
+    //   else {
+    //     if (scope.children && scope.children.length) {
+    //       for (let i = 0; i < scope.children.length; i++) {
+    //         re = getClosestAmisComponentByType(scope.children[i], type, name);
+    //         if (re) {
+    //           break;
+    //         }
+    //       }
+    //       return re;
+    //     }
+    
+    //   }
+    // }
+    // // 这里第二层form才是真正要提交到crud过滤条件的form
+    // filterInnerForm = getClosestAmisComponentByType(filterForm.context, "form", "listview-filter-form");
+
+    const filterFormValues = filterForm.getValues();
+    let removedKeys = [];
+    _.each(filterFormValues, function(n,k){
+      // __searchable__开头的不在searchableFields范围则清除其值
+      let isRemoved = !!removedFields.find(function(fieldName){
+        return new RegExp("__searchable__.*" + fieldName + "$").test(k);
+      });
+      if(isRemoved){
+        removedKeys.push(k);
+      }
+    });
+    const removedValues = {};
+    removedKeys.forEach(function(key){
+      removedValues[key] = "";
+    });
+    filterForm.setValues(removedValues);//这里使用filterInnerForm也可以
+
+    if(isLookup){
+      return;
+    }
+    
+    // 列表视图crud支持本地缓存，所以需要进一步清除浏览器本地缓存里面用户在可搜索项中移除的字段值
+    const listViewPropsStoreKey = location.pathname + "/crud/" + listViewId ;
+    let localListViewProps = localStorage.getItem(listViewPropsStoreKey);
+    if(localListViewProps){
+      localListViewProps = JSON.parse(localListViewProps);
+      // const removedValues = {};
+      removedKeys.forEach(function(key){
+        delete localListViewProps[key];
+        // removedValues[key] = "";
+      });
+      localStorage.setItem(listViewPropsStoreKey, JSON.stringify(localListViewProps));
+    }
+    // ===END===
+  `},{componentId:"",args:{},actionType:"closeDrawer"}]}},id:"u:14e7388fecd3",level:"primary"}],closeOnEsc:!1,closeOnOutside:!1,showCloseButton:!0,data:{"&":"$$",objectName:"${objectName}",listName:"${listName}",listViewId:"${listViewId}",uiSchema:"${uiSchema}",isLookup:"${isLookup}",context:"${context}",fields:"${filterFormSearchableFields}"}}}]}},id:"u:b96d84868a5a",level:"link"}],size:"xs",className:"space-x-4"},size:"xs",className:"slds-filters__footer slds-grid slds-shrink-none flex justify-between p-0"}],size:"xs",className:"slds-filters"},size:"xs",className:"border-gray-300 border-y slds-grid slds-grid_vertical slds-nowrap "+(!a.isLookup&&"mt-2"),visibleOn:"this.showFieldsFilter"},className:"bg-white"}}let UI_SCHEMA_CACHE={},UISchemaFunction;const setUISchemaCache=("undefined"!=typeof window&&(window.UI_SCHEMA_CACHE||(window.UI_SCHEMA_CACHE=UI_SCHEMA_CACHE),UI_SCHEMA_CACHE=window.UI_SCHEMA_CACHE),(e,t)=>{UI_SCHEMA_CACHE[e]=t;}),getUISchemaCache=e=>lodash.exports.cloneDeep(UI_SCHEMA_CACHE[e]),hasUISchemaCache=e=>lodash.exports.has(UI_SCHEMA_CACHE,e);function getListViewSort(e){let i="";return e&&e.sort&&e.sort.length&&lodash.exports.each(e.sort,function(e,t){var a;lodash.exports.isArray(e)?(a=e[0]+" "+(e[1]||""),a=0<t?","+a:a,i+=a):(a=e.field_name+" "+e.order,a=0<t?","+a:a,i+=a);}),i}async function getUISchema(t,e){if(t){if(!hasUISchemaCache(t)||e){let a=null;try{if(!(a=UISchemaFunction?await UISchemaFunction(t,e):await fetchAPI(`/service/api/@${t.replace(/\./g,"_")}/uiSchema`,{method:"get"})))return;setUISchemaCache(t,a),lodash.exports.each(a.list_views,(e,t)=>{e.name=t,lodash.exports.has(e,"columns")||(e.columns=a.list_views.all.columns);});}catch(e){console.error("getUISchema",t,e),setUISchemaCache(t,null);}}return getUISchemaCache(t)}}var __assign=function(){return (__assign=Object.assign||function(e){for(var t,a=1,i=arguments.length;a<i;a++)for(var r in t=arguments[a])Object.prototype.hasOwnProperty.call(t,r)&&(e[r]=t[r]);return e}).apply(this,arguments)};function createObject(e,t,a){var i=(e=e&&Object.isFrozen(e)?cloneObject(e):e)?Object.create(e,__assign(__assign({},a),{__super:{value:e,writable:!1,enumerable:!1}})):Object.create(Object.prototype,a);return t&&isObject(t)&&Object.keys(t).forEach(function(e){return i[e]=t[e]}),i}function cloneObject(t,e){void 0===e&&(e=!0);var a=t&&t.__super?Object.create(t.__super,{__super:{value:t.__super,writable:!1,enumerable:!1}}):Object.create(Object.prototype);return e&&t&&Object.keys(t).forEach(function(e){return a[e]=t[e]}),a}function isObject(e){var t=typeof e;return e&&"string"!=t&&"number"!=t&&"boolean"!=t&&"function"!=t&&!Array.isArray(e)}
 
 var FullCalendar = function (_a) {
     var amisDispatchEvent = _a.dispatchEvent, amisData = _a.data, props = __rest(_a, ["dispatchEvent", "data"]);