@steedos-widgets/amis-lib 1.3.22-beta.3 → 1.3.22-beta.4

package/dist/index.esm.js

@@ -5765,6 +5765,8 @@ async function getObjectFieldsFilterBarSchema(objectSchema, ctx) {
   `;
   const onCancelScript = `
     // console.log("===onCancelScript=form==");
+    let isLookup = event.data.isLookup;
+    let __lookupField = event.data.__lookupField;
     const scope = event.context.scoped;
     var filterForm = scope.parent.parent.getComponents().find(function(n){
       return n.props.type === "form";
@@ -5812,7 +5814,20 @@ async function getObjectFieldsFilterBarSchema(objectSchema, ctx) {
     // });
 
     // 清除__changedFilterFormValues中的值
-    crud && crud.setData({__changedFilterFormValues: {}});
+    // crud && crud.setData({__changedFilterFormValues: {}});
+    let __changedFilterFormValuesKey = "__changedFilterFormValues";
+    if(isLookup && __lookupField){
+      let lookupTag = "__" + __lookupField.name + "__" + __lookupField.reference_to;
+      if(__lookupField.reference_to_field){
+        lookupTag += "__" + __lookupField.reference_to_field;
+      }
+      __changedFilterFormValuesKey += lookupTag;
+    }
+    if(crud){
+      let crudData = crud.getData();
+      crudData[__changedFilterFormValuesKey] = {};
+      crud.setData(crudData);
+    }
     filterForm.handleFormSubmit(event);
     // crud.handleFilterSubmit(removedValues);
 
@@ -7740,7 +7755,12 @@ function getObjectHeaderQuickSearchBox(mainObject, fields, formFactor, { isLooku
     __changedSearchBoxValues["${keywordsSearchBoxName}"] = event.data["${keywordsSearchBoxName}"];
     // crudService && crudService.setData({__changedSearchBoxValues: __changedSearchBoxValues});
     // 这里不用crudService而用crud是因为lookup字段弹出的列表中的crudService中的变量无法传入crud的发送适配器中
-    crud && crud.setData({__changedSearchBoxValues: __changedSearchBoxValues});
+    // crud && crud.setData({__changedSearchBoxValues: __changedSearchBoxValues});
+    if(crud){
+      let crudData = crud.getData();
+      crudData.__changedSearchBoxValues = __changedSearchBoxValues;
+      crud.setData(crudData);
+    }
   `;
 
   // onSearchScript中加上了onChangeScript中的脚本，是因为amis 3.2不能用change事件执行onChangeScript
@@ -7753,9 +7773,19 @@ function getObjectHeaderQuickSearchBox(mainObject, fields, formFactor, { isLooku
     // const scope = event.context.scoped;
     // 如果点击过顶部搜索栏表单的取消按钮，会把此处event.data.__super.__super.__super中的搜索表单项的所有字段设置为null
     // 点击取消按钮后继续在表单项中输入过滤条件且最后没有点击回车按键或点击表单项搜索按钮的话，在快速搜索中点击回车按钮提交搜索会所顶部搜索表单中的字段值清空
+    let isLookup = event.data.isLookup;
+    let __lookupField = event.data.__lookupField;
+    let __changedFilterFormValuesKey = "__changedFilterFormValues";
+    if(isLookup && __lookupField){
+      let lookupTag = "__" + __lookupField.name + "__" + __lookupField.reference_to;
+      if(__lookupField.reference_to_field){
+        lookupTag += "__" + __lookupField.reference_to_field;
+      }
+      __changedFilterFormValuesKey += lookupTag;
+    }
     let filterForm = SteedosUI.getClosestAmisComponentByType(scope, "form");
     setTimeout(function(){
-      filterForm.setValues(event.data.__changedFilterFormValues);
+      filterForm.setValues(event.data[__changedFilterFormValuesKey]);
     }, 500);
   `;
 
@@ -7776,8 +7806,8 @@ function getObjectHeaderQuickSearchBox(mainObject, fields, formFactor, { isLooku
         "name": keywordsSearchBoxName,
         "placeholder": "搜索此列表",
         "value": crudKeywords,
-        "clearable": true,
-        // "clearAndSubmit": true,//因为清除并不会触发失去焦点事件，只有禁用，但是它会触发change事件，所以等升级到amis 3.4+后可以重新放开
+        // "clearable": true,//因为清除并不会触发失去焦点事件，只有禁用，但是它会触发change事件，所以等升级到amis 3.4+后可以重新放开
+        "clearAndSubmit": true,
         "searchImediately": false,
         "onEvent": {
           "search": {
@@ -8057,6 +8087,9 @@ async function getObjectFilter(objectSchema, fields, options) {
     crudService && crudService.setData({isFieldsFilterEmpty});
   `;
   let onChangeScript = `
+    let isLookup = event.data.isLookup;
+    let __lookupField = event.data.__lookupField;
+    console.log("==onChangeScript=isLookup===", isLookup);
     const scope = event.context.scoped;
     // let filterFormValues = event.data;
     let filterForm = SteedosUI.getClosestAmisComponentByType(scope, "form");
@@ -8068,7 +8101,20 @@ async function getObjectFilter(objectSchema, fields, options) {
     // let crudService = crud && SteedosUI.getClosestAmisComponentByType(crud.context, "service");
     // crudService && crudService.setData({__changedFilterFormValues: changedFilterFormValues});
     // 这里不用crudService而用crud是因为lookup字段弹出的列表中的crudService中的变量无法传入crud的发送适配器中
-    crud && crud.setData({__changedFilterFormValues: changedFilterFormValues});
+    // crud && crud.setData({__changedFilterFormValues: changedFilterFormValues});
+    let __changedFilterFormValuesKey = "__changedFilterFormValues";
+    if(isLookup && __lookupField){
+      let lookupTag = "__" + __lookupField.name + "__" + __lookupField.reference_to;
+      if(__lookupField.reference_to_field){
+        lookupTag += "__" + __lookupField.reference_to_field;
+      }
+      __changedFilterFormValuesKey += lookupTag;
+    }
+    if(crud){
+      let crudData = crud.getData();
+      crudData[__changedFilterFormValuesKey] = changedFilterFormValues;
+      crud.setData(crudData);
+    }
   `;
   return {
     "title": "",
@@ -10460,13 +10506,24 @@ async function lookupToAmisPicker(field, readonly, ctx){
     let keywordsSearchBoxName = `__keywords_lookup__${field.name.replace(/\./g, "_")}__to__${refObjectConfig.name}`;
 
     source.requestAdaptor = `
-        let __changedFilterFormValues = api.data.$self.__changedFilterFormValues || {};
+        let __changedFilterFormValuesKey = "__changedFilterFormValues";
+        let __lookupField = api.data.$self.__lookupField;
+        if(__lookupField){
+            let lookupTag = "__" + __lookupField.name + "__" + __lookupField.reference_to;
+            if(__lookupField.reference_to_field){
+                lookupTag += "__" + __lookupField.reference_to_field;
+            }
+            __changedFilterFormValuesKey += lookupTag;
+        }
+        let __changedFilterFormValues = api.data.$self[__changedFilterFormValuesKey] || {};
         let __changedSearchBoxValues = api.data.$self.__changedSearchBoxValues || {};
         // 把表单搜索和快速搜索中的change事件中记录的过滤条件也拼到$self中，是为解决触发搜索请求时，两边输入的过滤条件都带上，即：
         // 有时在搜索表单中输入过滤条件事，忘记点击回车键或搜索按钮，而是进一步修改快速搜索框中的关键字点击其中回车键触发搜索
         // 这种情况下，触发的搜索请求中没有带上搜索表单中输入的过滤条件。
         // 反过来先在快速搜索框中输入过滤条件却不点击其中回车键触发搜索，而是到搜索表单中触发搜索请求也是一样的。
-        Object.assign(api.data.$self, __changedSearchBoxValues, __changedFilterFormValues);
+        if(api.data.$self.op !== 'loadOptions'){
+            Object.assign(api.data.$self, __changedSearchBoxValues, __changedFilterFormValues);
+        }
         const selfData = JSON.parse(JSON.stringify(api.data.$self));
         var filters = [];
         var pageSize = api.data.pageSize || 10;
@@ -10670,7 +10727,12 @@ async function lookupToAmisPicker(field, readonly, ctx){
             "objectName": refObjectConfig.name,
             "uiSchema": refObjectConfig,
             "listName": listName,// 需要按视图取可搜索项
-            "isLookup": true
+            "isLookup": true,
+            "__lookupField": {
+                "name": field.name,
+                "reference_to": refObjectConfig.name,
+                "reference_to_field": field.reference_to_field
+            }
         });
 
         if(!pickerSchema.onEvent){
@@ -12432,7 +12494,7 @@ async function getFormBody(permissionFields, formFields, ctx){
  * @Author: 殷亮辉 yinlianghui@hotoa.com
  * @Date: 2023-11-15 09:50:22
  * @LastEditors: 殷亮辉 yinlianghui@hotoa.com
- * @LastEditTime: 2023-12-25 13:13:56
+ * @LastEditTime: 2023-12-26 11:15:04
  */
 
 /**
@@ -12460,20 +12522,22 @@ function getInputTableCell(field, showAsInlineEditMode) {
             name: field.name,
             quickEdit: {
                 "type": "steedos-field",
-                "config": field,
-                hideLabel: true
+                "config": Object.assign({}, field, {
+                    label: false
+                })
             }
         }
     }
     else {
         return {
             "type": "steedos-field",
-            "config": field,
+            "config": Object.assign({}, field, {
+                label: false
+            }),
             "static": true,
             "readonly": true,
             label: field.label,
-            name: field.name,
-            hideLabel: true
+            name: field.name
         }
     }
 }
@@ -12719,7 +12783,9 @@ function getFormPaginationWrapper(props, form, mode) {
         let __wrapperServiceId = "${tableServiceId}";
         let wrapperService = scope.getComponentById(__wrapperServiceId);
         let wrapperServiceData = wrapperService.getData();
-        let lastestFieldValue = wrapperServiceData["${props.name}"] || [];//这里不可以用event.data["${props.name}"]因为amis input talbe有一层单独的作用域，其值会延迟一拍
+        // 这里不可以用event.data["${props.name}"]因为amis input talbe有一层单独的作用域，其值会延迟一拍
+        // 这里如果不.clone的话，在弹出窗口中显示的子表组件，添加行后点窗口的取消按钮关闭窗口后无法把之前的操作还原，即把之前添加的行自动移除
+        let lastestFieldValue = _.clone(wrapperServiceData["${props.name}"] || []);
         //不可以直接像event.data.__tableItems = lastestFieldValue; 这样整个赋值，否则作用域会断
         let mode = "${mode}";
         if(mode === "new"){