@steedos-widgets/sortable 3.6.0-beta.3 → 3.6.0-beta.5

package/dist/sortable.umd.js

@@ -20280,8 +20280,8 @@
     /*
      * @Author: baozhoutao@steedos.com
      * @Date: 2022-07-20 16:29:22
-     * @LastEditors: liaodaxue
-     * @LastEditTime: 2023-09-11 17:19:53
+     * @LastEditors: 殷亮辉 yinlianghui@hotoa.com
+     * @LastEditTime: 2023-12-28 14:59:08
      * @Description: 
      */
 
@@ -20338,6 +20338,21 @@
       return listView;
     }
 
+
+    /**
+     * 获取可比较的amis版本号
+     * @returns 只返回前两位版本，第三位忽略，比如3.6.3返回3.6
+     */
+    function getComparableAmisVersion() {
+      let amis = (window.amisRequire && window.amisRequire('amis')) || window.Amis;
+      let amisVersion = amis && amis.version;
+      if(amisVersion){
+          let comparableVersions = amisVersion.split(".");
+          let comparableVersion = parseFloat(comparableVersions[0].toString() + "." + comparableVersions[1].toString());
+          return comparableVersion;
+      }
+    }
+
     function getNumberTpl(field){
         return `<span>\${_display.${field.name}}</span>`
     }
@@ -20406,7 +20421,7 @@
         if(ctx && ctx.isLookup){
             linkTarget = "target='_blank'";
         }
-        return `<a href="${href}" ${linkTarget}>\${${field.name}}</a>`
+        return `<a href="${href}" ${linkTarget}>\${${field.name} | raw}</a>`
     }
 
     function getRelatedFieldTpl(field, ctx){
@@ -20731,7 +20746,7 @@
      * @Author: baozhoutao@steedos.com
      * @Date: 2022-10-28 14:15:09
      * @LastEditors: liaodaxue
-     * @LastEditTime: 2023-10-30 17:51:54
+     * @LastEditTime: 2023-12-29 10:46:50
      * @Description: 
      */
 
@@ -20785,7 +20800,8 @@
                 dataType: "form-data",
                 url: `\${context.rootUrl}/s3/${tableName}`,
                 requestAdaptor: `
-                const { _master, global,context } = api.body;
+                const superData = (typeof context != 'undefined') ? context : api.body; 
+                const { _master, global } = superData;
                 // const { recordId, objectName } = _master;
                 const { spaceId, userId, user } = global;
                 /*
@@ -20803,8 +20819,9 @@
                 return api;
             `,
                 adaptor: `
-                const { context } = api.body; 
-                var rootUrl = context.rootUrl + "/api/files/${tableName}/";
+                const superData = (typeof context != 'undefined') ? context : api.body; 
+                const { context:pageContext } = superData; 
+                var rootUrl = pageContext.rootUrl + "/api/files/${tableName}/";
                 payload = {
                     status: response.status == 200 ? 0 : response.status,
                     msg: response.statusText,
@@ -21408,8 +21425,9 @@
                     case "avatar":
                     case "image":
                         quickEditSchema.body[0].receiver.adaptor = `
-                        const { context } = api.body; 
-                        var rootUrl = context.rootUrl + "/api/files/${field.type}s/";
+                        const superData = (typeof context != 'undefined') ? context : api.body; 
+                        const { context:pageContext } = superData; 
+                        var rootUrl = pageContext.rootUrl + "/api/files/${field.type}s/";
                         payload = {
                             status: response.status == 200 ? 0 : response.status,
                             msg: response.statusText,
@@ -21812,8 +21830,8 @@
             const href = Router.getObjectDetailPath({
                 ...options,  formFactor: options.formFactor, appId: "${appId}", objectName: options.objectName || "${objectName}", recordId: `\${${options.idFieldName}}`
             });
-            columns[1].type = "tpl";
-            columns[1].tpl = `<a href="${href}">\${${columns[1].name}}</a>`;
+            columns[0].type = "tpl";
+            columns[0].tpl = `<a href="${href}">\${${columns[0].name}}</a>`;
         }
         return columns;
     }
@@ -22072,7 +22090,7 @@
                 type: 'steedos-object-button',
                 name: button.name,
                 objectName: button.objectName,
-                visibleOn: getButtonVisibleOn$1(button),
+                visibleOnAlias: getButtonVisibleOn$1(button),
                 className: 'antd-Button--default'
             });
         });
@@ -22197,7 +22215,8 @@
             }
 
             if(!isLookup && !hiddenColumnOperation){
-                columns.push(await getTableOperation(options));
+                const toolbarOperation = await getTableOperation(options);
+                columns.push(toolbarOperation);
             }
             
         }
@@ -22719,6 +22738,8 @@
   `;
       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";
@@ -22766,7 +22787,20 @@
     // });
 
     // 清除__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);
 
@@ -24233,7 +24267,12 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
     __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
@@ -24246,9 +24285,19 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
     // 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);
   `;
 
@@ -24269,8 +24318,8 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
             "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": {
@@ -24550,6 +24599,9 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
     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");
@@ -24561,7 +24613,20 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
     // 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": "",
@@ -25376,13 +25441,24 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
         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;
@@ -25589,7 +25665,12 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
                 "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){
@@ -25762,7 +25843,7 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
                 sendOn.push(`this.${fName}`);
             });
             if(depend_on.length > 0){
-                apiInfo.url = `${apiInfo.url}?${depend_on.join('&')}`;
+                apiInfo.url = `${apiInfo.url}&${depend_on.join('&')}`;
                 apiInfo.sendOn = `${sendOn.join(' && ')}`;
             }
         }
@@ -25870,6 +25951,13 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
             autoComplete: apiInfo,
             searchable: true,
         };
+        let amisVersion = getComparableAmisVersion();
+        if(amisVersion >= 3.6){
+            // amis 3.6中不加source会造成子表组件中弹出行编辑窗口的lookup字段有时不请求接口（概率现象，同一个地方反复操作有时请求有时不请求）
+            // 但是同时配置autoComplete和source会多请求一次接口
+            // TODO:应该想办法把是否字段在子表组件内，即ctx.isInputTable，如果不在子表组件内不需要加source
+            data.source = apiInfo;
+        }
         //删除xlink:href中的rootUrl前缀，解决客户端svg为空的问题
         const select_menuTpl = `<span class='flex items-center mt-0.5'>
         <span role='img' aria-label='smile' class='anticon anticon-smile'>
@@ -25951,6 +26039,14 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
 
         // 优先取字段中配置的enable_enhanced_lookup，字段上没配置时，才从对象上取enable_enhanced_lookup属性
         let enableEnhancedLookup = lodash.exports.isBoolean(field.enable_enhanced_lookup) ? field.enable_enhanced_lookup : refObject.enable_enhanced_lookup;
+        let amisVersion = getComparableAmisVersion();
+        if(amisVersion >= 3.6){
+            // amis 3.6.3单选的树picker有严重bug（https://github.com/baidu/amis/issues/9279），先强制使用下拉方式显示
+            // amis 3.6.3多选的树会自动把下层节点，及下下层等所有子节点自动选中，跟amis 3.2不一样，而且目前没有开关，这不适合目前的业务场景，也先强制使用下拉方式显示
+            if(enableEnhancedLookup && refObject.enable_tree){
+                enableEnhancedLookup = false;
+            }
+        }
         // 默认使用下拉框模式显示lookup选项，只能配置了enable_enhanced_lookup才使用弹出增强模式
         if(enableEnhancedLookup == true){
             return await lookupToAmisPicker(field, readonly, ctx);
@@ -26832,9 +26928,9 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
         }
         if(!lodash.exports.isEmpty(convertData)){
             if(field.is_wide || convertData.type === 'group'){
-                convertData.className = 'col-span-2 m-1';
+                convertData.className = 'col-span-2 m-0';
             }else {
-                convertData.className = 'm-1';
+                convertData.className = 'm-0';
             }
             if(readonly){
                 convertData.className = `${convertData.className} border-b`;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@steedos-widgets/sortable",
-  "version": "3.6.0-beta.3",
+  "version": "3.6.0-beta.5",
   "main": "dist/sortable.cjs.js",
   "module": "dist/sortable.esm.js",
   "unpkg": "dist/sortable.umd.js",
@@ -45,7 +45,7 @@
   "dependencies": {
     "@dnd-kit/core": "^6.0.5",
     "@dnd-kit/sortable": "^7.0.1",
-    "@steedos-widgets/amis-lib": "3.6.0-beta.3"
+    "@steedos-widgets/amis-lib": "3.6.0-beta.5"
   },
-  "gitHead": "4a2322fc78deefc582e65d5a4a81941d5023ca8f"
+  "gitHead": "7babba3c01fe0aa4410cdc834c862774d4c59824"
 }