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

package/dist/sortable.esm.js

@@ -54943,16 +54943,17 @@ async function getQuickEditSchema(field, options){
                     {
                         actionType: "custom",
                         script: `
+                            console.log("asdasd");
                             let items = _.cloneDeep(event.data.items);
                             let selectedItems = _.cloneDeep(event.data.selectedItems);
                             if(event.data.isBatchEdit){
                                 selectedItems.forEach(function(selectedItem){
                                     selectedItem._display.${field.name} = event.data._display.${field.name};
-                                    doAction({actionType: 'setValue', "args": {"value": selectedItem._display},componentId: ${options.objectName} + "_display_" + selectedItem._index});
+                                    doAction({actionType: 'setValue', "args": {"value": selectedItem._display},componentId: "${options.objectName}" + "_display_" + selectedItem._index});
                                     doAction({actionType: 'setValue', "args": {"value": event.data.${field.name}},componentId: "${options.objectName + "_" + field.name + "_"}" + selectedItem._index});
                                 })
                             }else{
-                                doAction({actionType: 'setValue', "args": {"value": event.data._display},componentId: ${options.objectName} + "_display_" + event.data._index});
+                                doAction({actionType: 'setValue', "args": {"value": event.data._display},componentId: "${options.objectName}" + "_display_" + event.data._index});
                                 doAction({actionType: 'setValue', "args": {"value": event.data.${field.name}},componentId: "${options.objectName + "_" + field.name + "_"}" + event.data._index});
                             }
                         `
@@ -55503,6 +55504,18 @@ async function getTableColumns(fields, options){
             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,
@@ -55599,12 +55612,24 @@ function getMobileLines(tpls){
             // 右侧半行，这里加样式类 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;
@@ -55654,8 +55679,7 @@ async function getMobileTableColumns(fields, options){
             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 });
@@ -55668,7 +55692,7 @@ async function getMobileTableColumns(fields, options){
 
     let column = {
         name: nameField.name,
-        label: nameField.label,
+        label: options.displayAs == 'split' ? '' : nameField.label,
         sortable: nameField.sortable,
         type: "button",
         level: "link",
@@ -59352,9 +59376,11 @@ async function lookupToAmisPicker(field, readonly, ctx){
         */
         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;
         }