@steedos-widgets/amis-lib 1.2.25 → 1.2.27

package/dist/index.umd.js

@@ -360,7 +360,7 @@
    * @Author: baozhoutao@steedos.com
    * @Date: 2022-08-16 17:02:08
    * @LastEditors: baozhoutao@steedos.com
-   * @LastEditTime: 2023-04-19 15:25:50
+   * @LastEditTime: 2023-06-20 13:50:15
    * @Description:
    */
 
@@ -371,14 +371,14 @@
           if(urlSearch.has('display')){
               return urlSearch.get('display')
           }
-          // const key = `tab.${tab_id}.display`;
-          const key = `page_display`;
+          const key = `tab_${tab_id}_display`;
+          // const key = `page_display`;
           const value = localStorage.getItem(key);
           return value ? value : 'grid'
       },
     
       setTabDisplayAs(tab_id, displayAs){
-          const key = `tab.${tab_id}.display`;
+          const key = `tab_${tab_id}_display`;
           localStorage.setItem(key, displayAs);
       },
       getAppPath({formFactor, appId}){
@@ -392,15 +392,10 @@
       },
       getObjectDetailPath(props){
           const {formFactor, appId, objectName, recordId, listViewName, _templateType} = props;
-          // var urlParams = new URLSearchParams(window.location.search);
-          // if(objectName === 'instances'){
-          //     return `/workflow/space/\${context.tenantId}/\${listName}/${recordId}`;
-          // }
-          const displayAs =  Router.getTabDisplayAs(objectName); //urlParams.get("display") ||
           if(_templateType === 'JavaScript'){
-              return `/app/${appId}/${objectName}/view/${recordId}?display=${displayAs}&side_object=<%=item.objectName%>&side_listview_id=<%=item.listName%>`;
+              return `/app/${appId}/${objectName}/view/${recordId}?side_object=<%=item.objectName%>&side_listview_id=<%=item.listName%>`;
           }
-          return `/app/${appId}/${objectName}/view/${recordId}?display=${displayAs}&side_object=\${objectName}&side_listview_id=\${listName}`;
+          return `/app/${appId}/${objectName}/view/${recordId}?side_object=\${objectName}&side_listview_id=\${listName}`;
       },
       getObjectRelatedViewPath({formFactor, appId, masterObjectName, masterRecordId, objectName, foreignKey}){
           return `/app/${appId}/${masterObjectName}/${masterRecordId}/${objectName}/grid?related_field_name=${foreignKey}`;
@@ -676,6 +671,10 @@
               if(_$1.includes(['percent','time','filesize','date','datetime','boolean','number','currency', 'select', 'file', 'image', 'avatar', 'formula', 'summary', 'object', 'grid'], field.type)){
                   displayFields.push(`${field.name}`);
               }
+          }else {
+              objectFieldName = field.name.split('.')[0];
+              fieldsName.push(objectFieldName);
+              displayFields.push(objectFieldName);
           }
       }
 
@@ -3150,7 +3149,10 @@
     const formSchema = {
       "type": "service",
       "visibleOn": "this.filterFormSearchableFields && this.filterFormSearchableFields.length",
-      "className": ctx.formFactor === 'SMALL' ? "slds-filters__body p-0 mb-2" : "slds-filters__body p-0 sm:grid sm:gap-2 sm:grid-cols-4 mb-2",
+      "className": ctx.formFactor === 'SMALL' ? "slds-filters__body p-0 mb-2 overflow-y-auto overflow-x-hidden" : "slds-filters__body p-0 sm:grid sm:gap-2 sm:grid-cols-4 mb-2",
+      "style":{
+        "max-height":ctx.formFactor === 'SMALL'?"30vh":"unset"
+      },
       "schemaApi": {
         method: 'post',
         url: `\${context.rootUrl}/graphql?reload=\${filterFormSearchableFields|join}`,
@@ -5083,14 +5085,14 @@
       {
         "type": "button",
         "label": i18next__default["default"].t('frontend_display_type_is_table'),
-        "onClick": "let url = document.location.pathname; var urlSearch = new URLSearchParams(document.location.search); if(urlSearch.get(\"side_object\") && urlSearch.get(\"side_listview_id\")){url=`/app/${props.data.appId}/${urlSearch.get(\"side_object\")}/grid/${urlSearch.get(\"side_listview_id\")}`;}; props.env.jumpTo(url + '?display=grid');",
+        "onClick": "const key = 'tab_"+objectName+"_display';localStorage.setItem(key, 'grid');let url = document.location.pathname; var urlSearch = new URLSearchParams(document.location.search); if(urlSearch.get(\"side_object\") && urlSearch.get(\"side_listview_id\")){url=`/app/${props.data.appId}/${urlSearch.get(\"side_object\")}/grid/${urlSearch.get(\"side_listview_id\")}`;}; props.env.jumpTo(url + '?display=grid');",
         "rightIcon": displayAs != 'split' ? "fa fa-check" : null,
         "rightIconClassName": "m-l-sm"
       },
       {
         "type": "button",
         "label": i18next__default["default"].t('frontend_display_type_is_split'),
-        "onClick": "const url = document.location.pathname + '?display=split'; props.env.jumpTo(url);",
+        "onClick": "const key = 'tab_"+objectName+"_display';localStorage.setItem(key, 'split');const url = document.location.pathname + '?display=split'; props.env.jumpTo(url);",
         "rightIcon": displayAs === 'split' ? "fa fa-check" : null,
         "rightIconClassName": "m-l-sm"
       }
@@ -5252,7 +5254,7 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
         },
         // getExportExcelToolbarButtonSchema(),
         getSettingListviewToolbarButtonSchema(),
-        getDisplayAsButton(showDisplayAs),
+        getDisplayAsButton(mainObject?.name),
         filterVisible ? {
           "label": i18next__default["default"].t('frontend_button_search_tooltip'),
           "icon": "fa fa-search",
@@ -7948,6 +7950,7 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
       let valueField = mainObject.key_field || '_id';
       const api = await getApi(mainObject, null, fields, {count: options.queryCount, alias: 'rows', limit: top, queryOptions: `filters: {__filters}, top: {__top}, skip: {__skip}, sort: "{__sort}"`});
 
+      api.url += "&objectName=${objectName}";//设计器上对象表格组件需要切换对象重新请求列表数据
       if(options.isRelated){
           api.url += "&recordId=${_master.recordId}";
       }
@@ -8083,13 +8086,13 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
             const masterRecord = self._master.record;
             const masterObjectName = self._master.objectName;
             let relatedValue = self._master.recordId;
-            if(refField.reference_to_field && refField.reference_to_field != '_id'){
+            if(refField && refField.reference_to_field && refField.reference_to_field != '_id'){
                 relatedValue = masterRecord[refField.reference_to_field]
             }
             let relatedFilters;
             if (
-                refField._reference_to ||
-                (refField.reference_to && !_.isString(refField.reference_to))
+                refField && (refField._reference_to ||
+                (refField.reference_to && !_.isString(refField.reference_to)))
             ) {
                 relatedFilters = [
                     [relatedKey + "/o", "=", masterObjectName],
@@ -8239,7 +8242,7 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
 
   const API_CACHE = 100;
 
-  function getReadonlyFormAdaptor(object, fields){
+  function getReadonlyFormAdaptor(object, fields, options){
       let scriptStr = '';
       const selectFields = ___namespace.filter(fields, function(field){return field.name.indexOf('.') < 0 && ((field.type == 'select' && field.options) || ((field.type == 'lookup' || field.type == 'master_detail') && !field.reference_to))});
       const gridAndObjectFieldsName = ___namespace.map(___namespace.filter(fields, function(field){return field.name.indexOf('.') < 0 && (field.type === 'object' || field.type === 'grid')}), 'name');
@@ -8277,11 +8280,24 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
       //     }
       // })
 
+      var fieldNames = ___namespace.map(fields, function(n){return n.name});
       return  `
     if(payload.data.data.length === 0){
-        return {
-            status: 2,
-            msg: "无法找到记录"
+        var isEditor = !!${options && options.isEditor};
+        if(isEditor){
+            var fieldNames = ${JSON.stringify(fieldNames)};
+            var emptyDoc = {};//这里如果不把每个字段值设置为空的话，表单上会显示上一次表单上的字段值
+            fieldNames.forEach(function(n){
+                emptyDoc[n] = null;
+            });
+            // 设计器中始终显示表单，有记录则显示第一条记录，没记录时显示为空表单
+            payload.data.data = [emptyDoc];
+        }
+        else{
+            return {
+                status: 2,
+                msg: "无法找到记录"
+            }
         }
     }
     if(payload.data.data){
@@ -8298,7 +8314,7 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
         var record = _.cloneDeep(data);
         try{
             _.each(gridAndObjectFieldsName, function(name){
-                data[name] = data._display[name];
+                data[name] = data._display && data._display[name];
             })
         }catch(e){
             console.error(e)
@@ -8319,10 +8335,10 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
   async function getReadonlyFormInitApi(object, recordId, fields, options){
       return {
           method: "post",
-          url: getApi$2()+"&recordId=${recordId}",
+          url: getApi$2() + '&objectName=${objectName}' + "&recordId=${recordId}",
           cache: API_CACHE,
           // requestAdaptor: "console.log('getReadonlyFormInitApi requestAdaptor', api);return api;",
-          adaptor: getReadonlyFormAdaptor(object, fields),
+          adaptor: getReadonlyFormAdaptor(object, fields, options),
           data: await getFindOneQuery$1(object, recordId, fields, options),
           headers: {
               Authorization: "Bearer ${context.tenantId},${context.authToken}"
@@ -9754,8 +9770,8 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
   /*
    * @Author: baozhoutao@steedos.com
    * @Date: 2022-07-05 15:55:39
-   * @LastEditors: Please set LastEditors
-   * @LastEditTime: 2023-05-17 09:09:33
+   * @LastEditors: liaodaxue
+   * @LastEditTime: 2023-06-20 14:05:50
    * @Description:
    */
 
@@ -9798,10 +9814,11 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
       if(!_$1.isEmpty(relatedLists)){
           for (const relatedList of relatedLists) {
               const arr = relatedList.related_field_fullname.split(".");
+              const foreign_key = arr[2] ? arr[1]+'.'+arr[2] : arr[1];
               related.push({
                   masterObjectName: objectName,
                   object_name: arr[0],
-                  foreign_key: arr[1],
+                  foreign_key,
                   label: relatedList.label,
                   columns: relatedList.field_names,
                   sort: relatedList.sort,
@@ -9814,10 +9831,11 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
           const details = [].concat(uiSchema.details || []);
           for (const detail of details) {
               const arr = detail.split(".");
+              const foreign_key = arr[2] ? arr[1]+'.'+arr[2] : arr[1];
               related.push({
                   masterObjectName: objectName,
                   object_name: arr[0],
-                  foreign_key: arr[1]
+                  foreign_key
               });
           }
       }
@@ -9849,14 +9867,16 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
               if(!_$1.isEmpty(mainRelatedLists)){
                   for (const relatedList of mainRelatedLists) {
                       const arr = relatedList.related_field_fullname.split(".");
-                      mainRelated[arr[0]] = arr[1];
+                      const foreign_key_value = arr[2] ? arr[1]+'.'+arr[2] : arr[1];
+                      mainRelated[arr[0]] = foreign_key_value;
                   }
               }else {
                   const details = _$1.union(mainObjectUiSchema.details,mainObjectUiSchema.lookup_details) || [];
                   for (const detail of details) {
                       const arr = detail.split(".");
+                      const foreign_key_value = arr[2] ? arr[1]+'.'+arr[2] : arr[1];
                       if(!_$1.has(mainRelated,arr[0])){
-                          mainRelated[arr[0]] = arr[1];
+                          mainRelated[arr[0]] = foreign_key_value;
                       }
                   }
               }