@steedos-widgets/amis-lib 6.3.0 → 6.3.2

package/dist/index.esm.js

@@ -1206,7 +1206,7 @@ async function getLookupLinkOnClick(field, options) {
     const recordPage = await getPage({ type: 'record', appId: options.appId, objectName: options.objectName, formFactor: options.formFactor });
 
     const drawerRecordDetailSchema = recordPage ? Object.assign({}, recordPage.schema, {
-        "recordId": "${value}",
+        "recordId": `\${${field.name}}`,
         "data": {
             ...recordPage.schema.data,
             "_inDrawer": true,  // 用于判断是否在抽屉中
@@ -1216,7 +1216,7 @@ async function getLookupLinkOnClick(field, options) {
     }) : {
         "type": "steedos-record-detail",
         "objectApiName": options.objectName,
-        "recordId": "${value}",
+        "recordId": `\${${field.name}}`,
         "showBackButton": false,
         "showButtons": true,
         "data": {
@@ -1322,7 +1322,7 @@ const  getAmisFileReadonlySchema = async (steedosField,ctx = {})=>{
                     labelClassName: "hidden",
                     label: false,
                     className: 'm-0',
-                    tpl: `<a href="/app/-/cfs_files_filerecord/view/\${value}" ${lookupATagClick}>\${name}</a>`,
+                    tpl: `<a href="/app/-/cfs_files_filerecord/view/\${${steedosField.name}}" ${lookupATagClick}>\${name}</a>`,
                     // tpl: "<%= item.name >",
                     // onEvent: window.innerWidth < 768 ? null : REFERENCE_VALUE_ITEM_ONCLICK
                     onEvent: window.innerWidth < 768 ? null : await getLookupLinkOnClick(steedosField, {
@@ -1805,6 +1805,11 @@ async function getQuickEditSchema(object, columnField, options){
         const submitEvent = {
             submit: {
                 actions: [
+                    {
+                        "actionType": "validate",
+                        "componentId": quickEditId,
+                        "outputVar": "form_validate_result"
+                    },
                     {
                         actionType: "custom",
                         script: `
@@ -1821,10 +1826,12 @@ async function getQuickEditSchema(object, columnField, options){
                                 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});
                             }
-                        `
+                        `,
+                        expression: "${!form_validate_result.error}"
                     },
                     {
-                        "actionType": "closeDialog"
+                        "actionType": "closeDialog",
+                        expression: "${!form_validate_result.error}"
                     }
                 ]
             }
@@ -2332,7 +2339,7 @@ async function getTableColumns(object, fields, options){
         }
         //增加quickEdit属性，实现快速编辑
         const quickEditSchema = allowEdit ? await getQuickEditSchema(object, field, options) : allowEdit;
-        let className = "";
+        let className = `steedos-table-${field.type}-field`;
         const bowserType = getBowserType();
         if(bowserType === "Safari"){
             className += " whitespace-nowrap ";
@@ -3423,7 +3430,7 @@ function getReadonlyFormAdaptor(object, fields, options){
             nameLabel = `record._display.${nameField.name}.label`;
         }
     } else if (nameField){
-        nameLabel = `(record._display ? record._display.${nameField.name} : record.${nameField.name})`;
+        nameLabel = `(record._display && record._display.${nameField.name}) || record.${nameField.name}`;
     }
     return  `
     if(payload.data.data.length === 0){
@@ -3616,7 +3623,7 @@ async function getEditFormInitApi(object, recordId, fields, options){
     
     return {
         method: "post",
-        url: getApi$2() + '&objectName=${objectName}' ,
+        url: getApi$2() + '&objectName=${objectName}' + "&recordId=${recordId}",
         // sendOn: "!!this.recordId",
         cache: API_CACHE,
         requestAdaptor: `
@@ -13719,6 +13726,8 @@ async function convertSFieldToAmisField(field, readonly, ctx) {
                     if(gridSub){
                         delete gridSub.name;
                         delete gridSub.label;
+                        //去除重复样式
+                        gridSub.className = gridSub.className.replace('border-b', '');
                         convertData.items.push(
                             Object.assign({}, gridSub, {label: subField.label}, subField.amis, {
                                 name: subFieldName
@@ -13773,6 +13782,10 @@ async function convertSFieldToAmisField(field, readonly, ctx) {
         }
         // if(ctx.mode === 'edit'){
         let convertDataResult = Object.assign({}, baseData, convertData, { labelClassName: 'text-left', clearValueOnHidden: true, fieldName: field.name}, field.amis, {name: baseData.name});
+        // 只读时file字段的外层control层若存在name，内部each组件存在问题
+        if(readonly && field.type == "file") {
+            convertDataResult.name = "";
+        }
         // console.log("convertDataResult:", convertDataResult);
         return convertDataResult;
         // }else{
@@ -13992,13 +14005,17 @@ const getSection = async (formFields, permissionFields, fieldSchemaArray, sectio
       // console.log(`perField.type object ===> field`, field)
     }
     if (field.name.indexOf(".") < 0) {
+      let _field = _.cloneDeep(field);
+      if(field.type === "select" && field.data_type && field.data_type != "text"){
+        _field.type = field.data_type;
+      }
       if(field.type === "steedos-field"){
         // 如果是steedos-field则不需要通过convertSFieldToAmisField函数转换，因为steedos-field组件会转换
-        fieldSetBody.push(field);
+        fieldSetBody.push(_field);
       }
       else {
         ctx.__formFields = formFields;
-        const amisField = await convertSFieldToAmisField(field, field.readonly, ctx);
+        const amisField = await convertSFieldToAmisField(_field, _field.readonly, ctx);
         // 如果steedos-field稳定了，可以放开下面的代码直接用组件统一渲染字段
         // const amisField = {
         //   "type": "steedos-field",