@steedos-widgets/amis-object 6.3.12-beta.11 → 6.3.12-beta.13

package/dist/amis-object.cjs.css

@@ -2171,6 +2171,10 @@ steedosfieldset.antd-Collapse .antd-Collapse-header.is-mobile:hover {
 .steedos-amis-form{
     padding: var(--Collapse-content-padding);
 }
+
+.steedos-header-toolbar-notifications-panel {
+  margin-bottom: 0px !important;
+}
 .steedos-listview .is-loading .antd-Table-contentWrap {
   height: 50px;
 }

package/dist/amis-object.cjs.js

@@ -9416,7 +9416,7 @@ async function getObjectFieldsFilterBarSchema(objectSchema, ctx) {
     filterService.setData({showFieldsFilter});
     // resizeWindow();//已迁移到搜索栏表单提交事件中执行，因为表单项change后也会触发表单提交了
     let isFieldsFilterEmpty = SteedosUI.isFilterFormValuesEmpty(filterFormValues);
-    let crudService = crud && SteedosUI.getClosestAmisComponentByType(crud.context, "service");
+    let crudService = crud && SteedosUI.getClosestAmisComponentByType(crud.context, "service", {name: "service_object_table_crud"});
     crudService && crudService.setData({isFieldsFilterEmpty, showFieldsFilter});
   `;
   const onCancelScript = `
@@ -9502,7 +9502,7 @@ async function getObjectFieldsFilterBarSchema(objectSchema, ctx) {
     
     // 移除搜索按钮上的红点
     // let crudService = scope.getComponentById("service_listview_" + event.data.objectName);
-    let crudService = crud && SteedosUI.getClosestAmisComponentByType(crud.context, "service");
+    let crudService = crud && SteedosUI.getClosestAmisComponentByType(crud.context, "service", {name: "service_object_table_crud"});
     crudService && crudService.setData({isFieldsFilterEmpty: true, showFieldsFilter: false});
     `;
   const dataProviderInited = `
@@ -12130,7 +12130,7 @@ function getObjectHeaderQuickSearchBox(mainObject, fields, formFactor, { isLooku
     // console.log("==search=onChangeScript===");
     const scope = event.context.scoped;
     let crud = SteedosUI.getClosestAmisComponentByType(scope, "crud");
-    // let crudService = crud && SteedosUI.getClosestAmisComponentByType(crud.context, "service");
+    // let crudService = crud && SteedosUI.getClosestAmisComponentByType(crud.context, "service", {name: "service_object_table_crud"});
     let __changedSearchBoxValues = {};
     __changedSearchBoxValues["${keywordsSearchBoxName}"] = event.data["${keywordsSearchBoxName}"];
     // crudService && crudService.setData({__changedSearchBoxValues: __changedSearchBoxValues});
@@ -12497,10 +12497,10 @@ async function getObjectFilter(objectSchema, fields, options) {
     let filterForm = SteedosUI.getClosestAmisComponentByType(scope, "form");
     let filterFormService = SteedosUI.getClosestAmisComponentByType(filterForm.context, "service");
     // 使用event.data的话，并不能拿到本地存储中的过滤条件，所以需要从filterFormService中取。
-    let filterFormValues = filterFormService.getData()
+    let filterFormValues = filterFormService.getData();
     let isFieldsFilterEmpty = SteedosUI.isFilterFormValuesEmpty(filterFormValues);
     let crud = SteedosUI.getClosestAmisComponentByType(scope, "crud");
-    let crudService = crud && SteedosUI.getClosestAmisComponentByType(crud.context, "service");
+    let crudService = crud && SteedosUI.getClosestAmisComponentByType(crud.context, "service", {name: "service_object_table_crud"});
     crudService && crudService.setData({isFieldsFilterEmpty});
   `;
   let onChangeScript = `
@@ -12515,7 +12515,7 @@ async function getObjectFilter(objectSchema, fields, options) {
     filterFormValues = JSON.parse(JSON.stringify(filterFormValues)); //只取当层数据域中数据，去除__super层数据
     let crud = SteedosUI.getClosestAmisComponentByType(scope, "crud");
     const changedFilterFormValues = _.pickBy(filterFormValues, function(n,k){return /^__searchable__/.test(k);});;
-    // let crudService = crud && SteedosUI.getClosestAmisComponentByType(crud.context, "service");
+    // let crudService = crud && SteedosUI.getClosestAmisComponentByType(crud.context, "service", {name: "service_object_table_crud"});
     // crudService && crudService.setData({__changedFilterFormValues: changedFilterFormValues});
     // 这里不用crudService而用crud是因为lookup字段弹出的列表中的crudService中的变量无法传入crud的发送适配器中
     // crud && crud.setData({__changedFilterFormValues: changedFilterFormValues});
@@ -12871,7 +12871,7 @@ async function getObjectCRUD(objectSchema, fields, options){
       className: crudModeClassName,
       //目前crud的service层id不认用户自定义id，只支持默认规则id，许多地方的格式都写死了service_listview_${objectname}
       id: `service_${id}`,
-      name: `page`,
+      name: "service_object_table_crud",
       data: options.amisData,
       body: body,
       //监听广播事件，重算crud高度
@@ -26146,7 +26146,7 @@ var AmisGlobalFooter = function (props) { return __awaiter(void 0, void 0, void
 * @Author: baozhoutao@steedos.com
 * @Date: 2022-09-01 14:44:57
 * @LastEditors: baozhoutao@steedos.com
-* @LastEditTime: 2024-10-10 16:36:14
+* @LastEditTime: 2025-01-13 11:17:07
 * @Description:
 */
 var beforeMarkReadAllScript = "\n  var hasUnRead = !!db.notifications.find({'$or':[{'is_read': null},{'is_read': false}]}).count();\n  // \u6CA1\u6709\u8BA2\u9605\u5230\u672A\u8BFB\u901A\u77E5\u65F6\u9700\u8981\u989D\u5916\u5355\u72EC\u89E6\u53D1\u91CD\u65B0\u8BF7\u6C42\u901A\u77E5\u5217\u8868\u53CA\u672A\u8BFB\u6570\u91CF\n  // \u5982\u679C\u6709\u8BA2\u9605\u5230\u7684\u8BDD\uFF0C\u56E0\u4E3A\u76D1\u542C\u8BA2\u9605\u5230\u7684\u901A\u77E5\u8BB0\u5F55\u53D8\u5316\uFF0C\u6709\u53D8\u5316\u4F1A\u89E6\u53D1@data.changed.notifications\u4E8B\u4EF6\uFF0C\u4ECE\u800C\u4F1A\u81EA\u52A8\u89E6\u53D1\u91CD\u65B0\u8BF7\u6C42\u901A\u77E5\u5217\u8868\u53CA\u672A\u8BFB\u6570\u91CF\n  event.data.needToReload = !hasUnRead;\n";
@@ -26170,7 +26170,7 @@ var getNotificationBadgeButton = function () {
                                 "name": "notifications",
                                 "items": {
                                     "type": "tpl",
-                                    "tpl": "<div class='flex items-center p-4 hover:bg-sky-50'>\n                                  <img src='<%=data.context.rootUrl + \"/avatar/\" + data.from%>' alt='' class='h-10 w-10 flex-none rounded-full'>\n                                  <div class='ml-4 flex-auto'>\n                                    <div class='font-medium'>\n                                      <span class='text-primary'><%=data.name%></span>\n                                    </div>\n                                    <div class='mt-1 text-gray-700'>\n                                      <%=data.body%>\n                                    </div>\n                                    <div class='mt-1 text-gray-700'>\n                                      <%=moment(data.created).locale(data.global.user.language).fromNow()%>\n                                      <abbr class='slds-text-link slds-m-horizontal_xxx-small <%=data.is_read ? 'hidden' : ''%>' title='unread'>\u25CF</abbr>\n                                    </div>\n                                  </div>\n                                </div>",
+                                    "tpl": "<div class='flex items-center p-2 hover:bg-sky-50'>\n                                  <img src='<%=data.context.rootUrl + \"/avatar/\" + data.from%>' alt='' class='h-10 w-10 flex-none rounded-full'>\n                                  <div class='ml-4 flex-auto'>\n                                    <div class='font-medium'>\n                                      <span class='text-primary'><%=data.name%></span>\n                                    </div>\n                                    <div class='mt-1 text-gray-700'>\n                                      <%=data.body%>\n                                    </div>\n                                    <div class='mt-1 text-gray-700'>\n                                      <%=moment(data.created).locale(data.global.user.language).fromNow()%>\n                                      <abbr class='slds-text-link slds-m-horizontal_xxx-small <%=data.is_read ? 'hidden' : ''%>' title='unread'>\u25CF</abbr>\n                                    </div>\n                                  </div>\n                                </div>",
                                     "id": "u:07ece657c7b7",
                                     "onEvent": {
                                         "click": {