@steedos-widgets/amis-lib 6.10.16 → 6.10.18

package/dist/index.cjs.js

@@ -1141,7 +1141,7 @@ function getRecordPermissionsQuery(object, recordId, options){
 function getApi$2 (isMobile){
     if(isMobile);else {
         // return __meteor_runtime_config__.ROOT_URL_PATH_PREFIX + "/graphql"
-        return `\${context.rootUrl}/graphql?reload=\${additionalFilters|join}&listName=\${listName}`
+        return `\${context.rootUrl}/graphql?reload=\${additionalFilters|join}`
     }
 }
 
@@ -5040,6 +5040,55 @@ async function getTableSchema$1(object, fields, options){
 }
 
 
+/**
+ * 移除符合特定规则的sessionStorage项，用于清除列表视图组件请求接口的历史查询条件、翻页页码等本地存储参数数据，只保留最后一次的相关参数
+ * 兼容列表视图的两栏和三栏模式，以及列表视图的简化版（不带/grid）路径
+ * @param {string} suffix - 需要匹配的路径后缀，如"/crud"或"/crud/query"
+ * @returns {string} 返回包含正则表达式和清除逻辑的代码字符串
+ */
+function removeTableApiSessionStorageItems(suffix) {
+    // 手动转义suffix中的斜线/以确保正则表达式能够正确匹配路径
+    const escapedSuffix = suffix.replace(/\//g, '\\/');
+    
+    return `
+        /**
+         * 正则表达式1：匹配不带 /grid 的路径，路径结尾为 ${escapedSuffix}
+         * - 适用于路径格式：/app/{appName}/{objectName}${suffix}
+         * - 可能的suffix值包括："/crud", "/crud/query"
+         */
+        const noGridPattern = new RegExp('^\\\\/app\\\\/([^\\\\/]+)\\\\/([^\\\\/]+)${escapedSuffix}$');
+        
+        /**
+         * 正则表达式2：匹配带 /grid 的路径，路径结尾为 ${escapedSuffix}
+         * - 适用于路径格式：/app/{appName}/{objectName}/grid/{listName}${suffix}
+         * - 可能的suffix值包括："/crud", "/crud/query"
+         */
+        const withGridPattern = new RegExp('^\\\\/app\\\\/([^\\\\/]+)\\\\/([^\\\\/]+)\\\\/grid\\\\/([^\\\\/]+)${escapedSuffix}$');
+        
+        /**
+         * 正则表达式3：匹配带 /view 的路径（列表三栏模式），路径结尾为 ${escapedSuffix}
+         * - 适用于路径格式：/app/{appName}/{objectName}/view/{recordId}${suffix}
+         * - 可能的suffix值包括："/crud", "/crud/query"
+         */
+        const withViewPattern = new RegExp('^\\\\/app\\\\/([^\\\\/]+)\\\\/([^\\\\/]+)\\\\/view\\\\/([^\\\\/]+)${escapedSuffix}$');
+        
+        // 清除 sessionStorage 中符合条件的历史数据
+        for (let i = 0; i < sessionStorage.length; i++) {
+            const key = sessionStorage.key(i);
+            
+            /**
+             * 检查是否匹配规则并移除匹配的sessionStorage项:
+             * - noGridPattern 匹配简化版路径
+             * - withGridPattern 匹配带有 /grid 的路径
+             * - withViewPattern 匹配带有 /view 的路径
+             */
+            if (noGridPattern.test(key) || withGridPattern.test(key) || withViewPattern.test(key)) {
+                sessionStorage.removeItem(key);
+                i--; // 因为移除之后，索引也跟着变化，所以需要回退一步
+            }
+        }
+    `;
+}
 
 /**
  * 
@@ -5273,13 +5322,16 @@ async function getTableApi(mainObject, fields, options){
 
         //写入本次存储filters、sort
         const listViewPropsStoreKey = location.pathname + "/crud/query";
-        needToStoreListViewProps && sessionStorage.setItem(listViewPropsStoreKey, JSON.stringify({
-            filters: filters,
-            sort: sort.trim(),
-            pageSize: pageSize,
-            skip: skip,
-            fields: ${JSON.stringify(___namespace.map(fields, 'name'))}
-        }));
+        if(needToStoreListViewProps) {
+            ${removeTableApiSessionStorageItems("/crud/query")};
+            sessionStorage.setItem(listViewPropsStoreKey, JSON.stringify({
+                filters: filters,
+                sort: sort.trim(),
+                pageSize: pageSize,
+                skip: skip,
+                fields: ${JSON.stringify(___namespace.map(fields, 'name'))}
+            }));
+        }
         // console.log('table requestAdaptor', api);
         return api;
     `;
@@ -5415,7 +5467,10 @@ async function getTableApi(mainObject, fields, options){
         
         delete selfData.context;
         delete selfData.global;
-        needToStoreListViewProps && sessionStorage.setItem(listViewPropsStoreKey, JSON.stringify(selfData));
+        if(needToStoreListViewProps) {
+            ${removeTableApiSessionStorageItems("/crud")};
+            sessionStorage.setItem(listViewPropsStoreKey, JSON.stringify(selfData));
+        }
         // 返回页码到UI界面
         payload.data.page= selfData.page;
     }
@@ -6073,13 +6128,13 @@ function getCalendarRecordSaveApi(object, calendarOptions) {
   formData[calendarOptions.allDayExpr] = "${event.data.event.allDay}";
   // formData[calendarOptions.textExpr] = "${event.data.event.title}";
   const apiData = {
-    objectName: "${objectName}",
+    objectName: object.name,
     $: formData,
     $self: "$$"
   };
   const saveDataTpl = `
     const formData = api.data.$;
-    const objectName = api.data.objectName;
+    const objectName = ${object.name}};
     let query = \`mutation{record: \${objectName}__update(id: "\${formData.${idFieldName}}", doc: {__saveData}){${idFieldName}}}\`;
     delete formData.${idFieldName};
     let __saveData = JSON.stringify(JSON.stringify(formData));
@@ -6206,7 +6261,7 @@ async function getObjectCalendar(objectSchema, calendarOptions, options) {
           "body": [
             {
               "type": "steedos-object-form",
-              "objectApiName": "\${objectName}",
+              "objectApiName": "${objectSchema.name}",
               "mode": "edit",
               "defaultData": doc,
               //改回为通用的提交事件
@@ -6405,14 +6460,14 @@ async function getObjectCalendar(objectSchema, calendarOptions, options) {
         }
       ]
     },
-    "getRef": {
+    "setCalendarApi": {
       "weight": 0,
       "actions": [
         {
           "componentId": `service_${options.id}`,
           "args": {
             "value":{
-              "calendarRef": "${event.data.calendarRef}"
+              "calendarApi": "${event.data.calendarApi}"
             }
           },
           "actionType": "setValue",
@@ -20771,7 +20826,7 @@ const getFormWizardView = async (instance) => {
 const getApplicantTableView = async (instance) => {
   let applicantInput = null;
   if(instance.state === 'draft'){
-    applicantInput = Object.assign({name: "applicant", value: amisLib.getSteedosAuth().userId, disabled: instance.box !== 'draft'}, await amisLib.lookupToAmis(
+    applicantInput = Object.assign({name: "applicant", value: instance.applicant || amisLib.getSteedosAuth().userId, disabled: instance.box !== 'draft'}, await amisLib.lookupToAmis(
       {
         name: "applicant",
         label: false,