@steedos-widgets/amis-object 1.2.9 → 1.2.10

package/dist/amis-object.umd.css

@@ -393,6 +393,9 @@ body {
 .-mb-4 {
     margin-bottom: -1rem
 }
+.mr-4 {
+    margin-right: 1rem
+}
 .mr-2 {
     margin-right: 0.5rem
 }
@@ -408,9 +411,6 @@ body {
 .ml-4 {
     margin-left: 1rem
 }
-.mr-4 {
-    margin-right: 1rem
-}
 .-ml-px {
     margin-left: -1px
 }
@@ -510,12 +510,12 @@ body {
 .w-14 {
     width: 3.5rem
 }
-.w-6 {
-    width: 1.5rem
-}
 .w-4 {
     width: 1rem
 }
+.w-6 {
+    width: 1.5rem
+}
 .w-20 {
     width: 5rem
 }
@@ -1133,9 +1133,6 @@ body {
   right: 30px;
   background: transparent;
 }
-.antd-Table-toolbar .antd-Crud-loadMore .antd-Button.is-disabled {
-  display: none;
-}
 @media (max-width: 576px) {
   .steedos-record-detail-related-lists .steedos-record-related-list .steedos-object-table .antd-Table-footToolbar {
     display: none;

package/dist/amis-object.umd.js

@@ -767,11 +767,28 @@
 
     };
 
+    /*
+     * @Author: baozhoutao@steedos.com
+     * @Date: 2022-07-20 16:29:22
+     * @LastEditors: Please set LastEditors
+     * @LastEditTime: 2023-05-18 15:22:51
+     * @Description: 
+     */
+
+    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";
+    }
+
     /*
      * @Author: baozhoutao@steedos.com
      * @Date: 2022-05-23 09:53:08
-     * @LastEditors: baozhoutao@steedos.com
-     * @LastEditTime: 2023-04-10 11:22:54
+     * @LastEditors: Please set LastEditors
+     * @LastEditTime: 2023-05-18 16:34:39
      * @Description: 
      */
 
@@ -824,6 +841,21 @@
     function getSelectTpl(field){
         return `<div>\${_display.${field.name}}</div>`
     }
+    function getSelectMap(selectOptions){
+        let map = {};
+        ___default.forEach(selectOptions,(option)=>{
+            const optionValue = option.value + '';
+            if(option.color){
+                const background = option.color.charAt(0) === '#' ? option.color : '#'+option.color;
+                const color = getContrastColor(background);
+                const optionColorStyle = 'background:'+background+';color:'+color;
+                map[optionValue] = `<span class="rounded-xl px-2 py-1" style='${optionColorStyle}'>${option.label}</span>`;
+            }else {
+                map[optionValue] = option.label;
+            }
+        });
+        return map;
+    }
 
     function getNameTplUrl(field, ctx){
         if(ctx.objectName === 'cms_files'){
@@ -3783,8 +3815,8 @@
                     },
                     "body":[{
                       "type": "button",
-                      "visibleOn": "${window:innerWidth > 768 && window:historyPaths.length > 1}",
-                      "className":"flex mr-2",
+                      "visibleOn": "${window:innerWidth > 768 && (window:historyPaths.length > 1 || window:historyPaths[0].params.record_id) && display !== 'split'}",
+                      "className":"flex mr-4",
                       "onEvent": {
                           "click": {
                               "actions": [
@@ -3801,7 +3833,7 @@
                               "category": "utility",
                               "name": "back",
                               "colorVariant": "default",
-                              "className": "slds-button_icon slds-global-header__icon"
+                              "className": "slds-button_icon slds-global-header__icon w-4"
                           }
                       ]
                     }]
@@ -4769,7 +4801,7 @@
                   {
                     "dialog": {
                       "type": "dialog",
-                      "title": "弹框标题",
+                      "title": "默认排序规则",
                       "data": {
                         "&": "$$",
                         "targetObjectName": "${objectName}",
@@ -6369,23 +6401,6 @@ else{
         return readonly ? getAmisFileReadonlySchema(steedosField) : getAmisFileEditSchema(steedosField);
     };
 
-    /*
-     * @Author: baozhoutao@steedos.com
-     * @Date: 2022-07-20 16:29:22
-     * @LastEditors: Please set LastEditors
-     * @LastEditTime: 2023-05-11 11:19:54
-     * @Description: 
-     */
-
-    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 ? "#000000" : "#ffffff";
-    }
-
     const OMIT_FIELDS = ['created', 'created_by', 'modified', 'modified_by'];
     // const Lookup = require('./lookup');
 
@@ -6576,19 +6591,7 @@ else{
                 // break;
             case 'select':
                 if(readonly){
-                    const selectOptions = field.options;
-                    let map = {};
-                    ___default__namespace.forEach(selectOptions,(option)=>{
-                        const optionValue = option.value + '';
-                        if(option.color){
-                            const background = '#'+option.color;
-                            const color = getContrastColor(background);
-                            const optionColorStyle = 'background:'+background+';color:'+color;
-                            map[optionValue] = `<span class="rounded-xl px-2 py-1" style='${optionColorStyle}'>${option.label}</span>`;
-                        }else {
-                            map[optionValue] = option.label;
-                        }
-                    });
+                    const map = getSelectMap(field.options);
                     convertData = {
                         type: "static-mapping",
                         name: field.name,
@@ -7287,7 +7290,8 @@ else{
         data.global = "${global}";
         data.context = "${context}";
         data.defaultData = "${defaultData}";
-
+        data._master = "${_master}";
+        
         return {
             method: "post",
             url: getApi$2() + '&objectName=${objectName}' ,
@@ -7353,7 +7357,7 @@ else{
                             formInitialValuesFun = new Function("return " + formInitialValuesFun)();
                         }
                         if(typeof formInitialValuesFun === "function"){
-                            initialValues = formInitialValuesFun.apply({doc: defaultValues || {} , global: api.body.global})
+                            initialValues = formInitialValuesFun.apply({doc: defaultValues || {} , global: api.body.global, master: api.body._master })
                         }
                     }
                     catch(ex){
@@ -8009,19 +8013,7 @@ else{
                 }, field.amis, {name: field.name}));
             }
             else if(field.type === 'select'){
-                const selectOptions = field.options;
-                let map = {};
-                ___default.forEach(selectOptions,(option)=>{
-                    const optionValue = option.value + '';
-                    if(option.color){
-                        const background = '#'+option.color;
-                        const color = getContrastColor(background);
-                        const optionColorStyle = 'background:'+background+';color:'+color;
-                        map[optionValue] = `<span class="rounded-xl px-2 py-1" style='${optionColorStyle}'>${option.label}</span>`;
-                    }else {
-                        map[optionValue] = option.label;
-                    }
-                });
+                const map = getSelectMap(field.options);
                 columns.push(Object.assign({}, {
                     type: "mapping",
                     name: field.name,
@@ -8574,11 +8566,10 @@ else{
         if(api.data.$self._isRelated){
             const self = api.data.$self;
             const relatedKey = self.relatedKey;
-            const recordId = self.recordId;
             const refField = self.uiSchema.fields[relatedKey];
             const masterRecord = self._master.record;
             const masterObjectName = self._master.objectName;
-            let relatedValue = recordId;
+            let relatedValue = self._master.recordId;
             if(refField.reference_to_field && refField.reference_to_field != '_id'){
                 relatedValue = masterRecord[refField.reference_to_field]
             }
@@ -14980,7 +14971,7 @@ else{
      * @Author: baozhoutao@steedos.com
      * @Date: 2022-09-01 14:44:57
      * @LastEditors: 殷亮辉 yinlianghui@hotoa.com
-     * @LastEditTime: 2023-05-17 17:26:22
+     * @LastEditTime: 2023-05-18 22:39:31
      * @Description:
      */
     var AmisGlobalHeader = function (props) { return __awaiter(void 0, void 0, void 0, function () {
@@ -15040,7 +15031,7 @@ else{
                                             },
                                             {
                                                 "type": "button",
-                                                "visibleOn": "${window:innerWidth < 768 && window:historyPaths.length > 1}",
+                                                "visibleOn": "${window:innerWidth < 768 && (window:historyPaths.length > 1 || window:historyPaths[0].params.record_id)}",
                                                 "className": "flex",
                                                 "onEvent": {
                                                     "click": {
@@ -15066,7 +15057,7 @@ else{
                                                 "className": 'block h-10 w-auto mr-4',
                                                 "type": "tpl",
                                                 "tpl": "<a href='/app' class='flex items-center '><img class='block h-10 w-auto' src='".concat(logoSrc, "'></a>"),
-                                                "hiddenOn": "${window:innerWidth < 768 && window:historyPaths.length > 1}"
+                                                "hiddenOn": "${window:innerWidth < 768 && (window:historyPaths.length > 1 || window:historyPaths[0].params.record_id)}"
                                             },
                                         ],
                                     },