@steedos-widgets/amis-object 1.3.5 → 1.3.7

package/dist/amis-object.cjs.css

@@ -898,6 +898,9 @@ fieldset.antd-Collapse > legend{
 .pr-4 {
     padding-right: 1rem
 }
+.pl-5 {
+    padding-left: 1.25rem
+}
 .pb-0 {
     padding-bottom: 0px
 }

package/dist/amis-object.cjs.js

@@ -6476,7 +6476,7 @@ async function getObjectFieldsFilterBarSchema(objectSchema, ctx) {
       showFieldsFilter = true;
     }
     filterService.setData({showFieldsFilter});
-    resizeWindow();
+    // resizeWindow();//已迁移到搜索栏表单提交事件中执行，因为表单项change后也会触发表单提交了
     // 使用filterForm.getValues()的话，并不能拿到本地存储中的过滤条件，所以需要从event.data中取。
     let filterFormValues = event.data;
     let isFieldsFilterEmpty = SteedosUI.isFilterFormValuesEmpty(filterFormValues);
@@ -8428,7 +8428,8 @@ function getObjectHeaderQuickSearchBox(mainObject, fields, formFactor, { isLooku
         "placeholder": "搜索此列表",
         "value": crudKeywords,
         "clearable": true,
-        "clearAndSubmit": true
+        "clearAndSubmit": true,
+        "searchImediately": true
       }
     ]
   }
@@ -8663,16 +8664,50 @@ function getObjectFooterToolbar(mainObject, formFactor, options) {
 
 async function getObjectFilter(objectSchema, fields, options) {
   const fieldsFilterBarSchema = await getObjectListHeaderFieldsFilterBar(objectSchema, null, options);
+  let onSubmitSuccScript = `
+    let isLookup = event.data.isLookup;
+    if(isLookup){
+      return;
+    }
+    // 列表搜索栏字段值变更后立刻触发提交表单执行crud搜索，所以这里需要额外重算crud高度及筛选按钮红色星号图标显示隐藏
+    let resizeWindow = function(){
+      //触发amis crud 高度重算
+      setTimeout(()=>{
+        window.dispatchEvent(new Event("resize"))
+      }, 1000);
+    }
+    resizeWindow();
+    const scope = event.context.scoped;
+    // let filterFormValues = event.data;
+    let filterForm = SteedosUI.getClosestAmisComponentByType(scope, "form");
+    let filterFormService = SteedosUI.getClosestAmisComponentByType(filterForm.context, "service");
+    // 使用event.data的话，并不能拿到本地存储中的过滤条件，所以需要从filterFormService中取。
+    let filterFormValues = filterFormService.getData()
+    let isFieldsFilterEmpty = SteedosUI.isFilterFormValuesEmpty(filterFormValues);
+    let crud = SteedosUI.getClosestAmisComponentByType(scope, "crud");
+    let crudService = crud && SteedosUI.getClosestAmisComponentByType(crud.context, "service");
+    crudService && crudService.setData({isFieldsFilterEmpty});
+  `;
   return {
     "title": "",
     "submitText": "",
     "className": "",
-    // "debug": true,
+    "debug": false,
     "mode": "normal",
     "wrapWithPanel": false,
     "body": [
       fieldsFilterBarSchema
-    ]
+    ],
+    "onEvent": {
+      "submitSucc": {
+        "actions": [
+          {
+            "actionType": "custom",
+            "script": onSubmitSuccScript
+          }
+        ]
+      }
+    }
   }
 }
 
@@ -10867,7 +10902,9 @@ async function getFieldSearchable(perField, permissionFields, ctx){
 
         const amisField = await convertSFieldToAmisField(_field, false, Object.assign({}, ctx, {fieldNamePrefix: fieldNamePrefix, required: false, showSystemFields: true, inFilterForm: true}));
         if(amisField){
-            return amisField;
+            return Object.assign({}, amisField,{
+                submitOnChange: true
+            });
         }
     }
 }
@@ -10946,7 +10983,12 @@ var config = {
 
 async function getQuickEditSchema(field, options){
     //判断在amis3.2以上环境下，放开批量编辑
-    const isAmisVersionforBatchEdit = amisRequire('amis').version[0] >= 3 && amisRequire('amis').version[2] >= 2;
+    let isAmisVersionforBatchEdit = false;
+    if(window.amisRequire && window.amisRequire('amis')){
+        isAmisVersionforBatchEdit = window.amisRequire('amis').version[0] >= 3 && window.amisRequire('amis').version[2] >= 2;
+    }else if(window.Amis){
+        isAmisVersionforBatchEdit = window.Amis.version[0] >= 3 && window.Amis.version[2] >= 2;
+    }
     const quickEditId = options.objectName + "_" + field.name + "_quickEdit";//定义快速编辑的表单id，用于setvalue传值
     var quickEditSchema = { body: [], id: quickEditId };
     //select,avatar,image,file等组件无法行记录字段赋值，暂不支持批量编辑；
@@ -14188,7 +14230,7 @@ const getRecordPermissions = async (objectName, recordId)=>{
  * @Author: baozhoutao@steedos.com
  * @Date: 2022-07-05 15:55:39
  * @LastEditors: liaodaxue
- * @LastEditTime: 2023-10-23 15:55:46
+ * @LastEditTime: 2023-11-14 15:55:32
  * @Description:
  */
 
@@ -14536,7 +14578,11 @@ async function getRelatedListSchema(
             if(setDataToComponentId){
                 if(payload.data.count){
                     setTimeout(function(){
-                        window.$("." + setDataToComponentId + " .antd-Crud").removeClass("hidden");
+                        // 设计器中获取不到window.$从而导致报错， 所以用纯js替换下。
+                        // window.$("." + setDataToComponentId + " .antd-Crud").removeClass("hidden");		
+                        document.querySelectorAll("." + setDataToComponentId + " .antd-Crud").forEach(function(element) {
+                            element.classList.remove("hidden");
+                        });
                     }, 10);
                 }
             };
@@ -18952,7 +18998,7 @@ var AmisRecordDetailRelatedList = function (props) { return __awaiter(void 0, vo
                     return [2 /*return*/, {}];
                 }
                 schema.data = Object.assign(schema.data || {}, formData);
-                if (_$1.has(props, "recordId") && $schema.recordId !== "${recordId}") {
+                if (_$1.has(props, "recordId") && ($schema.recordId !== "${recordId}" || (props.$$editor && props.recordId !== "${recordId}"))) {
                     schema.data = Object.assign(schema.data, {
                         _master: {
                             record: (_b = data === null || data === void 0 ? void 0 : data._master) === null || _b === void 0 ? void 0 : _b.record,
@@ -18996,7 +19042,8 @@ var AmisRecordDetailRelatedLists = function (props) { return __awaiter(void 0, v
                         }];
                 }
                 staticRecordId = '';
-                if (_$1.has(props, "recordId") && $schema.recordId !== "${recordId}") {
+                // 在设计器中的设计状态，当上层有recordId具体值，相关表组件的$schema.recordId的默认值就是 "${recordId}"； 会导致获取不到 _master, 进而导致组件显示不了数据。
+                if (_$1.has(props, "recordId") && ($schema.recordId !== "${recordId}" || (props.$$editor && props.recordId !== "${recordId}"))) {
                     staticRecordId = recordId;
                 }
                 return [2 /*return*/, {
@@ -20042,7 +20089,7 @@ var AmisGlobalHeader = function (props) { return __awaiter(void 0, void 0, void
                         },
                         {
                             "type": "grid",
-                            "className": 'steedos-context-bar flex flex-nowrap h-10 leading-5 pl-4 mb-[-3px] steedos-header-container-line-two',
+                            "className": 'steedos-context-bar flex flex-nowrap h-10 leading-5 pl-5 mb-[-3px] steedos-header-container-line-two',
                             "hiddenOn": "${" + isMobile + "}",
                             "columns": [
                                 {