@steedos-widgets/amis-lib 3.6.4-beta.3 → 3.6.4-beta.5

package/dist/index.esm.js

@@ -1653,7 +1653,8 @@ i18next
     }
   });
 
-async function getQuickEditSchema(field, options){
+async function getQuickEditSchema(object, columnField, options){
+    let field = object.fields[columnField.name];
     //判断在amis3.2以上环境下，放开批量编辑与lookup的单元格编辑
     let isAmisVersionforBatchEdit = false;
     if(window.amisRequire && window.amisRequire('amis')){
@@ -2121,7 +2122,7 @@ function getFieldWidth(width){
     }
 }
 
-async function getTableColumns(fields, options){
+async function getTableColumns(object, fields, options){
     const columns = [];
     if(!options.isLookup && !options.isInputTable){
         if(!options.enable_tree){
@@ -2135,7 +2136,7 @@ async function getTableColumns(fields, options){
             continue;
         }
         //增加quickEdit属性，实现快速编辑
-        const quickEditSchema = allowEdit ? await getQuickEditSchema(field, options) : allowEdit;
+        const quickEditSchema = allowEdit ? await getQuickEditSchema(object, field, options) : allowEdit;
         let className = "";
         const bowserType = getBowserType();
         if(bowserType === "Safari"){
@@ -2649,7 +2650,7 @@ async function getTableOperation(ctx){
                 "label": "xxx",
                 "buttons": operationButtons,
                 "placement": "bottomRight",
-                "overlayClassName": "shadow !min-w-[160px]",
+                "overlayClassName": "border rounded !min-w-[160px]",
                 "trigger": ["click"],
                 "id": "u:c2140a365019",
                 onOpenApi: {
@@ -2707,7 +2708,7 @@ async function getDefaultCrudCard(columns, options) {
     return card;
 }
 
-async function getTableSchema$1(fields, options){
+async function getTableSchema$1(object, fields, options){
     if(!options){
         options = {};
     }
@@ -2729,7 +2730,7 @@ async function getTableSchema$1(fields, options){
         columns = await getMobileTableColumns(fields, options);
     }
     else {
-        columns = await getTableColumns(fields, options);
+        columns = await getTableColumns(object, fields, options);
 
         if(listSchema.mode === "cards"){
             let card = listSchema.card;
@@ -5727,6 +5728,7 @@ const getObjectDetailButtonsSchemas = (objectSchema, recordId, ctx)=>{
                 type: "steedos-dropdown-button",
                 label: "",
                 buttons: moreButtons,
+                "overlayClassName": "border rounded !min-w-[160px]",
                 className: 'slds-icon ml-1',
                 visibleOn: moreButtonsVisibleOn
             };
@@ -8817,7 +8819,7 @@ async function getObjectCRUD(objectSchema, fields, options){
         crudId: listSchema.id || id, enable_tree: objectSchema.enable_tree
       }, options);
       tableOptions.amisData = createObject(options.amisData || {}, {});
-      const table = await getTableSchema$1(fields, tableOptions);
+      const table = await getTableSchema$1(objectSchema, fields, tableOptions);
       // delete table.mode;
       //image与avatar需要在提交修改时特别处理
       const imageNames = ___default.compact(___default.map(___default.filter(fields, (field) => ["image","avatar"].includes(field.type)), 'name'));
@@ -9084,7 +9086,7 @@ async function getObjectForm(objectSchema, ctx){
         body: {
           type: 'wrapper',
           className: 'p-0 m-0',
-          body: await getFormBody(fields, formFields, Object.assign({}, ctx, {fieldGroups: objectSchema.field_groups})),
+          body: await getFormBody(fields, formFields, Object.assign({}, ctx, {fieldGroups: objectSchema.field_groups, omitReadonlyFields: true})),
           hiddenOn: "${editFormInited != true}",
         },
         panelClassName:'m-0 sm:rounded-lg shadow-none border-none',
@@ -9692,8 +9694,8 @@ async function getObjectRelatedListsMiniSchema(objectApiName){
 /*
  * @Author: baozhoutao@steedos.com
  * @Date: 2022-07-05 15:55:39
- * @LastEditors: baozhoutao@steedos.com
- * @LastEditTime: 2024-02-18 16:05:21
+ * @LastEditors: 殷亮辉 yinlianghui@hotoa.com
+ * @LastEditTime: 2024-02-23 16:37:06
  * @Description:
  */
 
@@ -10041,6 +10043,7 @@ async function convertColumnsToTableFields(columns, uiSchema, ctx = {}) {
     let fields = [];
     for (const column of columns) {
         if (isString(column)) {
+            let columnField;
             if (column.indexOf('.') > 0) {
                 const fieldName = column.split('.')[0];
                 const displayName = column.split('.')[1];
@@ -10048,23 +10051,30 @@ async function convertColumnsToTableFields(columns, uiSchema, ctx = {}) {
                 if (filedInfo && (filedInfo.type === 'lookup' || filedInfo.type === 'master_detail') && isString(filedInfo.reference_to)) {
                     const rfUiSchema = await getUISchema(filedInfo.reference_to);
                     const rfFieldInfo = rfUiSchema.fields[displayName];
-                    fields.push(Object.assign({}, rfFieldInfo, { name: `${fieldName}__expand.${displayName}`, expand: true, expandInfo: { fieldName, displayName } }, ctx));
+                    columnField = Object.assign({}, rfFieldInfo, { name: `${fieldName}__expand.${displayName}`, expand: true, expandInfo: { fieldName, displayName } }, ctx);
                 }else if(filedInfo && filedInfo.type === 'object'){
-                    fields.push(uiSchema.fields[column]);
+                    columnField = uiSchema.fields[column];
                 }
             } else {
                 if (uiSchema.fields[column]) {
-                    fields.push(Object.assign({}, uiSchema.fields[column], ctx));
+                    columnField = Object.assign({}, uiSchema.fields[column], ctx);
                 }
                 else if(ctx.extra){
                     // 配置列表视图extra_columns时允许字段是hidden的，hidden的字段在uiSchema.fields中不存在
-                    fields.push({
+                    columnField = {
                         extra: true,
                         name: column
-                    });
+                    };
                 }
             }
+            if(columnField){
+                // 列上的字段不认uiSchema.fields中定义的amis属性
+                columnField = Object.assign({}, columnField, {amis: undefined});
+                fields.push(columnField);
+            }
+
         } else if (isObject$1(column)) {
+            let columnField;
             if (column.field.indexOf('.') > 0) {
                 const fieldName = column.field.split('.')[0];
                 const displayName = column.field.split('.')[1];
@@ -10072,33 +10082,34 @@ async function convertColumnsToTableFields(columns, uiSchema, ctx = {}) {
                 if (filedInfo && (filedInfo.type === 'lookup' || filedInfo.type === 'master_detail') && isString(filedInfo.reference_to)) {
                     const rfUiSchema = await getUISchema(filedInfo.reference_to);
                     const rfFieldInfo = rfUiSchema.fields[displayName];
-                    fields.push(Object.assign({}, rfFieldInfo, ctx,
+                    columnField = Object.assign({}, rfFieldInfo, ctx,
                         { name: `${fieldName}__expand.${displayName}`, expand: true, expandInfo: { fieldName, displayName } },
                         {
                             width: column.width,
-                            wrap: column.wrap, // wrap = true 是没效果的
-                            amis: column.amis
+                            wrap: column.wrap // wrap = true 是没效果的
                         }
-                    ));
+                    );
                 }
             } else {
                 if (uiSchema.fields[column.field]) {
-                    fields.push(
-                        Object.assign({}, uiSchema.fields[column.field], ctx, {
-                            width: column.width,
-                            wrap: column.wrap, // wrap = true 是没效果的
-                            amis: column.amis
-                        })
-                    );
+                    columnField = Object.assign({}, uiSchema.fields[column.field], ctx, {
+                        width: column.width,
+                        wrap: column.wrap // wrap = true 是没效果的
+                    });
                 }
                 else if(ctx.extra){
                     // 配置列表视图extra_columns时允许字段是hidden的，hidden的字段在uiSchema.fields中不存在
-                    fields.push({
+                    columnField = {
                         extra: true,
                         name: column.field
-                    });
+                    };
                 }
             }
+            if(columnField){
+                // 列上的字段不认uiSchema.fields中定义的amis属性，用列上配置的amis覆盖
+                columnField = Object.assign({}, columnField, {amis: column.amis});
+                fields.push(columnField);
+            }
         }
     }
     return fields;
@@ -10212,7 +10223,7 @@ async function getRecordDetailSchema(objectName, appId, props = {}){
     };
     const content = {
         "type": "tabs",
-        "className": "steedos-record-tabs bg-white p-4 mt-3 border-y",
+        "className": "steedos-record-tabs bg-white p-4 mt-2",
         "contentClassName": "bg-none",
         "tabs": [
             detailed
@@ -11428,7 +11439,7 @@ async function lookupToAmisPicker(field, readonly, ctx){
         if(refObjectConfig.name === 'organizations'){
           labelFieldName = 'name';
         }
-        pickerSchema = await getTableSchema$1(tableFields, {
+        pickerSchema = await getTableSchema$1(refObjectConfig, tableFields, {
             labelFieldName,
             top:  top,
             isLookup: true,
@@ -12036,7 +12047,7 @@ async function getIdsPickerSchema(field, readonly, ctx){
             actions: false
         });
     }else {
-        pickerSchema = await getTableSchema$1(tableFields, {
+        pickerSchema = await getTableSchema$1(refObjectConfig, tableFields, {
             labelFieldName: refObjectConfig.NAME_FIELD_KEY,
             top:  top,
             isLookup: true,
@@ -13183,15 +13194,15 @@ var index = /*#__PURE__*/Object.freeze({
 /*
  * @Author: baozhoutao@steedos.com
  * @Date: 2022-05-26 16:02:08
- * @LastEditors: 殷亮辉 yinlianghui@hotoa.com
- * @LastEditTime: 2023-11-29 17:48:27
+ * @LastEditors: yinlianghui@hotoa.com yinlianghui@hotoa.com
+ * @LastEditTime: 2024-02-25 14:13:10
  * @Description: 
  */
 
 const getFieldSchemaArray = (formFields, ctx) => {
   let fieldSchemaArray = [];
   fieldSchemaArray.length = 0;
-  const recordId = ctx && ctx.recordId;
+  ctx && ctx.recordId;
 
   _$1.forEach(formFields, (field) => {
     if (!field.group || field.group == 'null' || field.group == '-')
@@ -13204,9 +13215,7 @@ const getFieldSchemaArray = (formFields, ctx) => {
     }
 
     let forceHidden = false;
-    if(!recordId && field.readonly && !ctx.isEditor){
-      // 新建记录时，只读字段先隐藏，后续支持显示后，即任务：https://github.com/steedos/steedos-platform/issues/3164 完成后再放开
-      // 表单只读时所有字段都是readonly，设计器中如果forceHidden会造成整个表单在只读的时候显示为空白了，所以要排除掉
+    if(ctx.omitReadonlyFields && field.readonly){
       forceHidden = true;
     }
 
@@ -13666,10 +13675,32 @@ async function getInputTableColumns(props) {
     // 实测过，直接不生成对应的隐藏column并不会对input-table值造成丢失问题，隐藏的列字段值能正常维护
 
     let fieldPrefix = props.fieldPrefix;
-    let fields = props.fields || [];
+    let fields = cloneDeep(props.fields || []);
     if (fieldPrefix) {
         fields = getTableFieldsWithoutFieldPrefix(fields, fieldPrefix);
     }
+    if (inlineEditMode == true) {
+        let popOverContainerSelector = "";
+        let popOverContainer = props.popOverContainer && props.popOverContainer();
+        //获取到当前input-table所处的popOverContainer（可能是modal-dialog中），
+        //给所有的下拉框字段配置popOverContainerSelector，使下拉框组件的弹出框挂载到当前dialog上，防止被dialog遮挡
+        if (popOverContainer) {
+            let classList = Array.prototype.slice.call(popOverContainer.parentElement.classList);
+            if (classList.includes('amis-dialog-widget')) {
+                popOverContainerSelector = '.' + classList.join('.') + ' .antd-Modal-content';
+            }
+        }
+        fields.forEach(function (field) {
+            //lookup存在下拉框模式；弹出模式用的是picker组件，不认popOverContainerSelector属性，所以统一加上
+            if (field.type == "select" || field.type == "lookup") {
+                field.amis = {
+                    ...field.amis,
+                    popOverContainerSelector
+                };
+            }
+        });
+    }
+    
     if (columns && columns.length) {
         return columns.map(function (column) {
             let field, extendColumnProps = {};
@@ -13719,7 +13750,7 @@ async function getInputTableColumns(props) {
     }
     else {
         return fields.map(function (field) {
-            let tableCell = getInputTableCell(field, showAsInlineEditMode);
+            let tableCell = getInputTableCell(field, showAsInlineEditMode); 
             tableCell.className = " whitespace-nowrap ";
             return tableCell;
         }) || [];
@@ -14686,7 +14717,7 @@ async function getButtonDelete(props) {
     return {
         "type": "dropdown-button",
         "level": "link",
-        "btnClassName": "text-gray-400",
+        "btnClassName": "text-gray-400 steedos-delete-button",
         "icon": "fa fa-trash-alt",
         "size": "xs",
         "hideCaret": true,
@@ -14849,11 +14880,11 @@ const getAmisInputTableSchema = async (props) => {
         }
     };
     if (buttonsForColumnOperations.length) {
-        inputTableSchema.columns.push({
+        inputTableSchema.columns.unshift({
             "name": "__op__",
             "type": "operation",
             "buttons": buttonsForColumnOperations,
-            "width": buttonsForColumnOperations.length > 1 ? "60px" : "20px"
+            "width": 1
         });
     }
     // if (showAsInlineEditMode) {
@@ -14902,6 +14933,18 @@ const getAmisInputTableSchema = async (props) => {
     }
     let className = "steedos-input-table";
 
+    if (props.showIndex) {
+        className += " steedos-show-index";
+    }
+
+    if (buttonsForColumnOperations.length) {
+        className += " steedos-has-operations";
+    }
+
+    if (props.enableTree) {
+        className += " steedos-tree-mode";
+    }
+
     if (typeof props.className == "object") {
         className = {
             [className]: "true",