@steedos-widgets/amis-object 6.3.13-beta.6 → 6.3.13-beta.8

package/dist/amis-object.cjs.js

@@ -5735,6 +5735,7 @@ async function getTableColumns$1(object, fields, options){
                         type: "lookup",
                         reference_to: field.reference_to,
                         name: field.name,
+                        is_name: field.is_name,
                         label: null,
                         multiple: field.multiple,
                         amis: Object.assign({}, fieldAmis, { label: null })
@@ -15705,7 +15706,9 @@ async function lookupToAmisPicker(field, readonly, ctx){
                 {
                     "actionType": "custom",
                     "script": `
-                    const masterRecord = event.data._master && event.data._master.record;
+                    // lookup字段弹出列表，点击新建按钮，新建记录成功后，触发@data.changed.xxx，
+                    // 此时context.props.data值是lookup字段所在表单数据，经测试多层lookup弹出列表新建记录成功后context.props.data始终取的是最近一层的lookup字段所在表单数据，符合预期
+                    const masterRecord = context.props.data;//event.data._master && event.data._master.record;
                     const fieldConfig = ${JSON.stringify(field)};
                     let reference_to = fieldConfig.reference_to;
                     let saveValue;
@@ -15715,7 +15718,6 @@ async function lookupToAmisPicker(field, readonly, ctx){
                     }
                     const saveField = fieldConfig.reference_to_field || '_id';
                     const saveFieldValue = newRecord[saveField];
-
                     if( fieldConfig._reference_to && (_.isArray(fieldConfig._reference_to) || _.isFunction(fieldConfig._reference_to) || fieldConfig._reference_to.startsWith('function') ) ){
                         
                         const fieldValue = masterRecord ? masterRecord[fieldConfig.name] : {o: reference_to, ids: []};
@@ -15735,8 +15737,10 @@ async function lookupToAmisPicker(field, readonly, ctx){
 
                     }else{
                         if(fieldConfig.multiple){
-                            // TODO: 连续新建多个记录时，因为获取的主记录不是实时的，所以只会勾选最后一个新建的记录。
-                            const fieldValue = (masterRecord && masterRecord[fieldConfig.name]) || [];
+                            // const fieldValue = (masterRecord && masterRecord[fieldConfig.name]) || [];
+                            // 连续新建多个记录时，因为masterRecord获取的主记录不是实时的，所以只会勾选最后一个新建的记录
+                            // 而下面context.context.component指向的是lookup picker组件，可以直接取到用户实时勾选的记录。
+                            const fieldValue = context.context.component.props.store.toJSON().selectedItems
                             saveValue = fieldValue.concat(saveFieldValue);
                         }else{
                             saveValue = saveFieldValue;
@@ -25032,11 +25036,12 @@ var SteedosObject = /** @class */ (function (_super) {
 
 // md:border-b
 var AmisObjectForm = function (props) { return __awaiter(void 0, void 0, void 0, function () {
-    var $schema, recordId, defaultData, mode, _a, layout, labelAlign, appId, fieldsExtend, _b, excludedFields, _c, fields, _d, form, _e, className, enableInitApi, initApiRequestAdaptor, initApiAdaptor, apiRequestAdaptor, apiAdaptor, enableTabs, tabsMode, submitSuccActions, data, formDataFilter, onFormDataFilter, env, objectApiName, schemaKeys, formSchema, defaults, options, globalData, amisSchema, uiSchema, allData, schema, schema, formData;
+    var $schema, recordId, mode, _a, layout, labelAlign, appId, fieldsExtend, _b, excludedFields, _c, fields, _d, form, _e, className, enableInitApi, initApiRequestAdaptor, initApiAdaptor, apiRequestAdaptor, apiAdaptor, enableTabs, tabsMode, submitSuccActions, data, formDataFilter, onFormDataFilter, env, defaultData, objectApiName, schemaKeys, formSchema, defaults, options, globalData, amisSchema, uiSchema, allData, schema, schema, formData;
     return __generator(this, function (_f) {
         switch (_f.label) {
             case 0:
-                $schema = props.$schema, recordId = props.recordId, defaultData = props.defaultData, mode = props.mode, _a = props.layout, layout = _a === void 0 ? "horizontal" : _a, labelAlign = props.labelAlign, appId = props.appId, fieldsExtend = props.fieldsExtend, _b = props.excludedFields, excludedFields = _b === void 0 ? null : _b, _c = props.fields, fields = _c === void 0 ? null : _c, _d = props.form, form = _d === void 0 ? {} : _d, _e = props.className, className = _e === void 0 ? "" : _e, enableInitApi = props.enableInitApi, initApiRequestAdaptor = props.initApiRequestAdaptor, initApiAdaptor = props.initApiAdaptor, apiRequestAdaptor = props.apiRequestAdaptor, apiAdaptor = props.apiAdaptor, enableTabs = props.enableTabs, tabsMode = props.tabsMode, submitSuccActions = props.submitSuccActions, data = props.data, formDataFilter = props.formDataFilter, onFormDataFilter = props.onFormDataFilter, env = props.env;
+                $schema = props.$schema, recordId = props.recordId, mode = props.mode, _a = props.layout, layout = _a === void 0 ? "horizontal" : _a, labelAlign = props.labelAlign, appId = props.appId, fieldsExtend = props.fieldsExtend, _b = props.excludedFields, excludedFields = _b === void 0 ? null : _b, _c = props.fields, fields = _c === void 0 ? null : _c, _d = props.form, form = _d === void 0 ? {} : _d, _e = props.className, className = _e === void 0 ? "" : _e, enableInitApi = props.enableInitApi, initApiRequestAdaptor = props.initApiRequestAdaptor, initApiAdaptor = props.initApiAdaptor, apiRequestAdaptor = props.apiRequestAdaptor, apiAdaptor = props.apiAdaptor, enableTabs = props.enableTabs, tabsMode = props.tabsMode, submitSuccActions = props.submitSuccActions, data = props.data, formDataFilter = props.formDataFilter, onFormDataFilter = props.onFormDataFilter, env = props.env;
+                defaultData = props.defaultData;
                 objectApiName = props.objectApiName || "space_users";
                 schemaKeys = _$1.difference(_$1.keys($schema), ["id", "form", "type", "mode", "layout", "defaultData", "formDataFilter", "onFormDataFilter", "env"]);
                 formSchema = _$1.pick(props, schemaKeys);
@@ -25064,6 +25069,13 @@ var AmisObjectForm = function (props) { return __awaiter(void 0, void 0, void 0,
                 allData = createObject(data, {});
                 if (!(mode === 'edit')) return [3 /*break*/, 2];
                 if (defaultData) {
+                    try {
+                        defaultData = _$1.isString(defaultData) ? JSON.parse(defaultData) : defaultData;
+                    }
+                    catch (error) {
+                        console.warn(error);
+                        defaultData = {};
+                    }
                     // 让ObjectForm支持props中的dafaultData属性与上层组件配置的defaultData混合
                     // 为了解决相关表新建时如果是表单类型微页面，因为找不到ObjectForm在哪层而造成无法设置ObjectForm的defaultData的问题
                     allData.defaultData = __assign$2({ "&": "${defaultData}" }, defaultData //这里的defaultData是form组件的defaultData属性值
@@ -27196,19 +27208,28 @@ function getAmisStaticFieldType(type, data_type, options) {
 }
 function getLookupLinkOnClick(field, options) {
     return __awaiter(this, void 0, void 0, function () {
-        var recordPage, drawerRecordDetailSchema;
+        var recordPage, objectName, recordId, drawerRecordDetailSchema;
         return __generator(this, function (_a) {
             switch (_a.label) {
                 case 0: return [4 /*yield*/, getPage({ type: 'record', appId: options.appId, objectName: options.objectName, formFactor: options.formFactor })];
                 case 1:
                     recordPage = _a.sent();
+                    objectName = "${objectName}";
+                    recordId = "${value}";
+                    if (options.tableObjectName && field.is_name) {
+                        // 如果Lookup字段上配置了is_name，且是在表格（即tableObjectName有值，包括列表视图和子表）中
+                        // 则点击弹出的详细页面是表格行记录指向的记录详细页面，此时打开的详细页面对象是表格所属对象，_id是表格行记录的_id值
+                        // tableObjectName 没有值时说明lookup字段可能是在记录详细页面表单等地方，此时打开的详细页面lookup字段值指向的记录
+                        objectName = options.tableObjectName;
+                        recordId = "${_id}";
+                    }
                     drawerRecordDetailSchema = recordPage ? Object.assign({}, recordPage.schema, {
-                        "recordId": "${value}",
+                        "recordId": recordId,
                         "data": __assign$2(__assign$2({}, recordPage.schema.data), { "_inDrawer": true, "recordLoaded": false, "_tableObjectName": options.tableObjectName })
                     }) : {
                         "type": "steedos-record-detail",
-                        "objectApiName": "${objectName}",
-                        "recordId": "${value}",
+                        "objectApiName": objectName,
+                        "recordId": recordId,
                         "showBackButton": false,
                         "showButtons": true,
                         "data": {
@@ -27430,7 +27451,7 @@ var AmisSteedosField = function (props) { return __awaiter(void 0, void 0, void
                     label: false,
                     className: 'm-0',
                     tpl: "<a href=\"/app/-/${objectName}/view/${value}\" target=\"_blank\" ".concat(lookupATagClick, ">${label}</a>"),
-                    popOver: fieldRefObject.compactLayouts && window.innerWidth >= 768 ? {
+                    popOver: window.showLookupPopOver && fieldRefObject.compactLayouts && window.innerWidth >= 768 ? {
                         "trigger": "hover",
                         "className": "steedos-record-detail-popover",
                         "position": "left-bottom",
@@ -27531,7 +27552,7 @@ var AmisSteedosField = function (props) { return __awaiter(void 0, void 0, void
                     type: 'static',
                     className: 'm-0',
                     tpl: "<a href=\"/app/-/${objectName}/view/${value}\" target=\"_blank\" ".concat(lookupATagClick, ">${label}</a>"),
-                    popOver: fieldRefObject.compactLayouts && window.innerWidth >= 768 ? {
+                    popOver: window.showLookupPopOver && fieldRefObject.compactLayouts && window.innerWidth >= 768 ? {
                         "trigger": "hover",
                         "className": "steedos-record-detail-popover",
                         "position": "left-bottom",