@steedos-widgets/amis-object 3.6.4-beta.2 → 3.6.4-beta.3

package/dist/amis-object.cjs.js

@@ -13853,7 +13853,22 @@ async function getSelectUserSchema(field, readonly, ctx) {
 async function getSource(field, ctx) {
     // data.query 最终格式 "{ \tleftOptions:organizations(filters: {__filters}){value:_id,label:name,children},   children:organizations(filters: {__filters}){ref:_id,children}, defaultValueOptions:space_users(filters: {__options_filters}){user,name} }"
     const refObjectName = ctx.objectName;
-    const data = await getFindQuery({ name: refObjectName }, null, [{ name: ctx.valueField, alias: "value" }, { name: ctx.labelField, alias: "label" }, { name: "children" }], {
+    let optionQueryFields = [{ name: ctx.valueField, alias: "value" }, { name: ctx.labelField, alias: "label" }, { name: "children" }];
+    let defaultOptionQueryFields = optionQueryFields.filter(function (f) { return f.name !== "children" });
+
+    // 把自动填充规则中依赖的字段也加到api请求中
+    let autoFillMapping = !field.multiple && field.auto_fill_mapping;
+    if (autoFillMapping && autoFillMapping.length) {
+        autoFillMapping.forEach(function (item) {
+            if(item.from !== "children"){
+                optionQueryFields.push({ name: item.from });
+            }
+            defaultOptionQueryFields.push({ name: item.from });
+        });
+    }
+
+    const data = await getFindQuery({ name: refObjectName }, null, optionQueryFields, {
+        expand: false,
         alias: "options",
         filters: "{__filters}"
     });
@@ -13864,7 +13879,8 @@ async function getSource(field, ctx) {
     // });
     // childrenData.query = childrenData.query.replace(/,count\:.+/, "}");
     // data.query = data.query.replace(/}$/, "," + childrenData.query.replace(/{(.+)}/, "$1}"));
-    const defaultValueOptionsData = await getFindQuery({ name: refObjectName }, null, [{ name: ctx.valueField, alias: "value" }, { name: ctx.labelField, alias: "label" }], {
+    const defaultValueOptionsData = await getFindQuery({ name: refObjectName }, null, defaultOptionQueryFields, {
+        expand: false,
         alias: "defaultValueOptions",
         filters: "{__options_filters}"
     });
@@ -13931,7 +13947,20 @@ async function getSource(field, ctx) {
 async function getDeferApi(field, ctx) {
     // data.query 最终格式 "{ \toptions:{__object_name}(filters:{__filters}){{__fields}} }"
     const refObjectName = ctx.objectName;
-    const data = await getFindQuery({ name: "{__object_name}" }, null, [], {
+    let optionQueryFields = [{ name: ctx.valueField, alias: "value" }, { name: ctx.labelField, alias: "label" }, { name: "children" }];
+
+    // 把自动填充规则中依赖的字段也加到api请求中
+    let autoFillMapping =  !field.multiple && field.auto_fill_mapping;
+    if (autoFillMapping && autoFillMapping.length) {
+        autoFillMapping.forEach(function (item) {
+            if(item.from !== "children"){
+                optionQueryFields.push({ name: item.from });
+            }
+        });
+    }
+
+    const data = await getFindQuery({ name: "{__object_name}" }, null, optionQueryFields, {
+        expand: false,
         alias: "options",
         // filters: "{__filters}",
         queryOptions: `filters: {__filters}, sort: "{__sort}"`
@@ -13946,8 +13975,6 @@ async function getDeferApi(field, ctx) {
         filters = filters(field);
     }
     data.query = data.query.replace(/,count\:.+/, "}");
-    // 字段要根据请求参数动态生成，写死为__fields后续在发送适配器中替换
-    data.query = data.query.replace("{_id}", "{{__fields}}");
     const requestAdaptor = `
         var dep = api.query.dep;
         var term = api.query.term;
@@ -13957,11 +13984,10 @@ async function getDeferApi(field, ctx) {
         var sort = "";
         if (dep) {
             objectName = "${refObjectName}";
-            fields = "_id,value:${ctx.valueField},label:${ctx.labelField},children";
             filters = [['parent', '=', dep]];
             sort = "${ctx.sort}";
         }
-        api.data.query = api.data.query.replace(/{__object_name}/g, objectName).replace(/{__fields}/g, fields).replace(/{__filters}/g, JSON.stringify(filters)).replace('{__sort}', sort.trim());
+        api.data.query = api.data.query.replace(/{__object_name}/g, objectName).replace(/{__filters}/g, JSON.stringify(filters)).replace('{__sort}', sort.trim());
         return api;
     `;
     const adaptor = `
@@ -14315,6 +14341,18 @@ async function lookupToAmisPicker(field, readonly, ctx){
         }
     });
 
+    // 把自动填充规则中依赖的字段也加到api请求中
+    let autoFillMapping = !field.multiple && field.auto_fill_mapping;
+    if (autoFillMapping && autoFillMapping.length) {
+        autoFillMapping.forEach(function (item) {
+            if(!_$1__namespace.find(tableFields, function(f){
+                return f.name === item.from
+            })){
+                tableFields.push(refObjectConfig.fields[item.from]);
+            }
+        });
+    }
+
     _$1__namespace.each(refObjectConfig.fields, function (field) {
       if(isFieldQuickSearchable(field, refObjectConfig.NAME_FIELD_KEY)){
           searchableFields.push(field.name);
@@ -14746,22 +14784,31 @@ async function lookupToAmisSelect(field, readonly, ctx){
 
     let apiInfo;
     let defaultValueOptionsQueryData;
+    const refObjectConfig = referenceTo && await getUISchema(referenceTo.objectName);
     if(referenceTo){
-        // 字段值单独走一个请求合并到source的同一个GraphQL接口中
-        defaultValueOptionsQueryData = await getFindQuery({ name: referenceTo.objectName }, null, [
+        let queryFields = [
             Object.assign({}, referenceTo.labelField, {alias: 'label'}),
             Object.assign({}, referenceTo.valueField, {alias: 'value'})
-        ], {
+        ];
+
+        // 把自动填充规则中依赖的字段也加到api请求中
+        let autoFillMapping = !field.multiple && field.auto_fill_mapping;
+        if (autoFillMapping && autoFillMapping.length) {
+            autoFillMapping.forEach(function (item) {
+                queryFields.push(refObjectConfig.fields[item.from]);
+            });
+        }
+
+        // 字段值单独走一个请求合并到source的同一个GraphQL接口中
+        defaultValueOptionsQueryData = await getFindQuery({ name: referenceTo.objectName }, null, queryFields, {
+            expand: false,
             alias: "defaultValueOptions",
             filters: "{__options_filters}",
             count: false
         });
         apiInfo = await getApi({
             name: referenceTo.objectName
-        }, null, [
-            Object.assign({}, referenceTo.labelField, {alias: 'label'}),
-            Object.assign({}, referenceTo.valueField, {alias: 'value'})
-        ], {expand: false, alias: 'options', queryOptions: `filters: {__filters}, top: {__top}, sort: "{__sort}"`});
+        }, null, queryFields, {expand: false, alias: 'options', queryOptions: `filters: {__filters}, top: {__top}, sort: "{__sort}"`});
 
         apiInfo.adaptor = `
             const data = payload.data;
@@ -14785,7 +14832,6 @@ async function lookupToAmisSelect(field, readonly, ctx){
         };
     }
 
-    const refObjectConfig = referenceTo && await getUISchema(referenceTo.objectName);
     let listView = getLookupListView(refObjectConfig);
 
     let listviewFilter = getListViewFilter(listView);
@@ -14971,13 +15017,13 @@ async function getApi(object, recordId, fields, options){
 }
 
 async function getAutoFill(field, refObject) {
-    let autoFillMapping = field.auto_fill_mapping;
+    let autoFillMapping = !field.multiple && field.auto_fill_mapping;
     if (autoFillMapping && autoFillMapping.length) {
         let fillMapping = {};
-        let fieldsForApi = [];
+        // let fieldsForApi = [];
         autoFillMapping.forEach(function (item) {
             fillMapping[item.to] = `\${${item.from}}`;
-            fieldsForApi.push(item.from);
+            // fieldsForApi.push(item.from);
         });
         // let api = {
         //     // "url": "/amis/api/mock2/form/autoUpdate?browser=${browser}&version=${version}",
@@ -17312,6 +17358,7 @@ async function getForm(props, mode = "edit", formId) {
 async function getButtonActions(props, mode) {
     let actions = [];
     let primaryKey = getTablePrimaryKey(props);
+    let tableServiceId = getComponentId("table_service", props.id);
     let formId = getComponentId("form", props.id);
     let dialogId = getComponentId("dialog", props.id);
     let buttonNextId = getComponentId("button_next", props.id);
@@ -17628,7 +17675,30 @@ async function getButtonActions(props, mode) {
             // };
             // 新增行时不需要在弹出编辑表单前先加一行，因为会在编辑表单所在service初始化时判断到是新增就自动增加一行，因为这里拿不到event.data.__tableItems，也无法变更其值
             // actions = [actionNewLine, actionShowEditDialog];
-            actions = [actionShowEditDialog];
+            if (props.enableDialog === false) {
+                actions = [
+                    {
+                        "actionType": "custom",
+                        "script":  `
+                            let scope = event.context.scoped;
+                            let __wrapperServiceId = "${tableServiceId}";
+                            let wrapperService = scope.getComponentById(__wrapperServiceId);
+                            let wrapperServiceData = wrapperService.getData();
+                            let lastestFieldValue = _.clone(wrapperServiceData["${props.name}"] || []);
+                            lastestFieldValue.push({})
+                            doAction({
+                                "componentId": "${props.id}",
+                                "actionType": "setValue",
+                                "args": {
+                                    "value": lastestFieldValue
+                                }
+                            });
+                        `
+                    }
+                ];
+            }else {
+                actions = [actionShowEditDialog];
+            }
         }
         else if (mode == "edit") {
             actions = [actionShowEditDialog];
@@ -17860,31 +17930,34 @@ const getAmisInputTableSchema = async (props) => {
     let inlineEditMode = props.inlineEditMode;
     let showAsInlineEditMode = inlineEditMode && props.editable;
     if (showOperation) {
-        if (props.editable) {
-            let showEditButton = true;
-            if (showAsInlineEditMode) {
-                // 始终显示弹出子表表单按钮，如果需要判断只在有列被隐藏时才需要显示弹出表单按钮放开下面的if逻辑就好
-                showEditButton = true;
-                // // inline edit模式下只在有列被隐藏时才需要显示编辑按钮
-                // if (props.columns && props.columns.length > 0 && props.columns.length < fields.length) {
-                //     showEditButton = true;
-                // }
-                // else {
-                //     showEditButton = false;
-                // }
+        if (props.enableDialog !== false) {
+            if (props.editable) {
+                let showEditButton = true;
+                if (showAsInlineEditMode) {
+                    // 始终显示弹出子表表单按钮，如果需要判断只在有列被隐藏时才需要显示弹出表单按钮放开下面的if逻辑就好
+                    showEditButton = true;
+                    // // inline edit模式下只在有列被隐藏时才需要显示编辑按钮
+                    // if (props.columns && props.columns.length > 0 && props.columns.length < fields.length) {
+                    //     showEditButton = true;
+                    // }
+                    // else {
+                    //     showEditButton = false;
+                    // }
+                }
+                // 编辑时显示编辑按钮
+                if (showEditButton) {
+                    let buttonEditSchema = await getButtonEdit(props, showAsInlineEditMode);
+                    buttonsForColumnOperations.push(buttonEditSchema);
+                }
             }
-            // 编辑时显示编辑按钮
-            if (showEditButton) {
-                let buttonEditSchema = await getButtonEdit(props, showAsInlineEditMode);
-                buttonsForColumnOperations.push(buttonEditSchema);
+            else {
+                // 只读时显示查看按钮
+                // 如果想只在有列被隐藏时才需要显示查看按钮可以加上判断：if (props.columns && props.columns.length > 0 && props.columns.length < fields.length)
+                let buttonViewSchema = await getButtonView(props);
+                buttonsForColumnOperations.push(buttonViewSchema);
             }
         }
-        else {
-            // 只读时显示查看按钮
-            // 如果想只在有列被隐藏时才需要显示查看按钮可以加上判断：if (props.columns && props.columns.length > 0 && props.columns.length < fields.length)
-            let buttonViewSchema = await getButtonView(props);
-            buttonsForColumnOperations.push(buttonViewSchema);
-        }
+        
         if (props.removable) {
             let buttonDeleteSchema = await getButtonDelete(props);
             buttonsForColumnOperations.push(buttonDeleteSchema);
@@ -23949,13 +24022,16 @@ var AmisInputTable = function (props) { return __awaiter(void 0, void 0, void 0,
     return __generator(this, function (_a) {
         switch (_a.label) {
             case 0:
-                props.$schema, props.fields, props.name, props.id, props.data, props.columns, props.amis, props.className, props.tableClassName, props.headerToolbar, props.footerToolbar, props.inlineEditMode, props.strictMode, props.dialog, props.primaryKey, props.showOperation, props.fieldPrefix, props.autoGeneratePrimaryKeyValue, props.mode, props.disabledOn, props.disabled, props.visibleOn, props.visible, props.hiddenOn, props.hidden;
+                props.$schema, props.fields, props.name, props.id, props.data, props.columns, props.amis, props.className, props.tableClassName, props.headerToolbar, props.footerToolbar, props.inlineEditMode, props.strictMode, props.dialog, props.primaryKey, props.showOperation, props.fieldPrefix, props.autoGeneratePrimaryKeyValue, props.mode, props.disabledOn, props.disabled, props.visibleOn, props.visible, props.hiddenOn, props.hidden, props.enableDialog;
                 extendProps = {};
                 if (props.disabledOn || props.disabled) {
                     extendProps["addable"] = false;
                     extendProps["editable"] = false;
                     extendProps["removable"] = false;
                 }
+                if (props.enableDialog === false) {
+                    extendProps["inlineEditMode"] = true;
+                }
                 return [4 /*yield*/, getAmisInputTableSchema(Object.assign({}, props, extendProps))];
             case 1:
                 amisSchema = _a.sent();