@steedos-widgets/amis-lib 3.6.4-beta.2 → 3.6.4-beta.4

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"){
@@ -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;
@@ -8817,7 +8818,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 +9085,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 +9693,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 +10042,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 +10050,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 +10081,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;
@@ -10672,7 +10682,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}"
     });
@@ -10683,7 +10708,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}"
     });
@@ -10750,7 +10776,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}"`
@@ -10765,8 +10804,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;
@@ -10776,11 +10813,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 = `
@@ -11134,6 +11170,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.find(tableFields, function(f){
+                return f.name === item.from
+            })){
+                tableFields.push(refObjectConfig.fields[item.from]);
+            }
+        });
+    }
+
     _$1.each(refObjectConfig.fields, function (field) {
       if(isFieldQuickSearchable(field, refObjectConfig.NAME_FIELD_KEY)){
           searchableFields.push(field.name);
@@ -11390,7 +11438,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,
@@ -11565,22 +11613,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;
@@ -11604,7 +11661,6 @@ async function lookupToAmisSelect(field, readonly, ctx){
         };
     }
 
-    const refObjectConfig = referenceTo && await getUISchema(referenceTo.objectName);
     let listView = getLookupListView(refObjectConfig);
 
     let listviewFilter = getListViewFilter(listView);
@@ -11790,13 +11846,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}",
@@ -11990,7 +12046,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,
@@ -13137,15 +13193,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 == '-')
@@ -13158,9 +13214,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;
     }
 
@@ -14131,6 +14185,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);
@@ -14447,7 +14502,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];
@@ -14679,31 +14757,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);