@steedos-widgets/amis-lib 1.2.35-beta.1 → 1.2.35

package/dist/index.umd.js

@@ -649,9 +649,10 @@
       }
   }
 
-  async function getFieldsTemplate(fields, expand){
-      if(expand != false){
-          expand = true;
+  async function getFieldsTemplate(fields, display){
+      let expandFields = [];
+      if(display != false){
+          display = true;
       }
       let fieldsName = ['_id'];
       let displayFields = [];
@@ -663,33 +664,43 @@
       }
       for (const field of fieldsArr) {
           //graphql 的  ui\display 中使用的字段需要先在query中查询. 否则会返回null
-          if(field.name.indexOf('.') < 0){
-              if(expand && (field.type == 'lookup' || field.type == 'master_detail')){
-                  fieldsName.push(`${field.name}`);
-                  displayFields.push(`${field.name}`);
+          if(field.expand){
+              expandFields.push(field);
+          }else {
+              if(field.name.indexOf('.') < 0){
+                  if(display && (field.type == 'lookup' || field.type == 'master_detail')){
+                      fieldsName.push(`${field.name}`);
+                      displayFields.push(`${field.name}`);
+                  }else {
+                      fieldsName.push( field.alias ? `${field.alias}:${field.name}` : field.name);
+                  }
+                  if(_$1.includes(['time','date','datetime','boolean','number','currency'], field.type)){
+                      fieldsName.push(`${field.name}`);
+                  }
+                  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 {
-                  fieldsName.push( field.alias ? `${field.alias}:${field.name}` : field.name);
+                  objectFieldName = field.name.split('.')[0];
+                  fieldsName.push(objectFieldName);
+                  displayFields.push(objectFieldName);
               }
-              if(_$1.includes(['time','date','datetime','boolean','number','currency'], field.type)){
-                  fieldsName.push(`${field.name}`);
-              }
-              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);
           }
       }
 
       displayFields = ___namespace.uniq(displayFields);
       fieldsName = ___namespace.uniq(fieldsName);
+      let expandFieldsQuery = "";
+      if(expandFields.length > 0){
+          ___namespace.each(expandFields, function(field){
+              expandFieldsQuery = expandFieldsQuery + `${field.expandInfo.fieldName}:${field.expandInfo.fieldName}__expand{${field.expandInfo.displayName}}`;
+          });
+      }
 
       if(displayFields.length > 0){
-          return `${fieldsName.join(',')},_display:_ui{${displayFields.join(',')}}`;
+          return `${fieldsName.join(',')},${expandFieldsQuery},_display:_ui{${displayFields.join(',')}}`;
       }
-      return `${fieldsName.join(' ')}`
+      return `${fieldsName.join(' ')},${expandFieldsQuery}`
   }
 
   function getRecordPermissionsTemplate(){
@@ -3365,7 +3376,7 @@
     if(!event.data.isLookup){
       // 刷新浏览器后，filterFormValues值是空的，只能从本地存储中取出并重置为空值
       const listViewId = event.data.listViewId;
-      const listViewPropsStoreKey = location.pathname + "/crud/" + listViewId ;
+      const listViewPropsStoreKey = location.pathname + "/crud/" + (listViewId || "");
       let localListViewProps = sessionStorage.getItem(listViewPropsStoreKey);
       if(localListViewProps){
         localListViewProps = JSON.parse(localListViewProps);
@@ -3397,7 +3408,7 @@
       searchableFieldsStoreKey += "lookup/" + objectName;
     }
     else{
-      searchableFieldsStoreKey += listViewId;
+      searchableFieldsStoreKey += (listViewId || "");
     }
     let defaultSearchableFields = sessionStorage.getItem(searchableFieldsStoreKey);
     if(defaultSearchableFields){
@@ -3424,7 +3435,9 @@
       setData({ showFieldsFilter: false });
     }
     else{
-      const listViewPropsStoreKey = location.pathname + "/crud/" + data.listViewId ;
+      console.log("===listViewPropsStoreKey=data==", data);
+      const listViewPropsStoreKey = location.pathname + "/crud/" + (data.listViewId || "");
+      console.log("===listViewPropsStoreKey=122==", listViewPropsStoreKey);
       let localListViewProps = sessionStorage.getItem(listViewPropsStoreKey);
       if(localListViewProps){
         localListViewProps = JSON.parse(localListViewProps);
@@ -3470,7 +3483,7 @@
       searchableFieldsStoreKey += "lookup/" + objectName;
     }
     else{
-      searchableFieldsStoreKey += listViewId;
+      searchableFieldsStoreKey += (listViewId || "");
     }
     sessionStorage.setItem(searchableFieldsStoreKey, value);
 
@@ -3528,7 +3541,7 @@
     }
     
     // 列表视图crud支持本地缓存，所以需要进一步清除浏览器本地缓存里面用户在可搜索项中移除的字段值
-    const listViewPropsStoreKey = location.pathname + "/crud/" + listViewId ;
+    const listViewPropsStoreKey = location.pathname + "/crud/" + (listViewId || "");
     let localListViewProps = sessionStorage.getItem(listViewPropsStoreKey);
     if(localListViewProps){
       localListViewProps = JSON.parse(localListViewProps);
@@ -3647,7 +3660,8 @@
                                       const fields = uiSchema.fields;
                                       const options = (payload.data?.options || []).filter(function(item){
                                         let field = fields[item.value];
-                                        return !!field && window.isFieldTypeSearchable(field.type)
+                                        // TODO: 暂时禁用location类型字段的列表搜索
+                                        return !!field && window.isFieldTypeSearchable(field.type) && field.type !== 'location'
                                       });
                                       payload.data = {
                                         "options": options
@@ -5250,6 +5264,7 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
 
   function getObjectHeaderToolbar(mainObject, formFactor, {showDisplayAs = false, hiddenCount = false, headerToolbarItems, filterVisible = true} = {}){
     // console.log(`getObjectHeaderToolbar====>`, filterVisible)
+    console.log(`getObjectHeaderToolbar`, mainObject);
     const isMobile = window.innerWidth < 768;
     if(isMobile){
       showDisplayAs = false;
@@ -5349,7 +5364,7 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
           "className": "bg-white p-2 rounded border-gray-300 text-gray-500"
         },
         // getExportExcelToolbarButtonSchema(),
-        getSettingListviewToolbarButtonSchema(),
+        mainObject?.permissions?.allowCreateListViews ? getSettingListviewToolbarButtonSchema() : {},
         getDisplayAsButton(mainObject?.name),
         filterVisible ? {
           "label": i18next__default["default"].t('frontend_button_search_tooltip'),
@@ -7189,12 +7204,35 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
                   }
               }
               
+              const coordinatesType = field.coordinatesType || "bd09";
               convertData = {
                   type: getAmisStaticFieldType('location', readonly),
                   tpl: readonly ? getLocationTpl(field) : null,
                   ak,
                   vendor,
-                  label: field.label
+                  clearable: true,
+                  coordinatesType,
+                  label: field.label,
+                  pipeOut: (value, oldValue, data) => {
+                      if (value) {
+                          const lng = value.lng;
+                          const lat = value.lat;
+                          let coordinates = [lng,lat];
+                          if(window.coordtransform){
+                              if(coordinatesType.toLowerCase() === 'bd09'){
+                                  const bd09togcj02 = window.coordtransform.bd09togcj02(lng,lat);
+                                  coordinates = window.coordtransform.gcj02towgs84(bd09togcj02[0],bd09togcj02[1]);
+                              }else if(coordinatesType.toLowerCase() === 'gcj02'){
+                                  coordinates = window.coordtransform.gcj02towgs84(lng,lat);
+                              }
+                          }
+                          value.wgs84 = {
+                              type: "Point",
+                              coordinates
+                          };
+                         return value; // 切换到数字之后的默认值
+                      }
+                  }
               };
               break;
           case 'avatar':
@@ -7662,6 +7700,10 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
           if(field.type == "file" && field.multiple){
               quickEditSchema = false;
           }
+          //TODO:location字段在列表中快速编辑后存在bug,保存时可能会丢失部分数据，暂时禁用
+          if(field.type == "location"){
+              quickEditSchema = false;
+          }
       }
       return quickEditSchema;
   }
@@ -8216,7 +8258,7 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
         try{
             // TODO: 不应该直接在这里取localStorage，应该从外面传入
             const listViewId = api.data.listViewId;
-            const listViewPropsStoreKey = location.pathname + "/crud/" + listViewId ;
+            const listViewPropsStoreKey = location.pathname + "/crud/" + (listViewId || "");
             let localListViewProps = sessionStorage.getItem(listViewPropsStoreKey);
             if(localListViewProps){
                 localListViewProps = JSON.parse(localListViewProps);
@@ -8417,7 +8459,7 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
     try{
         // TODO: 不应该直接在这里取localStorage，应该从外面传入
         const listViewId = api.body.listViewId;
-        const listViewPropsStoreKey = location.pathname + "/crud/" + listViewId ;
+        const listViewPropsStoreKey = location.pathname + "/crud/" + (listViewId || "");
         /**
          * localListViewProps规范来自crud请求api中api.data.$self参数值的。
          * 比如：{"perPage":20,"page":1,"__searchable__name":"7","__searchable__between__n1__c":[null,null],"filter":[["name","contains","a"]]}
@@ -10386,7 +10428,7 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
    * @Author: baozhoutao@steedos.com
    * @Date: 2022-07-05 15:55:39
    * @LastEditors: 殷亮辉 yinlianghui@hotoa.com
-   * @LastEditTime: 2023-06-04 17:36:49
+   * @LastEditTime: 2023-08-01 14:50:23
    * @Description:
    */
 
@@ -10651,7 +10693,7 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
        * 本次存储代码段
        */
       try {
-        const listViewPropsStoreKey = location.pathname + "/crud/" + ctx.listViewId;
+        const listViewPropsStoreKey = location.pathname + "/crud/" + (ctx.listViewId || "");
         let localListViewProps = sessionStorage.getItem(listViewPropsStoreKey);
         /**
          * localListViewProps规范来自crud请求api中api.data.$self参数值的。
@@ -10720,6 +10762,7 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
           "filterVisible": ctx.filterVisible,
           "rowClassNameExpr": ctx.rowClassNameExpr
       };
+      // console.log(`getListSchema===>`,amisSchema)
       return {
           uiSchema,
           amisSchema,
@@ -10733,7 +10776,7 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
       columns,
       ctx = {}
   ) {
-      // console.time('getTableSchema');
+      // console.time('getTableSchema', columns);
       const uiSchema = await getUISchema(objectName);
 
       let sort = ctx.sort;
@@ -10747,19 +10790,52 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
       }
 
       let fields = [];
-      _$1.each(columns, function (column) {
-          if (_$1.isString(column) && uiSchema.fields[column]) {
-              fields.push(uiSchema.fields[column]);
-          } else if (_$1.isObject(column) && uiSchema.fields[column.field]) {
-              fields.push(
-                  Object.assign({}, uiSchema.fields[column.field], {
-                      width: column.width,
-                      wrap: column.wrap, // wrap = true 是没效果的
-                      amis: column.amis
-                  })
-              );
+      for(const column of columns){
+          if (_$1.isString(column)) {
+              if(column.indexOf('.') > 0){
+                  const fieldName = column.split('.')[0];
+                  const displayName = column.split('.')[1];
+                  const filedInfo = uiSchema.fields[fieldName];
+                  if(filedInfo && (filedInfo.type === 'lookup' || filedInfo.type === 'master_detail') && _$1.isString(filedInfo.reference_to) ){
+                      const rfUiSchema = await getUISchema(filedInfo.reference_to);
+                      const rfFieldInfo = rfUiSchema.fields[displayName];
+                      fields.push(Object.assign({}, rfFieldInfo, {name: column, expand: true, expandInfo: {fieldName, displayName}}));
+                  }
+              }else {
+                  if(uiSchema.fields[column]){
+                      fields.push(uiSchema.fields[column]);
+                  }
+              }
+          } else if (_$1.isObject(column)) {
+              if(column.field.indexOf('.') > 0){
+                  const fieldName = column.field.split('.')[0];
+                  const displayName = column.field.split('.')[1];
+                  const filedInfo = uiSchema.fields[fieldName];
+                  if(filedInfo && (filedInfo.type === 'lookup' || filedInfo.type === 'master_detail') && _$1.isString(filedInfo.reference_to) ){
+                      const rfUiSchema = await getUISchema(filedInfo.reference_to);
+                      const rfFieldInfo = rfUiSchema.fields[displayName];
+                      fields.push(Object.assign({}, rfFieldInfo, 
+                          {name: column.field, expand: true, expandInfo: {fieldName, displayName}},
+                          {
+                              width: column.width,
+                              wrap: column.wrap, // wrap = true 是没效果的
+                              amis: column.amis
+                          }
+                      ));
+                  }
+              }else {
+                  if(uiSchema.fields[column.field]){
+                      fields.push(
+                          Object.assign({}, uiSchema.fields[column.field], {
+                              width: column.width,
+                              wrap: column.wrap, // wrap = true 是没效果的
+                              amis: column.amis
+                          })
+                      );
+                  }
+              }
           }
-      });
+      }
 
       const extraColumns = ctx.extraColumns;