@steedos-widgets/amis-object 1.3.4-beta.6 → 1.3.4-beta.7

package/dist/amis-object.cjs.css

@@ -286,6 +286,12 @@ fieldset.antd-Collapse > legend{
     border-radius: var(--Form-input-borderRadius);
 }
 
+.antd-Picker .antd-Picker-input .antd-Picker-values .antd-Picker-value{
+    /* lookup字段值选中项值字符很多超长时换行，包括单选和多选 */
+    white-space: break-spaces;
+    word-break: break-all;
+}
+
 .ant-dropdown-menu {
     border: 1px solid #e5e5e5;
     border-radius: 0.25rem;
@@ -1321,6 +1327,127 @@ fieldset.antd-Collapse > legend{
 .antd-ButtonGroup--vertical .steedos-object-button + .steedos-object-button {
   margin-left: 0px;
 }
+.whitespace-nowrap-table-cell-text-overflow-ellipsis-content {
+  overflow: hidden;
+  text-overflow: ellipsis;
+}
+.whitespace-nowrap-table-cell-text-overflow-ellipsis-content > .antd-Form-static {
+  /*上面的样式无法解决url类型字段省略号问题*/
+  overflow: hidden;
+  text-overflow: ellipsis;
+}
+.whitespace-nowrap-table-cell-text-overflow-ellipsis-content > .antd-Form-static > .antd-Form-control .antd-TplField > span > a {
+  /*上面的样式无法解决附件类型字段省略号问题*/
+  overflow: hidden;
+  text-overflow: ellipsis;
+}
+.whitespace-nowrap-table-cell-text-overflow-ellipsis .antd-Crud .antd-Table .antd-Table-content tbody td.whitespace-nowrap > div {
+  /*各种字段类型在不支持快速编辑的单元格中文字超长时显示省略号*/
+  overflow: hidden;
+  text-overflow: ellipsis;
+}
+.whitespace-nowrap-table-cell-text-overflow-ellipsis .antd-Crud .antd-Table .antd-Table-content tbody td.whitespace-nowrap > div > .antd-Form-static {
+  /*上面的样式无法解决url类型字段省略号问题*/
+  overflow: hidden;
+  text-overflow: ellipsis;
+}
+.whitespace-nowrap-table-cell-text-overflow-ellipsis .antd-Crud .antd-Table .antd-Table-content tbody td.whitespace-nowrap > div > .antd-Form-static > .antd-Form-control .antd-TplField > span > a {
+  /*上面的样式无法解决附件类型字段省略号问题*/
+  overflow: hidden;
+  text-overflow: ellipsis;
+}
+.whitespace-nowrap-table-cell-text-overflow-ellipsis .antd-Crud .antd-Table .antd-Table-content tbody td.whitespace-nowrap.antd-Field--quickEditable {
+  /*各种字段类型在支持快速编辑的单元格中文字超长时显示省略号*/
+}
+.whitespace-nowrap-table-cell-text-overflow-ellipsis .antd-Crud .antd-Table .antd-Table-content tbody td.whitespace-nowrap.antd-Field--quickEditable > div > div {
+  /*这里写在第二层div中是因为第一层div是display: flex;无法实现省略号*/
+  overflow: hidden;
+  text-overflow: ellipsis;
+}
+.whitespace-nowrap-table-cell-text-overflow-ellipsis .antd-Crud .antd-Table .antd-Table-content tbody td.whitespace-nowrap.antd-Field--quickEditable > div > div > .antd-Form-static {
+  /*上面的样式无法解决url类型字段省略号问题*/
+  overflow: hidden;
+  text-overflow: ellipsis;
+}
+.whitespace-nowrap-table-cell-text-overflow-ellipsis .antd-Crud .antd-Table .antd-Table-content tbody td.whitespace-nowrap.antd-Field--quickEditable > div > div > .antd-Form-static > .antd-Form-control .antd-TplField > span > a {
+  /*上面的样式无法解决附件类型字段省略号问题*/
+  overflow: hidden;
+  text-overflow: ellipsis;
+}
+@media (min-width: 767px) {
+  .steedos-object-table {
+    /*对象表格组件各种字段类型文字超长时显示省略号*/
+  }
+  .steedos-object-table .antd-Crud .antd-Table .antd-Table-content tbody td.whitespace-nowrap > div {
+    /*各种字段类型在不支持快速编辑的单元格中文字超长时显示省略号*/
+    overflow: hidden;
+    text-overflow: ellipsis;
+  }
+  .steedos-object-table .antd-Crud .antd-Table .antd-Table-content tbody td.whitespace-nowrap > div > .antd-Form-static {
+    /*上面的样式无法解决url类型字段省略号问题*/
+    overflow: hidden;
+    text-overflow: ellipsis;
+  }
+  .steedos-object-table .antd-Crud .antd-Table .antd-Table-content tbody td.whitespace-nowrap > div > .antd-Form-static > .antd-Form-control .antd-TplField > span > a {
+    /*上面的样式无法解决附件类型字段省略号问题*/
+    overflow: hidden;
+    text-overflow: ellipsis;
+  }
+  .steedos-object-table .antd-Crud .antd-Table .antd-Table-content tbody td.whitespace-nowrap.antd-Field--quickEditable {
+    /*各种字段类型在支持快速编辑的单元格中文字超长时显示省略号*/
+  }
+  .steedos-object-table .antd-Crud .antd-Table .antd-Table-content tbody td.whitespace-nowrap.antd-Field--quickEditable > div > div {
+    /*这里写在第二层div中是因为第一层div是display: flex;无法实现省略号*/
+    overflow: hidden;
+    text-overflow: ellipsis;
+  }
+  .steedos-object-table .antd-Crud .antd-Table .antd-Table-content tbody td.whitespace-nowrap.antd-Field--quickEditable > div > div > .antd-Form-static {
+    /*上面的样式无法解决url类型字段省略号问题*/
+    overflow: hidden;
+    text-overflow: ellipsis;
+  }
+  .steedos-object-table .antd-Crud .antd-Table .antd-Table-content tbody td.whitespace-nowrap.antd-Field--quickEditable > div > div > .antd-Form-static > .antd-Form-control .antd-TplField > span > a {
+    /*上面的样式无法解决附件类型字段省略号问题*/
+    overflow: hidden;
+    text-overflow: ellipsis;
+  }
+}
+.antd-Modal .antd-Modal-body {
+  /*lookup字段弹出窗口中各种字段类型的列文字超长时显示省略号*/
+}
+.antd-Modal .antd-Modal-body .antd-Crud .antd-Table .antd-Table-content tbody td.whitespace-nowrap > div {
+  /*各种字段类型在不支持快速编辑的单元格中文字超长时显示省略号*/
+  overflow: hidden;
+  text-overflow: ellipsis;
+}
+.antd-Modal .antd-Modal-body .antd-Crud .antd-Table .antd-Table-content tbody td.whitespace-nowrap > div > .antd-Form-static {
+  /*上面的样式无法解决url类型字段省略号问题*/
+  overflow: hidden;
+  text-overflow: ellipsis;
+}
+.antd-Modal .antd-Modal-body .antd-Crud .antd-Table .antd-Table-content tbody td.whitespace-nowrap > div > .antd-Form-static > .antd-Form-control .antd-TplField > span > a {
+  /*上面的样式无法解决附件类型字段省略号问题*/
+  overflow: hidden;
+  text-overflow: ellipsis;
+}
+.antd-Modal .antd-Modal-body .antd-Crud .antd-Table .antd-Table-content tbody td.whitespace-nowrap.antd-Field--quickEditable {
+  /*各种字段类型在支持快速编辑的单元格中文字超长时显示省略号*/
+}
+.antd-Modal .antd-Modal-body .antd-Crud .antd-Table .antd-Table-content tbody td.whitespace-nowrap.antd-Field--quickEditable > div > div {
+  /*这里写在第二层div中是因为第一层div是display: flex;无法实现省略号*/
+  overflow: hidden;
+  text-overflow: ellipsis;
+}
+.antd-Modal .antd-Modal-body .antd-Crud .antd-Table .antd-Table-content tbody td.whitespace-nowrap.antd-Field--quickEditable > div > div > .antd-Form-static {
+  /*上面的样式无法解决url类型字段省略号问题*/
+  overflow: hidden;
+  text-overflow: ellipsis;
+}
+.antd-Modal .antd-Modal-body .antd-Crud .antd-Table .antd-Table-content tbody td.whitespace-nowrap.antd-Field--quickEditable > div > div > .antd-Form-static > .antd-Form-control .antd-TplField > span > a {
+  /*上面的样式无法解决附件类型字段省略号问题*/
+  overflow: hidden;
+  text-overflow: ellipsis;
+}
 
 
 .steedos-dropdown-button-overlay .ant-dropdown-menu-item {
@@ -1435,6 +1562,9 @@ fieldset.antd-Collapse > legend{
   .steedos-object-form .steedos-markdown .antd-Tabs-pane.is-active {
     display: block;
   }
+  .antd-Select-popover .antd-Select-menu .antd-Select-option .antd-Checkbox--checkbox {
+    white-space: nowrap;
+  }
   .antd-Select-popover .antd-Select-menu .antd-Select-option .antd-Checkbox--checkbox > span {
     vertical-align: text-top;
   }
@@ -1568,22 +1698,17 @@ fieldset.antd-Collapse > legend{
 }
 
 @media (min-width: 767px) {
-  .steedos-object-table tbody td.antd-Field--quickEditable div {
+  .steedos-object-table tbody td.antd-Field--quickEditable > div {
     display: flex;
     align-items: center;
     justify-content: space-between;
   }
-  .steedos-object-table tbody td.antd-Field--quickEditable div .antd-Field-quickEditBtn {
+  .steedos-object-table tbody td.antd-Field--quickEditable > div .antd-Field-quickEditBtn {
     padding-right: 13px;
   }
-  .steedos-object-table tbody td.antd-Field--quickEditable div .antd-Field-quickEditBtn svg {
+  .steedos-object-table tbody td.antd-Field--quickEditable > div .antd-Field-quickEditBtn svg {
     display: none;
   }
-  .steedos-object-table tbody td.whitespace-nowrap span.antd-TplField {
-    width: 100%;
-    overflow: hidden;
-    text-overflow: ellipsis;
-  }
   .steedos-object-table tbody td.antd-Field--quickEditable:hover div .antd-Field-quickEditBtn {
     padding-right: 0;
   }
@@ -1683,7 +1808,7 @@ fieldset.antd-Collapse > legend{
 .antd-Nav-Menu-overflow-item {
   height: 100% !important;
 }
-.steedos-global-footer .antd-Nav-Menu-light .antd-Nav-Menu-item.antd-Nav-Menu-item-selected {
+.steedos-global-footer .antd-Nav-Menu-item.antd-Nav-Menu-item-selected {
   background: transparent;
 }
 .steedos-global-footer-popup .antd-Nav-Menu-item-wrap {

package/dist/amis-object.cjs.js

@@ -4999,7 +4999,7 @@ const parseSingleExpression$1 = function (func, formData, dataPath, global, user
  * @Author: baozhoutao@steedos.com
  * @Date: 2022-11-01 15:51:00
  * @LastEditors: 殷亮辉 yinlianghui@hotoa.com
- * @LastEditTime: 2023-09-23 11:25:18
+ * @LastEditTime: 2023-09-25 14:53:05
  * @Description: 
  */
 
@@ -5078,10 +5078,15 @@ const getSchema$5 = async (uiSchema, ctx) => {
         }, 200);
     `;
     const getSelectedRowsScript = `
+        const isLookup = event.data.isLookup;
+        if(isLookup){
+            // lookup弹出窗口的新建功能不需要支持复制新建
+            return;
+        }
         const uiSchema = event.data.uiSchema;
         const objectName = event.data.objectName;
         const listViewRef = event.context.scoped.getComponentById("listview_" + objectName);
-        const selectedItems = listViewRef.props.store.toJSON().selectedItems || [];
+        const selectedItems = listViewRef && listViewRef.props.store.toJSON().selectedItems || [];
         event.data.selectedIds = _.map(selectedItems, uiSchema.idFieldName || '_id');
     `;
     return {
@@ -13385,6 +13390,13 @@ async function getObjectCRUD(objectSchema, fields, options){
             Authorization: "Bearer ${context.tenantId},${context.authToken}",
           },
           requestAdaptor: quickSaveApiRequestAdaptor,
+          adaptor: `
+              if(payload.errors){
+                  payload.status = 2;
+                  payload.msg = window.t ? window.t(payload.errors[0].message) : payload.errors[0].message;
+              }
+              return payload;
+          `
         },
         rowClassNameExpr: options.rowClassNameExpr
       }, bodyProps);
@@ -13729,7 +13741,7 @@ const getRecordPermissions = async (objectName, recordId)=>{
  * @Author: baozhoutao@steedos.com
  * @Date: 2022-07-05 15:55:39
  * @LastEditors: liaodaxue
- * @LastEditTime: 2023-08-28 14:55:23
+ * @LastEditTime: 2023-09-25 17:18:08
  * @Description:
  */
 
@@ -13905,6 +13917,7 @@ async function getRecordDetailRelatedListSchema(objectName, recordId, relatedObj
         // tableHiddenOn: hiddenEmptyTable ? "this.$count === 0" : null,
         appId: appId,
         crudClassName: 'border-t border-gray-300 hidden',
+        refField,
         ...ctx
     };
     const amisSchema= (await getRelatedListSchema(relatedObjectName, 'all', options)).amisSchema;
@@ -14019,10 +14032,33 @@ async function getRelatedListSchema(
     ctx
   ) {
     const uiSchema = await getUISchema(objectName);
-    const listView = uiSchema.list_views;
+    const listView =  _$1.find(
+        uiSchema.list_views,
+        (listView, name) => {
+            // 传入listViewName空值则取第一个
+            if(!listViewName){
+                listViewName = name;
+            }
+            return name === listViewName || listView._id === listViewName;
+        }
+    );
     const listViewProps = getRelatedListProps(uiSchema,listViewName, ctx);
     // console.log('listViewProps==>', listViewProps)
     const {columns: listViewColumns, sort: listViewSort, filter: listviewFilter, filtersFunction } = listViewProps;
+
+    const refFieldName = ctx.refField && ctx.refField.name;
+
+    let relatedListColumns = listViewColumns;
+    if(refFieldName){
+        relatedListColumns = listViewColumns.filter(function(columnItem){
+            if(typeof columnItem === "string"){
+                return columnItem !== refFieldName;
+            }
+            else {
+                return columnItem.field !== refFieldName;
+            }
+        });
+    }
   
     const defaults = ctx.defaults || {};
   
@@ -14060,7 +14096,7 @@ async function getRelatedListSchema(
     const amisSchema = {
         "type": "steedos-object-table",
         "objectApiName": objectName,
-        "columns": listViewColumns,
+        "columns": relatedListColumns,
         "extraColumns": listView.extra_columns,
         "filters": listviewFilter,
         "filtersFunction": filtersFunction,