@steedos-widgets/sortable 1.3.22-beta.3 → 3.6.0-beta.4

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>`
     }
@@ -21442,7 +21457,7 @@
                             "actions":[
                                 {
                                     "actionType": "setValue",
-                                    "componentId": `service_listview_${options.objectName}`,
+                                    "componentId": quickEditId,
                                     "args": {
                                         "value":{
                                             "quickedit_record_permissions_loading": true
@@ -21467,7 +21482,7 @@
                                 },
                                 {
                                     "actionType": "setValue",
-                                    "componentId": `service_listview_${options.objectName}`,
+                                    "componentId": quickEditId,
                                     "args": {
                                         "value":{
                                             "quickedit_record_permissions_loading": false
@@ -21476,7 +21491,7 @@
                                 },
                                 {
                                     "actionType": "setValue",
-                                    "componentId": `service_listview_${options.objectName}`,
+                                    "componentId": quickEditId,
                                     "args": {
                                         "value":{
                                             "quickedit_record_permissions": "${event.data}"
@@ -21655,8 +21670,6 @@
     async function getTableColumns(fields, options){
         const columns = [];
         if(!options.isLookup && !options.isInputTable){
-            //将_display放入crud的columns中，可以通过setvalue修改行内数据域的_display，而不影响上层items的_display,用于批量编辑
-            columns.push({name: '_display',type: 'static', width: 32, placeholder: "",id: "_display_${_index}", className: "hidden"});
             if(!options.enable_tree){
                 columns.push({name: '_index',type: 'text', width: 32, placeholder: ""});
             }
@@ -21814,8 +21827,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;
     }
@@ -22201,6 +22214,7 @@
             if(!isLookup && !hiddenColumnOperation){
                 columns.push(await getTableOperation(options));
             }
+            
         }
 
         return {
@@ -25480,6 +25494,9 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
         */
         return payload;
     }
+    if(!payload.data.rows){
+        payload.data.rows = [];
+    }
     if(enable_tree){
         const records = payload.data.rows;
         const treeRecords = [];
@@ -25760,7 +25777,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(' && ')}`;
             }
         }
@@ -25868,6 +25885,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'>
@@ -26830,9 +26854,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": "1.3.22-beta.3",
+  "version": "3.6.0-beta.4",
   "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": "1.3.22-beta.3"
+    "@steedos-widgets/amis-lib": "3.6.0-beta.4"
   },
-  "gitHead": "41aa5e54325d6fc200fc0828b09777f6cfc5a7fe"
+  "gitHead": "208ec610433e82578eeb30b5f397a0bfe9284b77"
 }