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

package/dist/assets.json

@@ -3,8 +3,8 @@
         {
             "package": "@steedos-widgets/sortable",
             "urls": [
-                "https://unpkg.com/@steedos-widgets/sortable@3.6.0-beta.3/dist/sortable.umd.js",
-                "https://unpkg.com/@steedos-widgets/sortable@3.6.0-beta.3/dist/sortable.umd.css"
+                "https://unpkg.com/@steedos-widgets/sortable@3.6.0-beta.4/dist/sortable.umd.js",
+                "https://unpkg.com/@steedos-widgets/sortable@3.6.0-beta.4/dist/sortable.umd.css"
             ],
             "library": "BuilderSortable"
         }
@@ -15,10 +15,10 @@
             "npm": {
                 "package": "@steedos-widgets/sortable"
             },
-            "url": "https://unpkg.com/@steedos-widgets/sortable@3.6.0-beta.3/dist/meta.js",
+            "url": "https://unpkg.com/@steedos-widgets/sortable@3.6.0-beta.4/dist/meta.js",
             "urls": {
-                "default": "https://unpkg.com/@steedos-widgets/sortable@3.6.0-beta.3/dist/meta.js",
-                "design": "https://unpkg.com/@steedos-widgets/sortable@3.6.0-beta.3/dist/meta.js"
+                "default": "https://unpkg.com/@steedos-widgets/sortable@3.6.0-beta.4/dist/meta.js",
+                "design": "https://unpkg.com/@steedos-widgets/sortable@3.6.0-beta.4/dist/meta.js"
             }
         }
     ]

package/dist/sortable.cjs.js

@@ -53979,8 +53979,8 @@ const Router = {
 /*
  * @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: 
  */
 
@@ -54037,6 +54037,21 @@ function getLookupListView(refObjectConfig) {
   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>`
 }
@@ -55511,8 +55526,8 @@ async function getTableColumns(fields, options){
         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;
 }
@@ -59461,7 +59476,7 @@ async function lookupToAmisSelect(field, readonly, ctx){
             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(' && ')}`;
         }
     }
@@ -59569,6 +59584,13 @@ async function lookupToAmisSelect(field, readonly, ctx){
         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'>
@@ -60531,9 +60553,9 @@ async function convertSFieldToAmisField(field, readonly, ctx) {
     }
     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`;