@steedos-widgets/amis-object 6.3.0 → 6.3.1

package/dist/amis-object.cjs.js

@@ -4387,7 +4387,7 @@ async function getLookupLinkOnClick$1(field, options) {
     const recordPage = await getPage({ type: 'record', appId: options.appId, objectName: options.objectName, formFactor: options.formFactor });
 
     const drawerRecordDetailSchema = recordPage ? Object.assign({}, recordPage.schema, {
-        "recordId": "${value}",
+        "recordId": `\${${field.name}}`,
         "data": {
             ...recordPage.schema.data,
             "_inDrawer": true,  // 用于判断是否在抽屉中
@@ -4397,7 +4397,7 @@ async function getLookupLinkOnClick$1(field, options) {
     }) : {
         "type": "steedos-record-detail",
         "objectApiName": options.objectName,
-        "recordId": "${value}",
+        "recordId": `\${${field.name}}`,
         "showBackButton": false,
         "showButtons": true,
         "data": {
@@ -4503,7 +4503,7 @@ const  getAmisFileReadonlySchema = async (steedosField,ctx = {})=>{
                     labelClassName: "hidden",
                     label: false,
                     className: 'm-0',
-                    tpl: `<a href="/app/-/cfs_files_filerecord/view/\${value}" ${lookupATagClick}>\${name}</a>`,
+                    tpl: `<a href="/app/-/cfs_files_filerecord/view/\${${steedosField.name}}" ${lookupATagClick}>\${name}</a>`,
                     // tpl: "<%= item.name >",
                     // onEvent: window.innerWidth < 768 ? null : REFERENCE_VALUE_ITEM_ONCLICK
                     onEvent: window.innerWidth < 768 ? null : await getLookupLinkOnClick$1(steedosField, {
@@ -5513,7 +5513,7 @@ async function getTableColumns$1(object, fields, options){
         }
         //增加quickEdit属性，实现快速编辑
         const quickEditSchema = allowEdit ? await getQuickEditSchema(object, field, options) : allowEdit;
-        let className = "";
+        let className = `steedos-table-${field.type}-field`;
         const bowserType = getBowserType();
         if(bowserType === "Safari"){
             className += " whitespace-nowrap ";
@@ -16900,6 +16900,8 @@ async function convertSFieldToAmisField(field, readonly, ctx) {
                     if(gridSub){
                         delete gridSub.name;
                         delete gridSub.label;
+                        //去除重复样式
+                        gridSub.className = gridSub.className.replace('border-b', '');
                         convertData.items.push(
                             Object.assign({}, gridSub, {label: subField.label}, subField.amis, {
                                 name: subFieldName
@@ -16954,6 +16956,10 @@ async function convertSFieldToAmisField(field, readonly, ctx) {
         }
         // if(ctx.mode === 'edit'){
         let convertDataResult = Object.assign({}, baseData, convertData, { labelClassName: 'text-left', clearValueOnHidden: true, fieldName: field.name}, field.amis, {name: baseData.name});
+        // 只读时file字段的外层control层若存在name，内部each组件存在问题
+        if(readonly && field.type == "file") {
+            convertDataResult.name = "";
+        }
         // console.log("convertDataResult:", convertDataResult);
         return convertDataResult;
         // }else{
@@ -17173,13 +17179,17 @@ const getSection = async (formFields, permissionFields, fieldSchemaArray, sectio
       // console.log(`perField.type object ===> field`, field)
     }
     if (field.name.indexOf(".") < 0) {
+      let _field = _.cloneDeep(field);
+      if(field.type === "select" && field.data_type && field.data_type != "text"){
+        _field.type = field.data_type;
+      }
       if(field.type === "steedos-field"){
         // 如果是steedos-field则不需要通过convertSFieldToAmisField函数转换，因为steedos-field组件会转换
-        fieldSetBody.push(field);
+        fieldSetBody.push(_field);
       }
       else {
         ctx.__formFields = formFields;
-        const amisField = await convertSFieldToAmisField(field, field.readonly, ctx);
+        const amisField = await convertSFieldToAmisField(_field, _field.readonly, ctx);
         // 如果steedos-field稳定了，可以放开下面的代码直接用组件统一渲染字段
         // const amisField = {
         //   "type": "steedos-field",
@@ -22874,7 +22884,7 @@ var AmisProvider = function (props) { return __awaiter(void 0, void 0, void 0, f
  * @Description:
  */
 var AmisAppLauncher = function (props) { return __awaiter(void 0, void 0, void 0, function () {
-    var app, data, className, _a, showAppName, _b, appNameClassName, _c, customElements, _d, showAppIcon, formFactor, isMobile, on_click_script, mobile_blank_script, convertAppVisibleOnScript, pcInitApiAdaptorScript, mobileInitApiAdaptorScript, dialogSchema, badgeText;
+    var app, data, className, _a, showAppName, _b, appNameClassName, _c, customElements, _d, showAppIcon, formFactor, isMobile, on_click_script, mobile_blank_script, convertAppVisibleOnScript, pcInitApiAdaptorScript, mobileInitApiAdaptorScript, dialogSchema, badgeText, overlaySchema;
     return __generator(this, function (_e) {
         app = props.app, data = props.data, className = props.className, _a = props.showAppName, showAppName = _a === void 0 ? true : _a, _b = props.appNameClassName, appNameClassName = _b === void 0 ? '' : _b, _c = props.customElements, customElements = _c === void 0 ? [] : _c, _d = props.showAppIcon, showAppIcon = _d === void 0 ? true : _d;
         if (!app) {
@@ -22889,113 +22899,7 @@ var AmisAppLauncher = function (props) { return __awaiter(void 0, void 0, void 0
         mobileInitApiAdaptorScript = "\n    let app_items = payload;\n    ".concat(convertAppVisibleOnScript, "\n    payload = {\n      app_items\n    }\n    return payload;\n  ");
         dialogSchema = {};
         badgeText = "${IF(${id} == 'approve_workflow',${ss:keyvalues.badge.value|pick:'workflow'},${ss:keyvalues.badge.value|pick:${id}}) | toInt}";
-        if (isMobile) {
-            dialogSchema = {
-                "type": "service",
-                "className": "steedos-apps-service",
-                "affixFooter": false,
-                "body": [
-                    {
-                        "type": "each",
-                        "name": "app_items",
-                        "items": {
-                            "type": "button",
-                            "level": "link",
-                            "body": [
-                                {
-                                    "type": "tpl",
-                                    "tpl": "<div class='flex flex-col justify-center'><div class='text-center'><svg class='w-12 h-12 slds-icon slds-icon_container slds-icon-standard-${REPLACE(icon, '_', '-' )}' aria-hidden='true'><use xlink:href='/assets/icons/standard-sprite/svg/symbols.svg#${icon}'></use></svg></div><div class='text-center text-lg'>${name}</div></div>",
-                                    "badge": {
-                                        "mode": "text",
-                                        "text": badgeText,
-                                        "visibleOn": badgeText,
-                                        "overflowCount": 99,
-                                        "style": {
-                                            "right": "50%",
-                                            "margin-right": "-23px",
-                                            "height": "20px",
-                                            "border-radius": "10px",
-                                            "font-size": "16px",
-                                            "line-height": "18px"
-                                        }
-                                    }
-                                }
-                            ],
-                            "onEvent": {
-                                "click": {
-                                    "actions": [
-                                        {
-                                            "actionType": "closeDialog"
-                                        },
-                                        {
-                                            "actionType": "link",
-                                            "args": {
-                                                "link": "${path}"
-                                            },
-                                            "expression": "${AND(!blank , !on_click)}"
-                                        },
-                                        {
-                                            "actionType": "custom",
-                                            "script": mobile_blank_script,
-                                            "expression": "${AND(blank , !on_click)}"
-                                        },
-                                        {
-                                            "actionType": "custom",
-                                            "script": on_click_script,
-                                            "expression": "${on_click}"
-                                        }
-                                    ]
-                                }
-                            },
-                            "visibleOn": "${visible_on}",
-                            "className": "block w-1/3 py-4",
-                            "style": {
-                                "display": "inline-flex",
-                                "justify-content": "center"
-                            }
-                        },
-                        "className": "flex flex-wrap",
-                        "id": "u:a98e9f6fb4db"
-                    }
-                ],
-                "clearValueOnHidden": false,
-                "visible": true,
-                "messages": {},
-                "api": {
-                    "method": "get",
-                    "url": "${context.rootUrl}/service/api/apps/menus?mobile=true",
-                    "headers": {
-                        "Authorization": "Bearer ${context.tenantId},${context.authToken}"
-                    },
-                    "adaptor": mobileInitApiAdaptorScript,
-                    "messages": {}
-                },
-                "onEvent": {
-                    "@data.changed.steedos_keyvalues": {
-                        "actions": [
-                            {
-                                "actionType": "reload"
-                            }
-                        ]
-                    },
-                    "fetchInited": {
-                        "actions": [
-                            {
-                                "actionType": "broadcast",
-                                "args": {
-                                    "eventName": "@appsLoaded"
-                                },
-                                "data": {
-                                    "apps": "${event.data.app_items}"
-                                }
-                            }
-                        ]
-                    }
-                },
-                "id": "u:2c8bd22d4ea8"
-            };
-        }
-        else {
+        if (!isMobile) {
             dialogSchema = {
                 "type": "service",
                 "id": "u:0f6224a0836f",
@@ -23158,6 +23062,7 @@ var AmisAppLauncher = function (props) { return __awaiter(void 0, void 0, void 0
                 },
                 "api": {
                     "method": "get",
+                    "cache": "10000",
                     "url": "${context.rootUrl}/service/api/apps/menus?mobile=" + isMobile,
                     "data": null,
                     "headers": {
@@ -23167,11 +23072,139 @@ var AmisAppLauncher = function (props) { return __awaiter(void 0, void 0, void 0
                 }
             };
         }
+        overlaySchema = {
+            "type": "service",
+            "className": isMobile ? "steedos-apps-service" : "steedos-apps-service w-96",
+            "affixFooter": false,
+            "body": [
+                {
+                    "type": "each",
+                    "source": isMobile ? "${app_items}" : "${ARRAYFILTER(app_items, (item,index) => index<=8)}",
+                    "items": {
+                        "type": "button",
+                        "level": "link",
+                        "body": [
+                            {
+                                "type": "tpl",
+                                "tpl": "<div class='flex flex-col justify-center'><div class='text-center'><svg class='w-12 h-12 slds-icon slds-icon_container slds-icon-standard-${REPLACE(icon, '_', '-' )}' aria-hidden='true'><use xlink:href='/assets/icons/standard-sprite/svg/symbols.svg#${icon}'></use></svg></div><div class='text-center text-lg'>${name}</div></div>",
+                                "badge": {
+                                    "mode": "text",
+                                    "text": badgeText,
+                                    "visibleOn": badgeText,
+                                    "overflowCount": 99,
+                                    "style": {
+                                        "right": "50%",
+                                        "margin-right": "-23px",
+                                        "height": "20px",
+                                        "border-radius": "10px",
+                                        "font-size": "16px",
+                                        "line-height": "18px"
+                                    }
+                                }
+                            }
+                        ],
+                        "onEvent": {
+                            "click": {
+                                "actions": [
+                                    {
+                                        "actionType": "closeDialog"
+                                    },
+                                    {
+                                        "actionType": "link",
+                                        "args": {
+                                            "link": "${path}"
+                                        },
+                                        "expression": "${AND(!blank , !on_click)}"
+                                    },
+                                    {
+                                        "actionType": "custom",
+                                        "script": mobile_blank_script,
+                                        "expression": "${AND(blank , !on_click)}"
+                                    },
+                                    {
+                                        "actionType": "custom",
+                                        "script": on_click_script,
+                                        "expression": "${on_click}"
+                                    }
+                                ]
+                            }
+                        },
+                        "visibleOn": "${visible_on}",
+                        "className": "block w-1/3 py-4",
+                        "style": {
+                            "display": "inline-flex",
+                            "justify-content": "center"
+                        }
+                    },
+                    "className": "flex flex-wrap",
+                    "id": "u:a98e9f6fb4db"
+                },
+                isMobile ? null : {
+                    "type": "divider",
+                    "className": "m-0"
+                },
+                isMobile ? null : {
+                    "type": "button",
+                    "level": "link",
+                    "label": "更多",
+                    "className": "w-full h-10",
+                    "actionType": "dialog",
+                    "dialog": {
+                        "size": "xl",
+                        "title": {
+                            "type": "tpl",
+                            "tpl": instance.t('frontend_application_launcher'),
+                            "className": "block text-xl text-center"
+                        },
+                        "actions": [],
+                        "body": [
+                            dialogSchema
+                        ]
+                    }
+                }
+            ],
+            "clearValueOnHidden": false,
+            "visible": true,
+            "messages": {},
+            "api": {
+                "method": "get",
+                "cache": "10000",
+                "url": "${context.rootUrl}/service/api/apps/menus?mobile=true",
+                "headers": {
+                    "Authorization": "Bearer ${context.tenantId},${context.authToken}"
+                },
+                "adaptor": mobileInitApiAdaptorScript,
+                "messages": {}
+            },
+            "onEvent": {
+                "@data.changed.steedos_keyvalues": {
+                    "actions": [
+                        {
+                            "actionType": "reload"
+                        }
+                    ]
+                },
+                "fetchInited": {
+                    "actions": [
+                        {
+                            "actionType": "broadcast",
+                            "args": {
+                                "eventName": "@appsLoaded"
+                            },
+                            "data": {
+                                "apps": "${event.data.app_items}"
+                            }
+                        }
+                    ]
+                }
+            },
+            "id": "u:2c8bd22d4ea8"
+        };
         return [2 /*return*/, {
                 "type": "service",
                 className: className,
                 "body": [
-                    {
+                    isMobile ? {
                         "type": "button",
                         "actionType": "dialog",
                         "className": "flex items-center",
@@ -23206,10 +23239,43 @@ var AmisAppLauncher = function (props) { return __awaiter(void 0, void 0, void 0
                             },
                             "actions": [],
                             "body": [
-                                dialogSchema
+                                overlaySchema
                             ]
                         },
                         "id": "u:b5dc095e1c11"
+                    } : {
+                        "type": "steedos-dropdown",
+                        "placement": "bottomRight",
+                        "trigger": [
+                            "click"
+                        ],
+                        "body": __spreadArray([
+                            {
+                                "type": "tpl",
+                                "className": "flex items-center",
+                                "tpl": "<div aria-haspopup='true' title='".concat(instance.t('frontend_open_app_launcher'), "' class='slds-icon-waffle_container slds-context-bar__button' type='button'><span class='slds-icon-waffle'><span class='slds-r1'></span><span class='slds-r2'></span><span class='slds-r3'></span><span class='slds-r4'></span><span class='slds-r5'></span><span class='slds-r6'></span><span class='slds-r7'></span><span class='slds-r8'></span><span class='slds-r9'></span></span></div>"),
+                                "badge": {
+                                    "visibleOn": "${ss:keyvalues.badge.value.workflow | toInt}",
+                                    "offset": [3, -3],
+                                    "style": {
+                                        "width": "8px",
+                                        "height": "8px"
+                                    }
+                                },
+                                "hiddenOn": "".concat(!showAppIcon)
+                            },
+                            {
+                                type: 'tpl',
+                                className: "text-xl ml-4 mr-4 text-black nowrap ".concat(appNameClassName, " "),
+                                tpl: '${app.name}',
+                                hiddenOn: "".concat(!!app || !!!showAppName)
+                            }
+                        ], __read(customElements), false),
+                        "overlay": [
+                            overlaySchema
+                        ],
+                        "className": "flex items-center",
+                        "open": false
                     }
                 ],
                 "id": "u:06ee48db134a",
@@ -23905,7 +23971,7 @@ var AmisGlobalHeader = function (props) { return __awaiter(void 0, void 0, void
             body: [
                 {
                     "type": "wrapper",
-                    "className": "bg-white sticky p-0 top-0 z-40 w-full flex-none backdrop-blur transition-colors duration-500 lg:z-50  border-b-[3px] border-sky-500 border-solid steedos-header-container sm:shadow",
+                    "className": "bg-white sticky p-0 top-0 z-40 w-full flex-none backdrop-blur transition-colors duration-500 lg:z-[1000]  border-b-[3px] border-sky-500 border-solid steedos-header-container sm:shadow",
                     body: [
                         {
                             "type": "wrapper",
@@ -24361,7 +24427,7 @@ var AmisSteedosField = function (props) { return __awaiter(void 0, void 0, void
                             _q), {
                             type: 'static',
                             tpl: '-',
-                            className: "".concat(fieldBaseProps.className || '', " text-muted"),
+                            className: "".concat(fieldBaseProps.className || '', " text-muted !border-b-0"),
                             hiddenOn: "${_display.".concat(steedosField.name, "}"),
                         }],
                         _p)]));
@@ -24475,7 +24541,7 @@ var AmisSteedosField = function (props) { return __awaiter(void 0, void 0, void
                         hasImageOrFile_1 = false;
                         _$1.forEach(fieldValue, function (item) {
                             var fileName = item.name;
-                            if ([".pdf", ".jpg", ".jpeg", ".png", ".gif"].indexOf(fileName.slice(-4)) > -1) {
+                            if ([".pdf", ".jpg", ".jpeg", ".png", ".gif"].indexOf(fileName.toLowerCase().slice(-4)) > -1) {
                                 hasImageOrFile_1 = true;
                             }
                         });
@@ -24487,7 +24553,7 @@ var AmisSteedosField = function (props) { return __awaiter(void 0, void 0, void
                             var fileName = item.name;
                             var fileUrl = item.url;
                             var filePreviewHtml = '';
-                            if ([".pdf", ".jpg", ".jpeg", ".png", ".gif"].indexOf(fileName.slice(-4)) > -1) {
+                            if ([".pdf", ".jpg", ".jpeg", ".png", ".gif"].indexOf(fileName.toLowerCase().slice(-4)) > -1) {
                                 var indexOfQuestionMark = fileUrl.indexOf('?');
                                 if (indexOfQuestionMark > -1) {
                                     var filePreviewUrl = fileUrl.substring(0, indexOfQuestionMark);