@steedos-widgets/sortable 3.6.2-beta.1 → 3.6.2-beta.2

package/dist/sortable.umd.js

@@ -21809,6 +21809,18 @@
                 if(field.type === 'datetime'){
                     className += 'datetime-min-w';
                 }
+
+                //field上的amis属性里的clssname需要单独判断类型合并
+                if (typeof field.amis?.className == "object") {
+                    className = {
+                        [className]: "true",
+                        ...field.amis.className
+                    };
+                } else if (typeof field.amis?.className == "string") {
+                    className = `${className} ${field.amis.className} `;
+                }
+                delete field.amis?.className;
+
                 if(!field.hidden && !field.extra){
                     columnItem = Object.assign({}, {
                         name: field.name,
@@ -21905,12 +21917,24 @@
                 // 右侧半行，这里加样式类 flex flex-shrink-0，是为了省略号只显示在左半行，右半行文字一般比较短，如果也加省略号效果的话，左侧文字多的话，右侧没几个字就显示省略号了
                 lineChildrenClassName = "steedos-listview-item-right truncate ml-2 flex flex-shrink-0";
             }
+            //支持字段amis属性配置classname，识别classname的类型，与原样式合并
+            var className;
+            if (typeof item.field.amis?.className == "object") {
+                className = {
+                    [lineChildrenClassName]: "true",
+                    ...item.field.amis.className
+                };
+            } else if (typeof item.field.amis?.className == "string") {
+                className = `${lineChildrenClassName} ${item.field.amis.className} `;
+            } else {
+                className = lineChildrenClassName;
+            }
             lineChildren.push({
                 "type": "tpl",
                 "tpl": item.tpl,
-                "className": lineChildrenClassName
+                className
             });
-
+            
             if(item.field.is_wide){
                 // 宽字段占整行
                 isLeft = true;
@@ -21960,8 +21984,7 @@
                 tpl = await getFieldTpl(field, options);
             }
             if(!tpl){
-                //qhd需求简易处理，加上raw以支持审批王名称字段通过颜色区分缓急，若之后手机端列表支持配置amis，则可以去掉
-                tpl = `\${${field.name} | raw}`;
+                tpl = `\${${field.name}}`;
             }
             if(!field.hidden && !field.extra){
                 tpls.push({ field, tpl });
@@ -21974,7 +21997,7 @@
 
         let column = {
             name: nameField.name,
-            label: nameField.label,
+            label: options.displayAs == 'split' ? '' : nameField.label,
             sortable: nameField.sortable,
             type: "button",
             level: "link",
@@ -25658,9 +25681,11 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
         */
         if(enable_tree){
             const rows = _.map(payload.data.rows, (item)=>{
-                delete item.children;
-                delete item.parent;
-                return item;
+                if (!item.children) {
+                    return { ...item, children: [] };
+                } else {
+                    return item;
+                }
             })
             payload.data.rows = rows;
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@steedos-widgets/sortable",
-  "version": "3.6.2-beta.1",
+  "version": "3.6.2-beta.2",
   "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.2-beta.1"
+    "@steedos-widgets/amis-lib": "3.6.2-beta.2"
   },
-  "gitHead": "51749ac2fcf83301fa5cd22d3116dd1702bc5ef3"
+  "gitHead": "fb8c956f049ba98f7b6ae36f4a4e7760ca088eed"
 }