@steedos-widgets/amis-object 1.2.11 → 1.2.13

package/dist/amis-object.umd.css

@@ -1237,6 +1237,9 @@ body {
   -moz-column-gap: 1rem;
        column-gap: 1rem;
 }
+.steedos-amis-form .antd-Collapse .antd-Collapse-header.hidden {
+  display: none !important;
+}
 
 @media (max-width: 768px) {
   .record-detail-header-name {

package/dist/amis-object.umd.js

@@ -2253,7 +2253,23 @@
                                       {
                                         name: "template_url",
                                         label: "导入模板",
-                                        type: "markdown",
+                                        type: "button-group",
+                                        buttons: [
+                                          {
+                                            type: "button",
+                                            label: "下载",
+                                            visibleOn: "${template_url}",
+                                            level: "link",
+                                            actionType: "download",
+                                            api:{
+                                              url: "${template_url}",
+                                              method: "get",
+                                              headers: {
+                                                Authorization: "Bearer ${context.tenantId},${context.authToken}"
+                                              }
+                                            }
+                                          }
+                                        ],
                                         options: {
                                           html: true
                                         },
@@ -2801,7 +2817,14 @@
             className: `button_${button.name}`
             }
         });
-        let dropdownButtons = ___default__default["default"].map(moreButtons, (button) => {
+        let moreButtonsVisibleOn = '';
+        let dropdownButtons = ___default__default["default"].map(moreButtons, (button, index) => {
+            if(index === 0){
+                moreButtonsVisibleOn = getButtonVisibleOn$1(button);
+            }else {
+                moreButtonsVisibleOn = moreButtonsVisibleOn + ' || ' +getButtonVisibleOn$1(button);
+            }
+           
             return {
             type: 'steedos-object-button',
             name: button.name,
@@ -2811,12 +2834,13 @@
         });
         return {
             buttons: amisButtonsSchema,
-            moreButtons: dropdownButtons
+            moreButtons: dropdownButtons,
+            moreButtonsVisibleOn
         };
     };
 
     const getObjectDetailButtonsSchemas = (objectSchema, recordId, ctx)=>{
-        const { buttons, moreButtons } = getObjectDetailHeaderButtons(objectSchema, recordId);
+        const { buttons, moreButtons, moreButtonsVisibleOn } = getObjectDetailHeaderButtons(objectSchema, recordId);
         if(ctx.formFactor === 'SMALL'){
             return {
                 "type": "button",
@@ -2871,7 +2895,8 @@
                     type: "steedos-dropdown-button",
                     label: "",
                     buttons: moreButtons,
-                    className: 'slds-icon'
+                    className: 'slds-icon',
+                    visibleOn: moreButtonsVisibleOn
                 };
                 buttons.push(dropdownButtonsSchema);
             }
@@ -5004,12 +5029,13 @@
             "type": "dropdown-button",
             "trigger": "click",
             "icon": "fa fa-cog",
+            "tooltip": "列表视图控制",
             "btnClassName": "antd-Button--iconOnly bg-white p-2 rounded border-gray-300 text-gray-500",
             "align": "right",
             "visibleOn": "${!isLookup}",
             "buttons": [
               {
-                "label": "列表视图操作",
+                "label": "列表视图控制",
                 "children": [
                   getNewListviewButtonSchema(),
                   getCopyListviewButtonSchema(),
@@ -5043,9 +5069,11 @@
           "rightIconClassName": "m-l-sm"
         }
       ];
+      const displayAsLabel = displayAs === 'split'? "分栏视图" : "表格";
       return {
         "type": "dropdown-button",
         "icon": "fa fa-table-columns",
+        "tooltip": `显示为 ${displayAsLabel}`,
         "btnClassName": "antd-Button--iconOnly bg-white p-2 rounded border-gray-300 text-gray-500",
         "align": "right",
         "visibleOn": "${window:innerWidth > 768 && !!!isLookup}",
@@ -5125,6 +5153,7 @@ else{
             // "type": "reload",//不可以直接使用reload，因为它不会设置页码到第一页
             "type": "button",
             "align": "right",
+            "tooltip": "刷新",
             "className": "bg-white p-2 rounded border-gray-300 text-gray-500",
             "label": "",
             "icon": "fa fa-sync",
@@ -5144,6 +5173,7 @@ else{
             "label": "",
             "icon": "fa fa-search",
             "type": "button",
+            "tooltip": "搜索",
             "badge": {
               "offset": [
                 -5,
@@ -5188,6 +5218,7 @@ else{
           {
             "type": "reload",
             "align": "right",
+            "tooltip": "刷新",
             "tooltipPlacement": "bottom",
             "className": "bg-white p-2 rounded border-gray-300 text-gray-500"
           },
@@ -5195,6 +5226,8 @@ else{
           filterVisible ? {
             "label": "",
             "icon": "fa fa-search",
+            "tooltip": "搜索",
+            "tooltipPlacement": "bottom",
             "type": "button",
             "align": "right",
             "className": "bg-white p-2 rounded border-gray-300 text-gray-500",
@@ -6219,8 +6252,8 @@ else{
     /*
      * @Author: baozhoutao@steedos.com
      * @Date: 2023-01-13 17:27:54
-     * @LastEditors: baozhoutao@steedos.com
-     * @LastEditTime: 2023-01-16 10:36:27
+     * @LastEditors: Please set LastEditors
+     * @LastEditTime: 2023-05-31 13:34:22
      * @Description: 
      */
 
@@ -6262,8 +6295,12 @@ else{
     const getHtmlFieldSchema = (field, readonly, ctx)=>{
         if(readonly){
             return {
-                "type": "html",
-                "name": field.name
+                "type": "control",
+                "label": field.label,
+                "body": {
+                  "type": "html",
+                  "name": field.name
+                }
               }
         }else {
             return {
@@ -6290,8 +6327,8 @@ else{
     /*
      * @Author: baozhoutao@steedos.com
      * @Date: 2022-10-28 14:52:55
-     * @LastEditors: baozhoutao@steedos.com
-     * @LastEditTime: 2022-10-28 14:53:02
+     * @LastEditors: Please set LastEditors
+     * @LastEditTime: 2023-05-31 13:25:53
      * @Description: 
      */
 
@@ -6840,8 +6877,19 @@ else{
                 break;
             case 'url':
                 convertData = {
-                    type: getAmisStaticFieldType('url', readonly)
+                    type: getAmisStaticFieldType('url', readonly, field)
                 };
+                if(readonly && field.show_as_qr){
+                    convertData = {
+                        type: "control",
+                        label: field.label,
+                        body: {
+                            type: "qr-code",
+                            codeSize: 128,
+                            name: field.name
+                        }
+                    };
+                }
                 break;
             case 'email':
                 convertData = {
@@ -6876,6 +6924,7 @@ else{
             case 'code':
                 convertData = {
                     type: "editor",
+                    disabled: readonly ? true : false,
                     language: field.language,
                     editorDidMount: new Function('editor', 'monaco', field.editorDidMount)
                 };
@@ -7533,12 +7582,43 @@ else{
       const fieldSchemaArray = getFieldSchemaArray(formFields);
       const _sections = ___default__namespace.groupBy(fieldSchemaArray, 'group');
       const sections = [];
+      var sectionHeaderVisibleOn=[];
       for (const key in _sections) {
         const section = await getSection(formFields, permissionFields, fieldSchemaArray, key, ctx);
         if(section.body.length > 0){
+          if(section.visibleOn){
+            sectionHeaderVisibleOn.push(section.visibleOn);
+          }
           sections.push(section);
         }
       }
+      /*
+      为了实现只有一个分组时隐藏该分组标题，需要分三种情况(分组如果没有visibleon属性就代表一定显示，有visibleon需要进行判断)
+      1.所有分组中只有一个分组没有visibleon，还需要判断其他有visibleon的分组是否显示，只有其他都不显示时，才需要隐藏标题；反之，有任何一个显示，就不需要隐藏标题
+      2.所有分组都有visibleon
+        2.1 当前分组为隐藏时，标题就设置为隐藏
+        2.2 当前分组为显示时，其他分组只要有一个是显示，就显示该分组标题
+        2.3 当前分组为显示时，其他分组都隐藏，就隐藏该分组标题
+      3.所有分组中有两个以上的分组没有visibleon（这种情况不用处理）
+      */
+     if(ctx.mode == "edit"){
+       if (sections.length - sectionHeaderVisibleOn.length == 1) {
+         sections.forEach((section) => {
+           section.headingClassName = {
+             "hidden": `!(${sectionHeaderVisibleOn.join(" || ") || 'false'})`
+           };
+         });
+       } else if (sections.length == sectionHeaderVisibleOn.length) {
+         sections.forEach((section, index) => {
+           var tempSectionHeaderVisibleOn = sectionHeaderVisibleOn.slice();
+           tempSectionHeaderVisibleOn.splice(index, 1);
+           section.headingClassName = {
+             "hidden": `!((${tempSectionHeaderVisibleOn.join(" || ") || 'false'}) && ${sectionHeaderVisibleOn[index]})`
+           };
+         });
+       }
+     }
+      
       return sections;
     };
 
@@ -7909,11 +7989,12 @@ else{
                           "expression": "this.__deletedRecord != true"
                         },
                         {
-                          "args": {
-                            "url": "/app/${appId}/${objectName}/grid/${side_listview_id}",
-                            "blank": false
-                          },
-                          "actionType": "link",
+                          // "args": {
+                          //   "url": "/app/${appId}/${objectName}/grid/${side_listview_id}",
+                          //   "blank": false
+                          // },
+                          "actionType": "custom",
+                          "script": "Steedos.goBack()",
                           "expression": "this.__deletedRecord === true"
                         }
                       ]
@@ -8052,6 +8133,8 @@ else{
                     type = 'tpl';
                 }else if(field.type === 'html'){
                     type = 'markdown';
+                }else if(field.type === 'url' && field.show_as_qr){
+                    type = 'qr-code';
                 }
                 let className = "";
                 if(field.type === 'textarea'){
@@ -8079,7 +8162,13 @@ else{
             
         }
         // columns.push(getOperation(fields));
-
+        if(!___default__namespace.some(columns, { name: options.labelFieldName })){
+            const href = Router$1.getObjectDetailPath({
+                ...options,  formFactor: options.formFactor, appId: "${appId}", objectName: options.objectName || "${objectName}", recordId: `\${${options.idFieldName}}`
+            });
+            columns[0].type = "tpl";
+            columns[0].tpl = `<a href="${href}">\${${columns[0].name}}</a>`;
+        }
         return columns;
     }
 
@@ -8445,6 +8534,8 @@ else{
 
         const fileFields = {};
         const fileFieldsKeys = [];
+        // 含有optionsFunction属性， 无reference_to属性的lookup字段
+        const lookupFields = {};
         fields.forEach((item)=>{
             if(___default__namespace.includes(['image','avatar','file'], item.type)){
                 fileFieldsKeys.push(item.name);
@@ -8454,6 +8545,9 @@ else{
                     multiple: item.multiple
                 };
             }
+            if(___default__namespace.includes(['lookup'], item.type) && !item.reference_to ){
+                lookupFields[item.name] = item;
+            }
         });
 
         let valueField = mainObject.key_field || '_id';
@@ -8470,6 +8564,7 @@ else{
         api.data.filter = "$filter";
         api.data.loaded = "${loaded}";
         api.data.listViewId = "${listViewId}";
+        api.data.listName = "${listName}";
         api.requestAdaptor = `
         // selfData 中的数据由 CRUD 控制. selfData中,只能获取到 CRUD 给定的data. 无法从数据链中获取数据.
         let selfData = JSON.parse(JSON.stringify(api.data.$self));
@@ -8500,9 +8595,13 @@ else{
             console.error("本地存储中crud参数解析异常：", ex);
         }
         ${baseFilters ? `var systemFilters = ${JSON.stringify(baseFilters)};` : 'var systemFilters = [];'}
+        var _ids = []
         const filtersFunction = ${filtersFunction};
         if(filtersFunction){
             const _filters = filtersFunction(systemFilters, api.data.$self);
+            if(api.data.listName == "recent"){
+                _ids = _filters[2]
+            }
             if(_filters && _filters.length > 0){
                 if(_.isEmpty(systemFilters)){
                     systemFilters = _filters || [];
@@ -8614,6 +8713,7 @@ else{
                 filters = [filters, 'and', userFilters]
             }
         }
+        api.data._ids = _ids;
         api.data = {
             query: api.data.query.replace(/{__filters}/g, JSON.stringify(filters)).replace('{__top}', pageSize).replace('{__skip}', skip).replace('{__sort}', sort.trim())
         }
@@ -8621,6 +8721,11 @@ else{
         return api;
     `;
         api.adaptor = `
+    if(api.body.listName == "recent"){
+        payload.data.rows = _.sortBy(payload.data.rows, function(item){
+            return _.indexOf(api.body._ids, item._id)
+        });
+    }
     const enable_tree = ${mainObject.enable_tree};
     if(!enable_tree){
         _.each(payload.data.rows, function(item, index){
@@ -8631,9 +8736,10 @@ else{
     }
     window.postMessage(Object.assign({type: "listview.loaded"}), "*");
     let fileFields = ${JSON.stringify(fileFields)};
+    let lookupFields = ${JSON.stringify(lookupFields)};
     _.each(payload.data.rows, function(item, index){
         _.each(fileFields , (field, key)=>{
-            if(item[key] && item._display && item._display [key]){
+            if(item[key] && item._display && item._display[key]){
                 let value = item._display[key];
                 if(!_.isArray(value)){
                     value = [value]
@@ -8645,6 +8751,14 @@ else{
                 }
             }
         })
+        _.each(lookupFields , (field, key)=>{
+            if(item[key]){
+                if(field._optionsFunction){
+                    const optionsFunction = eval("(" + field._optionsFunction+ ")")(item);
+                    item[key + '__label'] = _.map(_.filter(optionsFunction, function(option){return _.includes(item[key], option.value)}), 'label').join(' ');
+                }
+            }
+        })
     })
     
     if(enable_tree){
@@ -9974,6 +10088,24 @@ else{
 
         ctx.defaults = defaults;
 
+        if (listViewName == "recent") {
+            listview_filters = `
+            function(filters, data) {
+                var result = Steedos.authRequest('/graphql', {
+                    type: 'POST',
+                    async: false,
+                    data: JSON.stringify({
+                        query: '{object_recent_viewed(filters: [["record.o","=","' + data.objectName + '"],["space","=","' + data.context.tenantId + '"],["owner","=","' + data.context.userId + '"]],sort:"modified desc",top:50){ _id,record}  }'
+                    }),
+                });
+                var _ids = []
+                result.data.object_recent_viewed.forEach(function (item) {
+                    _ids = _ids.concat(item.record.ids)
+                })
+                return ["_id", "=", _ids];
+            }
+        `;
+        }
         const amisSchema = {
             "type": "steedos-object-table",
             "objectApiName": objectName,
@@ -13709,6 +13841,7 @@ else{
                         // className不传入crud组件，crud单独识别crudClassName属性
                         listSchema.className = crudClassName;
                         listSchema.onEvent = {}; // 为啥要将一个内置event放在此处?
+                        // 下面expression中_isRelated参数判断的是列表视图分栏模式下，新建、编辑、删除相关子表记录时不应该刷新左侧（主表）列表视图组件
                         listSchema.onEvent["@data.changed.".concat(objectApiName)] = {
                             "actions": [
                                 {
@@ -15288,7 +15421,7 @@ else{
                 "method": "post",
                 "url": "${context.rootUrl}/graphql?keywords=${keywords}",
                 "requestAdaptor": "\n                const keywords = api.body.keywords || '';\n                const appId = '".concat(data.app_id || '', "';\n                api.data = {\n                    query: `\n                        {\n                        options: flows__getList(action: \"").concat(action, "\", keywords: \"${keywords}\", appId: \"${appId}\", distributeInstanceId: \"").concat(distributeInstanceId, "\", distributeStepId: \"").concat(distributeStepId, "\"){\n                          value:_id\n                          label:name\n                          children: flows{\n                            value: _id,\n                            label: name\n                          }\n                        }\n                      }\n                    `\n                }\n            "),
-                "adaptor": "\n                payload.data.options?.forEach(function(item,index) {\n                    if(!item.children || item.children.length == 0){\n                        payload.data.options.splice(index)\n                    }\n                })\n                return payload;\n            ",
+                "adaptor": "\n                payload.data.options?.forEach(function(item,index) {\n                    if(!item.children || item.children.length == 0){\n                        payload.data.options.splice(index,1)\n                    }\n                })\n                return payload;\n            ",
                 "headers": {
                     "Authorization": "Bearer ${context.tenantId},${context.authToken}"
                 }