@steedos-widgets/amis-lib 3.6.2-beta.6 → 3.6.2-beta.8

package/dist/index.cjs.js

@@ -486,7 +486,7 @@ function getComparableAmisVersion() {
  * @Author: baozhoutao@steedos.com
  * @Date: 2022-05-23 09:53:08
  * @LastEditors: liaodaxue
- * @LastEditTime: 2023-10-11 17:32:17
+ * @LastEditTime: 2024-01-17 16:00:27
  * @Description: 
  */
 
@@ -558,7 +558,7 @@ function getSelectMap(selectOptions){
 
 function getNameTplUrl(field, ctx){
     if(ctx.objectName === 'cms_files'){
-        return `\${context.rootUrl}/api/files/files/\${versions[0]}?download=true`
+        return "${(versions[0] && versions[0].url) ? versions[0].url+'?download=true' : context.rootUrl+'/api/files/files/'+versions[0]+'?download=true'}"
     }
     const href = Router.getObjectDetailPath({
         ...ctx,  formFactor: ctx.formFactor, appId: "${appId}", objectName: ctx.objectName || "${objectName}", recordId: `\${${ctx.idFieldName}}`
@@ -2286,7 +2286,7 @@ function getMobileLines(tpls){
         }
         if(isLeft){
             // 左侧半行
-            lineChildrenClassName = "steedos-listview-item-left truncate";
+            lineChildrenClassName = "steedos-listview-item-left truncate h-5";
             if(item.field.is_wide){
                 // 左侧全行样式可以单独写，如果需要配置两行省略号效果，可以加样式类 two-lines-truncate
                 lineChildrenClassName = "steedos-listview-item-wide";
@@ -2298,7 +2298,7 @@ function getMobileLines(tpls){
         }
         else {
             // 右侧半行，这里加样式类 flex flex-shrink-0，是为了省略号只显示在左半行，右半行文字一般比较短，如果也加省略号效果的话，左侧文字多的话，右侧没几个字就显示省略号了
-            lineChildrenClassName = "steedos-listview-item-right truncate ml-2 flex flex-shrink-0";
+            lineChildrenClassName = "steedos-listview-item-right truncate ml-2 flex flex-shrink-0 h-5";
         }
         //支持字段amis属性配置classname，识别classname的类型，与原样式合并
         var className;
@@ -2409,7 +2409,15 @@ async function getMobileTableColumns(fields, options){
                         "actions": [
                             {
                                 "script": `
-                                    let cms_url = "/api/files/files/"+event.data.versions[0]+"?download=true"
+                                    let cms_url = '';
+                                    let value = event.data.versions[0];
+                                    if(value){
+                                        if(value.url){
+                                            cms_url = value.url;
+                                        }else{
+                                            cms_url = "/api/files/files/"+value+"?download=true"
+                                        }
+                                    }
                                     Steedos.cordovaDownload(encodeURI(Steedos.absoluteUrl(cms_url)), event.data.name);
                                 `,
                                 "actionType": "custom"
@@ -3041,12 +3049,15 @@ async function getTableApi(mainObject, fields, options){
         }
         // SteedosUI.getRef(api.body.$self.$scopeId)?.parent?.getComponentById(setDataToComponentId)?.setData({$count: payload.data.count})
     };
-    const listviewComponent = $(".steedos-object-listview .antd-Table-table");
-    const firstListviewComponent = listviewComponent && listviewComponent[0];
-    if(firstListviewComponent){
-        setTimeout(()=>{
-            firstListviewComponent.scrollIntoView();
-        }, 600);
+    let formFactor = "${options.formFactor}";
+    if(formFactor !== "SMALL"){
+        const listviewComponent = $(".steedos-object-listview .antd-Table-table");
+        const firstListviewComponent = listviewComponent && listviewComponent[0];
+        if(firstListviewComponent){
+            setTimeout(()=>{
+                firstListviewComponent.scrollIntoView();
+            }, 600);
+        }
     }
     ${options.adaptor || ''}
     return payload;
@@ -3391,17 +3402,16 @@ async function getEditFormInitApi(object, recordId, fields, options){
             }
             // data下的变量需要在保存接口（getSaveApi）中被删除。
             payload.data = {
-                ...initialValues,
-                editFormInited: true
+                ...initialValues
             }
             ${options.initApiAdaptor || ''}
             // console.log('getEditFormInitApi======>', payload);
             return payload;
         `,
-        // responseData: {
-        //     initialValues: "$$",
-        //     editFormInited: true
-        // },
+        responseData: {
+            "&": "$$",
+            editFormInited: true
+        },
         data: data,
         headers: {
             Authorization: "Bearer ${context.tenantId},${context.authToken}"
@@ -4244,7 +4254,7 @@ async function getListBody(fields, options){
 
 function getDefaultParams(options){
     return {
-        perPage: options.top || options.perPage || 10
+        perPage: options.top || options.perPage || 20
     }
 }
 
@@ -4447,7 +4457,6 @@ const getSchema$5 = async (uiSchema, ctx) => {
             "objectApiName": "\${objectName}",
             "recordId": "",
             "mode": "edit",
-            "layout": "normal"
         };
 
         if (payload && payload.schema) {
@@ -6719,7 +6728,7 @@ async function getObjectRecordDetailHeader(objectSchema, recordId, options) {
   let body = [
     {
       "type": "wrapper",
-      "className": "p-4",
+      "className": "p-4 bg-gray-100 border-b",
       "body": [
         {
           "type": "grid",
@@ -6765,12 +6774,16 @@ async function getObjectRecordDetailHeader(objectSchema, recordId, options) {
     });
 
     body.push({
-      "type": "form",
-      "className": "p-4 pb-0 bg-white compact-layouts",
-      "wrapWithPanel": false,
-      "actions": [],
-      "body": details,
-      "hiddenOn": "${recordLoaded != true}"
+      "type": "wrapper",
+      "body": {
+        "type": "form",
+        "className": "gap-2 grid grid-cols-1 sm:grid-cols-2 md:grid-cols-3 lg:grid-cols-4 xl:grid-cols-5 2xl:grid-cols-5 3xl:grid-cols-8 4xl:grid-cols-8 5xl:grid-cols-10", //max-h-12 overflow-hidden 
+        "wrapWithPanel": false,
+        "actions": [],
+        "body": details,
+        "hiddenOn": "${recordLoaded != true}"
+      },
+      "className": "steedos-record-compact-layouts p-4 bg-white compact-layouts border-b"
     });
   }
 
@@ -6849,7 +6862,7 @@ async function getObjectRecordDetailRelatedListHeader(relatedObjectSchema, relat
         "className": "flex justify-between"
       }
     ],
-    "className": "p-3"
+    "className": "steedos-record-related-header py-2 px-0"
   };
   return recordRelatedListHeader;
 }
@@ -8565,7 +8578,7 @@ async function getObjectCRUD(objectSchema, fields, options){
         //   "is-steedos-crud-data-empty": "${!items || COUNT(items) == 0}"
         // },
         bodyClassName: {
-          "bg-white": "true",
+          "mb-0": true,
           "is-steedos-crud-data-empty": "${!items || COUNT(items) == 0}"
         },
         crudClassName: crudClassName,
@@ -8721,7 +8734,7 @@ async function getFormSchemaWithDataFilter(form, options = {}){
 }
 
 async function getObjectForm(objectSchema, ctx){
-    const { recordId, formFactor, layout = formFactor === 'SMALL' ? 'normal' : "normal", labelAlign, tabId, appId, defaults, submitSuccActions = [], 
+    const { recordId, formFactor, layout = formFactor === 'SMALL' ? 'normal' : "horizontal", labelAlign, tabId, appId, defaults, submitSuccActions = [], 
       formDataFilter, onFormDataFilter, amisData, env } = ctx;
     const fields = ___default["default"].values(objectSchema.fields);
     const formFields = getFormFields$1(objectSchema, ctx);
@@ -8815,7 +8828,7 @@ async function getObjectForm(objectSchema, ctx){
 }
 
 async function getObjectDetail(objectSchema, recordId, ctx){
-    const { formFactor, layout = formFactor === 'SMALL' ? 'normal' : "normal", labelAlign, 
+    const { formFactor, layout = formFactor === 'SMALL' ? 'normal' : "horizontal", labelAlign, 
       formDataFilter, onFormDataFilter, amisData, env } = ctx;
     const fields = ___default["default"].values(objectSchema.fields);
     const formFields = getFormFields$1(objectSchema, ctx);
@@ -9140,7 +9153,7 @@ async function getRecordDetailRelatedListSchema(objectName, recordId, relatedObj
         setDataToComponentId: componentId,
         // tableHiddenOn: hiddenEmptyTable ? "this.$count === 0" : null,
         appId: appId,
-        crudClassName: 'border-t border-gray-300 hidden',
+        crudClassName: 'steedos-record-related-crud hidden',
         refField,
         ...ctx
     };
@@ -9153,7 +9166,7 @@ async function getRecordDetailRelatedListSchema(objectName, recordId, relatedObj
         amisSchema: {
             type: "service",
             id: componentId,
-            className: `steedos-record-related-list ${componentId} rounded border border-gray-300 bg-gray-100 mb-4 ${className}`,
+            className: `steedos-record-related-list py-2 first:pt-0 border-b last:border-b-0 ${componentId} ${className}`,
             data: {
                 relatedKey: relatedKey,   
                 listViewId: `amis-\${appId}-${relatedObjectName}-listview`,
@@ -9880,39 +9893,35 @@ async function getRecordDetailSchema(objectName, appId, props = {}){
                 "label": "对象表单",
                 "objectApiName": "${objectName}",
                 "recordId": "${recordId}",
-                "id": "u:d4a495811d57",
                 appId: appId
             }
         ],
-        "id": "u:5d4e7e3f6ecc"
     };
     const related = {
         "title": i18next__default["default"].t('frontend_record_detail_tab_related'),
-        "className": "px-0 pt-4",
+        "className": "px-0 py-4",
         "body": [
             {
                 "type": "steedos-object-related-lists",
                 "label": "相关列表",
                 "objectApiName": "${objectName}",
                 "recordId": "${recordId}",
-                "id": "u:3b85b7b7a7f6",
                 appId: appId
             }
         ],
-        "id": "u:1a0326aeec2b"
     };
     const content = {
         "type": "tabs",
-        "className": "sm:mt-3 bg-white sm:rounded sm:border border-gray-300 p-4",
+        "className": "steedos-record-tabs bg-white p-4 m-0 mt-2 border-y",
+        "contentClassName": "bg-none",
         "tabs": [
             detailed
         ],
-        "id": "u:a649e4094a12"
     };
     if(relatedLists.length){
         content.tabs.push(related);
     }
-    content.tabs = _$1.reverse(content.tabs);
+    // content.tabs = reverse(content.tabs)
     return {
         uiSchema,
         amisSchema: {
@@ -9964,7 +9973,7 @@ async function getRecordServiceSchema(objectName, appId, props = {}, body) {
             body: {
                 "type": "service",
                 id: serviceId,
-                className: 'steedos-record-service p-0 md:p-2',
+                className: 'steedos-record-service p-0',
                 api: await getReadonlyFormInitApi(uiSchema, props.recordId, fields, props),
                 body:  {
                     "type": "wrapper",
@@ -11192,8 +11201,7 @@ async function lookupToAmisPicker(field, readonly, ctx){
         labelField: referenceTo.labelField.name,
         valueField: referenceTo.valueField.name,
         // disabledOn: this._master目的是相关表新建时禁止编辑关联字段； this.relatedKey目的是相关表编辑时禁止编辑关联字段，多选字段可以编辑。
-        disabledOn:  `${readonly}`,
-        hiddenOn: `( (this._master && (this._master.relatedKey ==='${field.name}')) || ((this.relatedKey ==='${field.name}') && (${field.multiple} != true)) )`,
+        disabledOn:  `${readonly} || ( (this._master && (this._master.relatedKey ==='${field.name}')) || ((this.relatedKey ==='${field.name}') && (${field.multiple} != true)) )`,
         modalMode: 'dialog', //TODO 设置 dialog 或者 drawer，用来配置弹出方式
         source: source,
         size: "lg",
@@ -11436,16 +11444,18 @@ async function lookupToAmis(field, readonly, ctx){
     }
     // console.log(`lookupToAmis====`, field, readonly, ctx)
     if(readonly){
-        return {
-            type: 'steedos-field',
-            config: field,
-            static: true
+        if(field.reference_to){
+            return {
+                type: 'steedos-field',
+                config: field,
+                static: true
+            }
+        }else {
+            return {
+                type: getAmisStaticFieldType('picker', readonly),
+                tpl: getRelatedFieldTpl(field, ctx)
+            }
         }
-
-        // return {
-        //     type: Field.getAmisStaticFieldType('picker', readonly),
-        //     tpl: Tpl.getRelatedFieldTpl(field, ctx)
-        // }
     }
     if(field.reference_to && !___namespace.isString(field.reference_to) && !readonly){
         return {
@@ -12492,7 +12502,7 @@ async function convertSFieldToAmisField(field, readonly, ctx) {
         if(field.is_wide || convertData.type === 'group'){
             convertData.className = 'col-span-2 m-0';
         }else {
-            convertData.className = 'm-1';
+            convertData.className = 'm-0';
         }
         if(readonly){
             convertData.className = `${convertData.className} border-b`;
@@ -12517,6 +12527,10 @@ async function convertSFieldToAmisField(field, readonly, ctx) {
             }
         }
 
+        if(ctx.amisData && ctx.amisData._master && ctx.amisData._master.relatedKey === field.name){
+            convertData.className = `${convertData.className || ''} hidden`;
+        }
+
         if(___namespace.isString(baseData.required)){
             if(baseData.required.startsWith("{{")){
                 baseData.requiredOn = `${baseData.required.substring(2, baseData.required.length -2).replace(/formData./g, 'data.')}`;
@@ -12898,9 +12912,41 @@ async function getFormBody(permissionFields, formFields, ctx){
  * @Author: 殷亮辉 yinlianghui@hotoa.com
  * @Date: 2023-11-15 09:50:22
  * @LastEditors: 殷亮辉 yinlianghui@hotoa.com
- * @LastEditTime: 2024-01-16 14:58:51
+ * @LastEditTime: 2024-01-17 17:15:57
  */
 
+/**
+ * 子表组件字段值中每行数据的键值key移除指定前缀
+ * @param {*} value 子表组件字段值，数组
+ * @param {*} fieldPrefix 字段前缀
+ * @returns 转换后的子表组件字段值
+ */
+function getTableValueWithoutFieldPrefix(value, fieldPrefix){
+    let convertedValue = [];
+    (value || []).forEach((itemValue)=>{
+        var newItemValue = {};
+        for(let n in itemValue){
+            newItemValue[n.replace(new RegExp(`^${fieldPrefix}`), "")] = itemValue[n];
+        }
+        convertedValue.push(newItemValue);
+    });
+    return convertedValue;
+}
+
+/**
+ * 子表组件字段集合属性中每个字段name移除指定前缀
+ * @param {*} fields 子表组件字段集合，数组
+ * @param {*} fieldPrefix 字段前缀
+ * @returns 转换后的子表组件字段值
+ */
+function getTableFieldsWithoutFieldPrefix(fields, fieldPrefix){
+    return (fields || []).map((item) => {
+        const newItem = _$1.clone(item);//这里不clone的话，会造成子表组件重新render，从而审批王那边点开子表行编辑窗口时报错
+        newItem.name = newItem.name.replace(new RegExp(`^${fieldPrefix}`), "");
+        return newItem;
+    });
+}
+
 /**
  * @param {*} props 
  * @param {*} mode edit/new/readonly
@@ -13177,7 +13223,7 @@ function getFormPaginationWrapper(props, form, mode) {
         {
             "type": "wrapper",
             "size": "none",
-            "className": "flex justify-end sticky top-0 right-0 left-0 z-20 bg-white -mt-2",
+            "className": "flex justify-end sticky top-0 right-0 left-0 z-20 bg-white",
             "body": [
                 getFormPagination(props, mode)
             ]
@@ -13193,16 +13239,8 @@ function getFormPaginationWrapper(props, form, mode) {
         }
     ];
     let onServiceInitedScript = `
-        var parent = event.data.parent;
-        var fieldValue = event.data.__tableItems;
-        if(parent){
-            // 如果是子行，即在节点嵌套情况下，当前节点如果是children属性下的子节点时，则算出其所属父行的索引值
-            var primaryKey = "${props.primaryKey}";
-            event.data.__parentIndex = _.findIndex(fieldValue, function(item){
-                return item[primaryKey] == parent[primaryKey];
-            });
-        }
-        // 以下脚本是为了解决有时弹出编辑表单时，表单中的值比最后一次编辑保存的值会延迟一拍。
+
+        // 以下脚本解决了有时弹出编辑表单时，表单中的值比最后一次编辑保存的值会延迟一拍。
         // 比如：inlineEditMode模式时，用户在表格单元格中直接修改数据，然后弹出的表单form中并没有包含单元格中修改的内容
         // 另外有的地方在非inlineEditMode模式时也会有这种延迟一拍问题，比如对象字段中下拉框类型字段的”选择项“属性
         // 再比如工作流规则详细页面修改了子表字段”时间触发器“值后，在只读界面点击查看按钮弹出的表单中__tableItems值是修改前的值
@@ -13215,6 +13253,11 @@ function getFormPaginationWrapper(props, form, mode) {
         // 这里不可以用event.data["${props.name}"]因为amis input talbe有一层单独的作用域，其值会延迟一拍
         // 这里如果不.clone的话，在弹出窗口中显示的子表组件，添加行后点窗口的取消按钮关闭窗口后无法把之前的操作还原，即把之前添加的行自动移除
         let lastestFieldValue = _.clone(wrapperServiceData["${props.name}"] || []);
+        let fieldPrefix = "${props.fieldPrefix}";
+        if(fieldPrefix){
+            let getTableValueWithoutFieldPrefix = new Function('v', 'f', "return (" + ${getTableValueWithoutFieldPrefix.toString()} + ")(v, f)");
+            lastestFieldValue = getTableValueWithoutFieldPrefix(lastestFieldValue, fieldPrefix);
+        }
         //不可以直接像event.data.__tableItems = lastestFieldValue; 这样整个赋值，否则作用域会断
         let mode = "${mode}";
         if(mode === "new"){
@@ -13237,6 +13280,16 @@ function getFormPaginationWrapper(props, form, mode) {
         event.data.__tableItems.forEach(function(n,i){
             event.data.__tableItems[i] = lastestFieldValue[i];
         });
+
+        var parent = event.data.parent;
+        var fieldValue = event.data.__tableItems;
+        if(parent){
+            // 如果是子行，即在节点嵌套情况下，当前节点如果是children属性下的子节点时，则算出其所属父行的索引值
+            var primaryKey = "${props.primaryKey}";
+            event.data.__parentIndex = _.findIndex(fieldValue, function(item){
+                return item[primaryKey] == parent[primaryKey];
+            });
+        }
     `;
     let schema = {
         "type": "service",
@@ -13839,6 +13892,11 @@ const getAmisInputTableSchema = async (props) => {
     if(showOperation !== false){
         showOperation = true;
     }
+    // props.fieldPrefix = "project_milestone_";
+    if (props.fieldPrefix) {
+        props.fields = getTableFieldsWithoutFieldPrefix(props.fields, props.fieldPrefix);
+    }
+    console.log("=getAmisInputTableSchema==props.fields, props.fieldPrefix===", props.fields, props.fieldPrefix);
     let serviceId = getComponentId("table_service", props.id);
     let buttonsForColumnOperations = [];
     let inlineEditMode = props.inlineEditMode;
@@ -13899,6 +13957,11 @@ const getAmisInputTableSchema = async (props) => {
             });
         }
     };
+    if(props.fieldPrefix){
+        inputTableSchema.pipeIn = (value, data) => {
+            return getTableValueWithoutFieldPrefix(value, props.fieldPrefix);
+        };
+    }
     if (buttonsForColumnOperations.length) {
         inputTableSchema.columns.push({
             "name": "__op__",