@steedos-widgets/amis-lib 1.3.1 → 1.3.2-beta.2

package/dist/index.esm.js

@@ -382,11 +382,26 @@ const Router = {
 /*
  * @Author: baozhoutao@steedos.com
  * @Date: 2022-07-20 16:29:22
- * @LastEditors: 殷亮辉 yinlianghui@hotoa.com
- * @LastEditTime: 2023-09-08 14:09:48
+ * @LastEditors: liaodaxue
+ * @LastEditTime: 2023-09-11 17:19:53
  * @Description: 
  */
 
+function getImageFieldUrl(url) {
+  if (window.Meteor && window.Meteor.isCordova != true) {
+    //  '//'的位置
+    const doubleSlashIndex = url.indexOf('//');
+    const urlIndex = url.indexOf('/', doubleSlashIndex + 2);
+    const rootUrl = url.substring(urlIndex);
+    return rootUrl;
+  }
+  return url;
+}
+
+if(typeof window  != 'undefined'){
+  window.getImageFieldUrl = getImageFieldUrl;
+}
+
 function getContrastColor(bgColor) {
   var backgroundColor = (bgColor.charAt(0) === '#') ? bgColor.substring(1, 7) : bgColor;
   var r = parseInt(backgroundColor.substr(0, 2), 16);
@@ -8548,7 +8563,13 @@ async function getTableApi(mainObject, fields, options){
                 if(field.type === 'file'){
                     item[key] = value
                 }else{
-                    item[key] = _.map(value, 'url')
+                    item[key] = _.map(value, (item)=>{
+                        if(field.type === 'image'){
+                            const url = window.getImageFieldUrl(item.url);
+                            return url;
+                        }
+                        return item.url;
+                    })
                 }
             }
         })
@@ -8790,10 +8811,14 @@ function getScriptForAddUrlPrefixForImgFields(fields){
                         let fieldProps = imgFields[item];
                         if(fieldProps.multiple){
                             if(imgFieldDisplayValue instanceof Array){
-                                data[item] = imgFieldDisplayValue.map((i)=>{ return i.url });
+                                data[item] = imgFieldDisplayValue.map((i)=>{ 
+                                    const url = window.getImageFieldUrl(i.url);
+                                    return url;
+                                });
                             }
                         }else{
-                            data[item] = imgFieldDisplayValue && imgFieldDisplayValue.url;
+                            const url = imgFieldDisplayValue && window.getImageFieldUrl(imgFieldDisplayValue.url);
+                            data[item] = url;
                         }
                     }
                 })
@@ -10954,53 +10979,34 @@ async function getListSchema(
     };
 }
 
-// 获取对象表格
-async function getTableSchema(
-    appName,
-    objectName,
-    columns,
-    ctx = {}
-) {
-    // console.time('getTableSchema', columns);
-    const uiSchema = await getUISchema(objectName);
-
-    let sort = ctx.sort;
-    if(!sort){
-        const sortField = ctx.sortField;
-        const sortOrder = ctx.sortOrder;
-        if(sortField){
-            let sortStr = sortField + ' ' + sortOrder || 'asc';
-            sort = sortStr;
-        }
-    }
-
+async function convertColumnsToTableFields(columns, uiSchema, ctx = {}) {
     let fields = [];
-    for(const column of columns){
+    for (const column of columns) {
         if (isString(column)) {
-            if(column.indexOf('.') > 0){
+            if (column.indexOf('.') > 0) {
                 const fieldName = column.split('.')[0];
                 const displayName = column.split('.')[1];
                 const filedInfo = uiSchema.fields[fieldName];
-                if(filedInfo && (filedInfo.type === 'lookup' || filedInfo.type === 'master_detail') && isString(filedInfo.reference_to) ){
+                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}}));
+                    fields.push(Object.assign({}, rfFieldInfo, { name: `${fieldName}__expand.${displayName}`, expand: true, expandInfo: { fieldName, displayName } }, ctx));
                 }
-            }else {
-                if(uiSchema.fields[column]){
-                    fields.push(uiSchema.fields[column]);
+            } else {
+                if (uiSchema.fields[column]) {
+                    fields.push(Object.assign({}, uiSchema.fields[column], ctx));
                 }
             }
         } else if (isObject$1(column)) {
-            if(column.field.indexOf('.') > 0){
+            if (column.field.indexOf('.') > 0) {
                 const fieldName = column.field.split('.')[0];
                 const displayName = column.field.split('.')[1];
                 const filedInfo = uiSchema.fields[fieldName];
-                if(filedInfo && (filedInfo.type === 'lookup' || filedInfo.type === 'master_detail') && isString(filedInfo.reference_to) ){
+                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}},
+                    fields.push(Object.assign({}, rfFieldInfo, ctx,
+                        { name: `${fieldName}__expand.${displayName}`, expand: true, expandInfo: { fieldName, displayName } },
                         {
                             width: column.width,
                             wrap: column.wrap, // wrap = true 是没效果的
@@ -11008,10 +11014,10 @@ async function getTableSchema(
                         }
                     ));
                 }
-            }else {
-                if(uiSchema.fields[column.field]){
+            } else {
+                if (uiSchema.fields[column.field]) {
                     fields.push(
-                        Object.assign({}, uiSchema.fields[column.field], {
+                        Object.assign({}, uiSchema.fields[column.field], ctx, {
                             width: column.width,
                             wrap: column.wrap, // wrap = true 是没效果的
                             amis: column.amis
@@ -11021,17 +11027,36 @@ async function getTableSchema(
             }
         }
     }
+    return fields;
+}
+
+// 获取对象表格
+async function getTableSchema(
+    appName,
+    objectName,
+    columns,
+    ctx = {}
+) {
+    // console.time('getTableSchema', columns);
+    const uiSchema = await getUISchema(objectName);
+
+    let sort = ctx.sort;
+    if(!sort){
+        const sortField = ctx.sortField;
+        const sortOrder = ctx.sortOrder;
+        if(sortField){
+            let sortStr = sortField + ' ' + sortOrder || 'asc';
+            sort = sortStr;
+        }
+    }
+
+    let fields = await convertColumnsToTableFields(columns, uiSchema);
 
     const extraColumns = ctx.extraColumns;
 
     if (extraColumns) {
-        each(extraColumns, function (column) {
-            if (isString(column)) {
-                fields.push({ extra: true, name: column });
-            } else if (isObject$1(column)) {
-                fields.push({ extra: true, name: column.field });
-            }
-        });
+        let extraFields = await convertColumnsToTableFields(extraColumns, uiSchema, {extra: true});
+        fields = fields.concat(extraFields);
     }
     
     const amisSchema = await getObjectCRUD(uiSchema, fields, {