@steedos-widgets/amis-object 1.2.12 → 1.2.13

package/dist/amis-object.cjs.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.cjs.js

@@ -2255,7 +2255,23 @@ const getSchema$1 = (uiSchema) => {
                                   {
                                     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
                                     },
@@ -5015,12 +5031,13 @@ const getSettingListviewToolbarButtonSchema = ()=>{
         "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(),
@@ -5054,9 +5071,11 @@ const getDisplayAsButton = function(objectName, showDisplayAs){
       "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}",
@@ -5136,6 +5155,7 @@ function getObjectHeaderToolbar(mainObject, formFactor, {showDisplayAs = false,
         // "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",
@@ -5155,6 +5175,7 @@ function getObjectHeaderToolbar(mainObject, formFactor, {showDisplayAs = false,
         "label": "",
         "icon": "fa fa-search",
         "type": "button",
+        "tooltip": "搜索",
         "badge": {
           "offset": [
             -5,
@@ -5199,6 +5220,7 @@ function getObjectHeaderToolbar(mainObject, formFactor, {showDisplayAs = false,
       {
         "type": "reload",
         "align": "right",
+        "tooltip": "刷新",
         "tooltipPlacement": "bottom",
         "className": "bg-white p-2 rounded border-gray-300 text-gray-500"
       },
@@ -5206,6 +5228,8 @@ function getObjectHeaderToolbar(mainObject, formFactor, {showDisplayAs = false,
       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",
@@ -6230,8 +6254,8 @@ async function getIdsPickerSchema(field, readonly, ctx){
 /*
  * @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: 
  */
 
@@ -6273,8 +6297,12 @@ const getMarkdownFieldSchema = (field, readonly, ctx)=>{
 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 {
@@ -6301,8 +6329,8 @@ const getHtmlFieldSchema = (field, readonly, ctx)=>{
 /*
  * @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: 
  */
 
@@ -6851,8 +6879,19 @@ async function convertSFieldToAmisField(field, readonly, ctx) {
             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 = {
@@ -6887,6 +6926,7 @@ async function convertSFieldToAmisField(field, readonly, ctx) {
         case 'code':
             convertData = {
                 type: "editor",
+                disabled: readonly ? true : false,
                 language: field.language,
                 editorDidMount: new Function('editor', 'monaco', field.editorDidMount)
             };
@@ -7544,12 +7584,43 @@ const getSections = async (permissionFields, formFields, ctx) => {
   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;
 };
 
@@ -8064,6 +8135,8 @@ async function getTableColumns$1(fields, options){
                 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'){
@@ -8091,7 +8164,13 @@ async function getTableColumns$1(fields, options){
         
     }
     // 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;
 }
 
@@ -8457,6 +8536,8 @@ async function getTableApi(mainObject, fields, options){
 
     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);
@@ -8466,6 +8547,9 @@ async function getTableApi(mainObject, fields, options){
                 multiple: item.multiple
             };
         }
+        if(___default__namespace.includes(['lookup'], item.type) && !item.reference_to ){
+            lookupFields[item.name] = item;
+        }
     });
 
     let valueField = mainObject.key_field || '_id';
@@ -8482,6 +8566,7 @@ async function getTableApi(mainObject, fields, options){
     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));
@@ -8512,9 +8597,13 @@ async function getTableApi(mainObject, fields, options){
             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 || [];
@@ -8626,6 +8715,7 @@ async function getTableApi(mainObject, fields, options){
                 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())
         }
@@ -8633,6 +8723,11 @@ async function getTableApi(mainObject, fields, options){
         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){
@@ -8643,9 +8738,10 @@ async function getTableApi(mainObject, fields, options){
     }
     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]
@@ -8657,6 +8753,14 @@ async function getTableApi(mainObject, fields, options){
                 }
             }
         })
+        _.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){
@@ -9986,6 +10090,24 @@ async function getListSchema(
 
     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,
@@ -13721,6 +13843,7 @@ var AmisObjectListView = function (props) { return __awaiter(void 0, void 0, voi
                     // className不传入crud组件，crud单独识别crudClassName属性
                     listSchema.className = crudClassName;
                     listSchema.onEvent = {}; // 为啥要将一个内置event放在此处?
+                    // 下面expression中_isRelated参数判断的是列表视图分栏模式下，新建、编辑、删除相关子表记录时不应该刷新左侧（主表）列表视图组件
                     listSchema.onEvent["@data.changed.".concat(objectApiName)] = {
                         "actions": [
                             {
@@ -15300,7 +15423,7 @@ var getSelectFlowSchema = function (id, props) {
             "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}"
             }