@steedos-widgets/amis-lib 6.3.11-beta.2 → 6.3.11-beta.20

package/dist/index.cjs.js

@@ -415,18 +415,24 @@ const Router = {
 /*
  * @Author: baozhoutao@steedos.com
  * @Date: 2022-07-20 16:29:22
- * @LastEditors: liaodaxue
- * @LastEditTime: 2024-01-25 14:44:17
+ * @LastEditors: baozhoutao@steedos.com
+ * @LastEditTime: 2024-11-17 13:05:44
  * @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;
+function getImageFieldUrl(url, readonly) {
+  if (window.Meteor) {
+    if(window.Meteor.isCordova != true){
+      //  '//'的位置
+      const doubleSlashIndex = url.indexOf('//');
+      const urlIndex = url.indexOf('/', doubleSlashIndex + 2);
+      const rootUrl = url.substring(urlIndex);
+      return rootUrl;
+    }else {
+      if(readonly || url.startsWith('http')){
+        return `${url}?token=${window.btoa(JSON.stringify({ authToken : Builder.settings.context.authToken }))}`
+      }
+    }
   }
   return url;
 }
@@ -435,13 +441,29 @@ if(typeof window  != 'undefined'){
   window.getImageFieldUrl = getImageFieldUrl;
 }
 
+
+
+// js color
+
+function toGrayscale(r, g, b){
+  return (
+    0.2126 * r +
+    0.7152 * g +
+    0.0722 * b
+  );
+}
+
+function isLight(r, g, b){
+  // 专业的亮度是 > 255 / 2. 此处的阈值调整为200 
+  return toGrayscale(r, g, b) > 200
+}
+
 function getContrastColor(bgColor) {
   var backgroundColor = (bgColor.charAt(0) === '#') ? bgColor.substring(1, 7) : bgColor;
   var r = parseInt(backgroundColor.substr(0, 2), 16);
   var g = parseInt(backgroundColor.substr(2, 2), 16);
   var b = parseInt(backgroundColor.substr(4, 2), 16);
-  var brightness = (r * 299 + g * 587 + b * 114) / 1000;
-  return brightness < 128 ? "#ffffff" : "#000000";
+  return isLight(r, g, b) ? "#000000" : "#ffffff";
 }
 
 function getLookupListView(refObjectConfig) {
@@ -511,7 +533,7 @@ function getComparableAmisVersion() {
  * @Author: baozhoutao@steedos.com
  * @Date: 2022-05-23 09:53:08
  * @LastEditors: baozhoutao@steedos.com
- * @LastEditTime: 2024-02-21 17:19:30
+ * @LastEditTime: 2024-11-17 13:10:08
  * @Description: 
  */
 
@@ -572,7 +594,7 @@ function getSelectMap(selectOptions){
         if(optionColor && optionColor != "undefined"){
             const background = optionColor.charAt(0) === '#' ? optionColor : '#'+optionColor;
             const color = getContrastColor(background);
-            const optionColorStyle = 'background:'+background+';color:'+color+';line-height:1.5rem';
+            const optionColorStyle = 'background:'+background+';color:'+color+';line-height:1.5rem;font-size:14px';
             map[optionValue] = `<span class="rounded-xl px-2 py-1" style='${optionColorStyle}'>${option.label}</span>`;
         }else {
             map[optionValue] = option.label;
@@ -933,12 +955,12 @@ function getScriptForRemoveUrlPrefixForImgFields(fields){
                     if(imgFieldValue instanceof Array){
                         formData[item] = imgFieldValue.map((value)=>{ 
                             let itemValue = value && value.split('/');
-                            return itemValue[itemValue.length - 1];
+                            return itemValue[itemValue.length - 1].split('?')[0];
                         });
                     }
                 }else{
                     let imgValue = imgFieldValue.split('/');
-                    formData[item] = imgValue[imgValue.length - 1];
+                    formData[item] = imgValue[imgValue.length - 1].split('?')[0];
                 }
             }
         })
@@ -1218,7 +1240,7 @@ async function getPage({type, pageId = '', appId, objectName = '', recordId = ''
  * @Author: baozhoutao@steedos.com
  * @Date: 2022-10-28 14:15:09
  * @LastEditors: baozhoutao@steedos.com
- * @LastEditTime: 2024-08-19 16:26:58
+ * @LastEditTime: 2024-11-14 10:50:01
  * @Description: 
  */
 
@@ -1277,6 +1299,7 @@ async function getLookupLinkOnClick(field, options) {
                         "title": "&nbsp;",
                         "headerClassName": "hidden",
                         "size": "lg",
+                        "width": "70%",
                         "bodyClassName": "p-0 m-0 bg-gray-100",
                         "closeOnEsc": true,
                         "closeOnOutside": true,
@@ -1316,13 +1339,13 @@ const  getAmisFileReadonlySchema = async (steedosField,ctx = {})=>{
     if(type === 'file'){
         return window.Meteor?.isCordova ? {
             "type": "control",
-            "body": {
+            "body": steedosField.multiple ? {
                 "type": "each",
                 "name": "_display." + steedosField.name,
                 "items": {
                     "type": "tpl",
                     "tpl": "${name}",
-                    "className": "antd-Button--link inline-block",
+                    "className": "antd-Button--link inline-block mr-2",
                     "onEvent": {
                         "click": {
                             "actions": [
@@ -1337,6 +1360,24 @@ const  getAmisFileReadonlySchema = async (steedosField,ctx = {})=>{
                         }
                     }
                 }
+            } : {
+                "type": "tpl",
+                "tpl": "${_display." + steedosField.name + ".name}",
+                "className": "antd-Button--link inline-block",
+                "onEvent": {
+                    "click": {
+                        "actions": [
+                            {
+                                "script": `
+                                    const data = event.data._display.${steedosField.name};
+                                    Steedos.cordovaDownload(encodeURI(data.url), data.name);
+                                `,
+                                "actionType": "custom"
+                            }
+                        ],
+                        "weight": 0
+                    }
+                }
             }
         } : {
             // type: amisFieldType,
@@ -2351,6 +2392,7 @@ async function getColumnItemOnClick(field, options){
                   "title": "&nbsp;",
                   "headerClassName": "hidden",
                   "size": "lg",
+                  "width": "70%",
                   "bodyClassName": "p-0 m-0 bg-gray-100",
                   "closeOnEsc": true,
                   "closeOnOutside": true,
@@ -3502,7 +3544,7 @@ function getReadonlyFormAdaptor(object, fields, options){
         var gridAndObjectFieldsName = ${JSON.stringify(gridAndObjectFieldsName)};
         try{
             ${scriptStr}
-            ${getScriptForAddUrlPrefixForImgFields(fields)}
+            ${getScriptForAddUrlPrefixForImgFields(fields, true)}
             ${getScriptForRewriteValueForFileFields(fields)}
         }catch(e){
             console.error(e)
@@ -3566,7 +3608,7 @@ async function getReadonlyFormInitApi(object, recordId, fields, options){
 /*
     img/avatar字段值添加URL前缀使其在amis中正常显示图片。
 */
-function getScriptForAddUrlPrefixForImgFields(fields){
+function getScriptForAddUrlPrefixForImgFields(fields, readonly){
     let imgFieldsKeys = [];
     let imgFields = {};
     fields.forEach((item)=>{
@@ -3594,12 +3636,12 @@ function getScriptForAddUrlPrefixForImgFields(fields){
                         if(fieldProps.multiple){
                             if(imgFieldDisplayValue instanceof Array){
                                 data[item] = imgFieldDisplayValue.map((i)=>{ 
-                                    const url = window.getImageFieldUrl(i.url);
+                                    const url = window.getImageFieldUrl(i.url, ${readonly});
                                     return url;
                                 });
                             }
                         }else{
-                            const url = imgFieldDisplayValue && window.getImageFieldUrl(imgFieldDisplayValue.url);
+                            const url = imgFieldDisplayValue && window.getImageFieldUrl(imgFieldDisplayValue.url, ${readonly});
                             data[item] = url;
                         }
                     }
@@ -3695,7 +3737,7 @@ async function getEditFormInitApi(object, recordId, fields, options){
                 const fieldKeys = uiSchema && _.keys(uiSchema.fields);
 
                 if(data){
-                    ${getScriptForAddUrlPrefixForImgFields(fields)}
+                    ${getScriptForAddUrlPrefixForImgFields(fields, false)}
                     ${getScriptForRewriteValueForFileFields(fields)}
 
                     _.each(dataKeys, function(key){
@@ -7765,7 +7807,7 @@ async function getObjectRecordDetailHeader(objectSchema, recordId, options) {
   let body = [
     {
       "type": "wrapper",
-      "className": "p-4 border-b",
+      "className": "p-4",
       "body": [
         {
           "type": "grid",
@@ -7863,7 +7905,7 @@ async function getObjectRecordDetailHeader(objectSchema, recordId, options) {
         "body": details,
         "hiddenOn": "${recordLoaded != true}"
       },
-      "className": "steedos-record-compact-layouts p-4 bg-white compact-layouts border-b"
+      "className": "steedos-record-compact-layouts p-4 pb-2 border-t compact-layouts"
     });
   }
 
@@ -10929,7 +10971,7 @@ async function getRecordDetailSchema(objectName, appId, props = {}){
     };
     const content = {
         "type": "tabs",
-        "className": "steedos-record-tabs bg-white p-4 sm:m-2 sm:border sm:rounded",
+        "className": "steedos-record-tabs bg-white p-4 sm:m-4 sm:shadow sm:rounded",
         "contentClassName": "bg-none",
         "tabs": [
             detailed
@@ -13222,6 +13264,7 @@ async function convertSFieldToAmisField(field, readonly, ctx) {
                     type: "static-mapping",
                     name: field.name,
                     label: field.label,
+                    options: field.options,
                     map: map
                 };
             }else {
@@ -13345,7 +13388,7 @@ async function convertSFieldToAmisField(field, readonly, ctx) {
             // }
             // 日期时间字段，按日期方式展现显示控件，用户不用关心小时分钟
             convertData = {
-                type: "input-date-range",
+                type: "input-datetime-range",
                 inputFormat: "YYYY-MM-DD HH:mm",
                 format:'YYYY-MM-DDTHH:mm:ss.SSSZ',
                 tpl: readonly ? getDateTimeTpl(field) : null,