@steedos-widgets/amis-object 3.6.2-beta.1 → 3.6.2-beta.2

package/dist/amis-object.cjs.js

@@ -5346,6 +5346,18 @@ async function getTableColumns$1(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,
@@ -5442,12 +5454,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;
@@ -5497,8 +5521,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 });
@@ -5511,7 +5534,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",
@@ -6171,6 +6194,13 @@ async function getTableApi(mainObject, fields, options){
         }
         // SteedosUI.getRef(api.body.$self.$scopeId)?.parent?.getComponentById(setDataToComponentId)?.setData({$count: payload.data.count})
     };
+    const listviewComponent = $(".steedos-object-listview .antd-Table-table");
+    const firstListviewComponent = listviewComponent && listviewComponent[0];
+    if(firstListviewComponent){
+        setTimeout(()=>{
+            firstListviewComponent.scrollIntoView();
+        }, 600);
+    }
     ${options.adaptor || ''}
     return payload;
     `;
@@ -11546,6 +11576,10 @@ async function getObjectCRUD(objectSchema, fields, options){
         const rowsDiff = _.cloneDeep(api.data.rowsDiff);
         rowsDiff.forEach(function (item, index) {
           for(key in item){
+            // image、select等字段清空值后保存的空字符串转换为null。
+            if(item[key] === ''){
+              item[key] = null;
+            }
             if(_.includes(imageNames, key)){
               if(typeof item[key] == "string"){
                 const match = item[key].match(/\\/([^\\/]+)$/);
@@ -13938,9 +13972,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;
         }