@steedos-widgets/amis-lib 3.6.2-beta.8 → 3.6.2-beta.9

package/dist/index.esm.js

@@ -340,22 +340,26 @@ const getSteedosAuth = () => {
  * @Description:
  */
 
-
 const Router = {
     getTabDisplayAs(tab_id){
+        const uiSchema = getUISchemaSync$1(tab_id, false);
         var urlSearch = new URLSearchParams(document.location.search); 
         if(urlSearch.has('display')){
             return urlSearch.get('display')
         }
         const key = `tab_${tab_id}_display`;
         // const key = `page_display`;
-        const value = localStorage.getItem(key);
-        return value ? value : 'grid'
+        const value = sessionStorage.getItem(key);
+        let defaultDisplay = "grid";
+        if(uiSchema.enable_split){
+            defaultDisplay = "split";
+        }
+        return value ? value : defaultDisplay;
     },
   
     setTabDisplayAs(tab_id, displayAs){
         const key = `tab_${tab_id}_display`;
-        localStorage.setItem(key, displayAs);
+        sessionStorage.setItem(key, displayAs);
     },
     getAppPath({formFactor, appId}){
         return `/app/${appId}`;
@@ -2060,7 +2064,11 @@ async function getTableColumns(fields, options){
         const quickEditSchema = allowEdit ? await getQuickEditSchema(field, options) : allowEdit;
         let className = "";
         if(field.wrap != true){
-            className += " whitespace-nowrap ";
+            if(field.wrap != false && field.is_wide){
+                className += " break-words ";
+            }else {
+                className += " whitespace-nowrap ";
+            }
         }else {
             className += " break-words ";
         }
@@ -2159,12 +2167,12 @@ async function getTableColumns(fields, options){
             if(field.type === 'textarea'){
                 className += 'min-w-56';
             }
-            if(field.type === 'date'){
-                className += 'date-min-w';
-            }
-            if(field.type === 'datetime'){
-                className += 'datetime-min-w';
-            }
+            // if(field.type === 'date'){
+            //     className += 'date-min-w';
+            // }
+            // if(field.type === 'datetime'){
+            //     className += 'datetime-min-w';
+            // }
 
             //field上的amis属性里的clssname需要单独判断类型合并
             if (typeof field.amis?.className == "object") {
@@ -6731,8 +6739,27 @@ async function getObjectRecordDetailHeader(objectSchema, recordId, options) {
   let max = 10;
   if(options.formFactor === 'SMALL'){
     max = 4;
+  }else {
+
+    let divWidth = window.innerWidth;
+
+    if(options.display === 'split'){
+      divWidth = divWidth - 388;
+    }
+
+    if(document.body.classList.contains('sidebar')){
+      divWidth = divWidth - 210;
+    }
+
+    // 根据屏幕宽度计算显示数量, 使高亮字段只占1行
+    max = Math.trunc(divWidth / 200 );
+    if(max > 10){
+      max = 10;
+    }
   }
 
+  // console.log('=======================max=========================', max)
+
   if(objectSchema.compactLayouts){
     const details = [];
     _.each(_.slice(_.difference(objectSchema.compactLayouts, [objectSchema.NAME_FIELD_KEY]), 0, max), (fieldName)=>{
@@ -6746,11 +6773,26 @@ async function getObjectRecordDetailHeader(objectSchema, recordId, options) {
       }
     });
 
+    // 注意: 以下注释不能删除. tailwind css 动态编译时会识别以下注释, 生成对应的样式
+    // xl:grid-cols-1
+    // xl:grid-cols-2
+    // xl:grid-cols-3
+    // xl:grid-cols-4
+    // xl:grid-cols-5
+    // xl:grid-cols-6
+    // xl:grid-cols-7
+    // xl:grid-cols-8
+    // xl:grid-cols-9
+    // xl:grid-cols-10
+    // xl:grid-cols-11
+    // xl:grid-cols-12
+
     body.push({
       "type": "wrapper",
       "body": {
         "type": "form",
-        "className": "gap-2 grid grid-cols-1 sm:grid-cols-2 md:grid-cols-3 lg:grid-cols-4 xl:grid-cols-5 2xl:grid-cols-5 3xl:grid-cols-8 4xl:grid-cols-8 5xl:grid-cols-10", //max-h-12 overflow-hidden 
+        // "className": "gap-2 grid grid-cols-1 sm:grid-cols-2 md:grid-cols-3 lg:grid-cols-4 xl:grid-cols-5 2xl:grid-cols-5 3xl:grid-cols-8 4xl:grid-cols-8 5xl:grid-cols-10", //max-h-12 overflow-hidden 
+        "className": `gap-2 grid grid-cols-1 sm:grid-cols-2 md:grid-cols-3 lg:grid-cols-5 xl:grid-cols-${max}`,
         "wrapWithPanel": false,
         "actions": [],
         "body": details,
@@ -7820,14 +7862,14 @@ const getDisplayAsButton = function(objectName, showDisplayAs){
     {
       "type": "button",
       "label": i18next.t('frontend_display_type_is_table'),
-      "onClick": "const key = 'tab_"+objectName+"_display';localStorage.setItem(key, 'grid');let url = document.location.pathname; var urlSearch = new URLSearchParams(document.location.search); if(urlSearch.get(\"side_object\") && urlSearch.get(\"side_listview_id\")){url=`/app/${props.data.appId}/${urlSearch.get(\"side_object\")}/grid/${urlSearch.get(\"side_listview_id\")}`;}; props.env.jumpTo(url + '?display=grid');",
+      "onClick": "const key = 'tab_"+objectName+"_display';sessionStorage.setItem(key, 'grid');let url = document.location.pathname; var urlSearch = new URLSearchParams(document.location.search); if(urlSearch.get(\"side_object\") && urlSearch.get(\"side_listview_id\")){url=`/app/${props.data.appId}/${urlSearch.get(\"side_object\")}/grid/${urlSearch.get(\"side_listview_id\")}`;}; props.env.jumpTo(url + '?display=grid');",
       "rightIcon": displayAs != 'split' ? "fa fa-check" : null,
       "rightIconClassName": "m-l-sm"
     },
     {
       "type": "button",
       "label": i18next.t('frontend_display_type_is_split'),
-      "onClick": "const key = 'tab_"+objectName+"_display';localStorage.setItem(key, 'split');const url = document.location.pathname + '?display=split'; props.env.jumpTo(url);",
+      "onClick": "const key = 'tab_"+objectName+"_display';sessionStorage.setItem(key, 'split');const url = document.location.pathname + '?display=split'; props.env.jumpTo(url);",
       "rightIcon": displayAs === 'split' ? "fa fa-check" : null,
       "rightIconClassName": "m-l-sm"
     }
@@ -12885,7 +12927,7 @@ async function getFormBody(permissionFields, formFields, ctx){
  * @Author: 殷亮辉 yinlianghui@hotoa.com
  * @Date: 2023-11-15 09:50:22
  * @LastEditors: 殷亮辉 yinlianghui@hotoa.com
- * @LastEditTime: 2024-01-17 17:15:57
+ * @LastEditTime: 2024-01-18 10:29:57
  */
 
 /**
@@ -12906,6 +12948,26 @@ function getTableValueWithoutFieldPrefix(value, fieldPrefix){
     return convertedValue;
 }
 
+/**
+ * 子表组件字段值中每行数据的键值key补上指定前缀
+ * @param {*} value 子表组件字段值，数组
+ * @param {*} fieldPrefix 字段前缀
+ * @returns 转换后的子表组件字段值
+ */
+function getTableValuePrependFieldPrefix(value, fieldPrefix){
+    let convertedValue = [];
+    (value || []).forEach((itemValue)=>{
+        var newItemValue = {};
+        for(let n in itemValue){
+            if(typeof itemValue[n] !== undefined){
+                newItemValue[`${fieldPrefix}${n}`] = itemValue[n];
+            }
+        }
+        convertedValue.push(newItemValue);
+    });
+    return convertedValue;
+}
+
 /**
  * 子表组件字段集合属性中每个字段name移除指定前缀
  * @param {*} fields 子表组件字段集合，数组
@@ -13869,7 +13931,6 @@ const getAmisInputTableSchema = async (props) => {
     if (props.fieldPrefix) {
         props.fields = getTableFieldsWithoutFieldPrefix(props.fields, props.fieldPrefix);
     }
-    console.log("=getAmisInputTableSchema==props.fields, props.fieldPrefix===", props.fields, props.fieldPrefix);
     let serviceId = getComponentId("table_service", props.id);
     let buttonsForColumnOperations = [];
     let inlineEditMode = props.inlineEditMode;
@@ -13905,6 +13966,7 @@ const getAmisInputTableSchema = async (props) => {
             buttonsForColumnOperations.push(buttonDeleteSchema);
         }
     }
+    let amis = props["input-table"] || props.amis;//额外支持"input-table"代替amis属性，是因为在字段yml文件中用amis作为key不好理解
     let inputTableSchema = {
         "type": "input-table",
         "label": props.label,
@@ -13924,15 +13986,33 @@ const getAmisInputTableSchema = async (props) => {
         "showFooterAddBtn": false,
         "className": props.tableClassName,
         "pipeOut": (value, data) => {
-            return (value || []).map(function(item){
+            value = (value || []).map(function(item){
                 delete item.__fix_rerender_after_children_modified_tag;
                 return item;
             });
+            if(props.fieldPrefix){
+                value = getTableValuePrependFieldPrefix(value, props.fieldPrefix);
+            }
+            if(amis.pipeOut){
+                if(typeof amis.pipeOut === 'function'){
+                    return amis.pipeOut(value, data);
+                }
+            }
+            return value;
         }
     };
+    if(amis.pipeIn){
+        inputTableSchema.pipeIn = amis.pipeIn;
+    }
     if(props.fieldPrefix){
         inputTableSchema.pipeIn = (value, data) => {
-            return getTableValueWithoutFieldPrefix(value, props.fieldPrefix);
+            value = getTableValueWithoutFieldPrefix(value, props.fieldPrefix);
+            if(amis.pipeIn){
+                if(typeof amis.pipeIn === 'function'){
+                    return amis.pipeIn(value, data);
+                }
+            }
+            return value;
         };
     }
     if (buttonsForColumnOperations.length) {
@@ -13946,10 +14026,11 @@ const getAmisInputTableSchema = async (props) => {
     if (showAsInlineEditMode) {
         inputTableSchema.needConfirm = false;
     }
-    let amis = props["input-table"] || props.amis;//额外支持"input-table"代替amis属性，是因为在字段yml文件中用amis作为key不好理解
     if (amis) {
         // 支持配置amis属性重写或添加最终生成的input-table中任何属性。
         delete amis.id;//如果steedos-input-table组件配置了amis.id属性，会造成新建编辑行功能不生效
+        delete amis.pipeIn;//该属性在上面合并过了
+        delete amis.pipeOut;//该属性在上面合并过了
         Object.assign(inputTableSchema, amis);
     }
     const isAnyFieldHasDependOn = (props.fields || []).find(function (item) {