@steedos-widgets/amis-lib 6.10.13 → 6.10.15

package/dist/index.cjs.js

@@ -4690,7 +4690,41 @@ async function getMobileTableColumns(fields, options){
             tpls.push({ field, tpl });
         }
     }
-    const url = getNameTplUrl(nameField, options);
+    function getUrlParams(search = window.location.search) {
+        const params = {};
+        const queryString = search.startsWith('?') ? search.slice(1) : search;
+        
+        if (!queryString) return params;
+        
+        queryString.split('&').forEach(pair => {
+            const [key, value] = pair.split('=');
+            if (key) {
+            const decodedKey = decodeURIComponent(key);
+            const decodedValue = value ? decodeURIComponent(value.replace(/\+/g, ' ')) : '';
+            
+            // 处理数组参数（如：?color=red&color=blue）
+            if (params.hasOwnProperty(decodedKey)) {
+                if (Array.isArray(params[decodedKey])) {
+                params[decodedKey].push(decodedValue);
+                } else {
+                params[decodedKey] = [params[decodedKey], decodedValue];
+                }
+            } else {
+                params[decodedKey] = decodedValue;
+            }
+            }
+        });
+        
+        return params;
+    }
+
+    const urlParams = getUrlParams();
+
+    let url = getNameTplUrl(nameField, options);
+    if(options.displayAs === 'split'){
+        const additionalFilters = urlParams['additionalFilters'] || '';
+        url = url + `&additionalFilters=${encodeURIComponent(additionalFilters)}`;
+    }
 
     const columnLines = getMobileLines(tpls);
 
@@ -11098,7 +11132,7 @@ function getObjectHeaderQuickSearchBox(mainObject, fields, formFactor, { isLooku
         "name": keywordsSearchBoxName,
         "placeholder": i18next__default["default"].t('frontend_crud_toolbar_quick_search_placeholder'),//"快捷搜索",
         "value": crudKeywords,
-        "mini": true,
+        "mini": false,
         "clearable": true,//因为清除并不会触发失去焦点事件，只有禁用，但是它会触发change事件，所以等升级到amis 3.4+后可以重新放开
         "clearAndSubmit": true,
         "searchImediately": false,
@@ -11175,7 +11209,7 @@ function getObjectHeaderToolbar(mainObject, fields, formFactor, {
     //TODO: dropdown-button只支持在按钮上方配置提示，对于上方按钮的点击会有影响，为保持统一，暂时去除，等待amis优化，https://github.com/baidu/amis/issues/7330
     // "tooltip": i18next.t('frontend_button_reload_tooltip'),
     "tooltipPlacement": "top",
-    "className": "bg-white p-2 rounded text-gray-500 list-view-btn-reload",
+    "className": `bg-white p-2 rounded text-gray-500 list-view-btn-reload ${formFactor === 'SMALL' ? 'hidden' : ''}`,
     "label": "",
     "icon": "fa fa-sync",
     // "visibleOn": "${!showFieldsFilter}",
@@ -11256,7 +11290,7 @@ function getObjectHeaderToolbar(mainObject, fields, formFactor, {
     // if(toolbarCount){
     //   toolbars.push(toolbarCount);
     // }
-    // toolbars.push(toolbarReloadButton);
+    toolbars.push(toolbarReloadButton);
     toolbars.push(toolbarDQuickSearchBox);
     if(toolbarFilter){
       toolbars.push(toolbarFilter);
@@ -11268,15 +11302,15 @@ function getObjectHeaderToolbar(mainObject, fields, formFactor, {
       ...toolbars,
   ]
   }else {
-    toolbars.push(toolbarDQuickSearchBox);
+    if(toolbarFilter){
+      toolbars.push(toolbarFilter);
+    }
     toolbars.push(toolbarReloadButton);
     toolbars.push(toolbarDisplayAsButton);
     if(mainObject?.permissions?.allowCreateListViews){
       toolbars.push(getSettingListviewToolbarButtonSchema());
     }
-    if(toolbarFilter){
-      toolbars.push(toolbarFilter);
-    }
+    toolbars.push(toolbarDQuickSearchBox);
     if(toolbarCount){
       toolbars.push(toolbarCount);
     }
@@ -11727,7 +11761,6 @@ async function getObjectCRUD(objectSchema, fields, options){
       }, bodyProps);
 
     }
-
     body = defaultsDeep({}, listSchema, body);
     body = await getCrudSchemaWithDataFilter(body, { crudDataFilter, onCrudDataFilter, amisData, env });
 
@@ -19581,12 +19614,25 @@ const getSubmitActions = async (instance, submitEvents) => {
       expression: "${event.data.instanceFormValidate && event.data.approvalFormValidate}"
     },
     {
-      "componentId": "",
-      "args": {
-        "blank": false,
-        "url": amisLib.Router.getObjectListViewPath({appId: "${appId}", objectName: "${objectName}", listViewName: "${side_listview_id}"})
-      },
-      "actionType": "url",
+        "actionType": "wait",
+        "args": {
+            "time": 300
+        }
+    },
+    {
+      "actionType": "custom",
+      "script": `
+        const appId = context.props.data.appId;
+        const objectName = context.props.data.objectName;
+        const side_listview_id = context.props.data.side_listview_id;
+        const additionalFilters = context.props.data.additionalFilters;
+        if(context.props.data.display === 'split'){
+          window.navigate(\`/app/\${appId}/\${objectName}/view/none?side_object=\${objectName}&side_listview_id=\${side_listview_id}&additionalFilters=\${additionalFilters ? encodeURIComponent(additionalFilters) : ''}\`);
+          window.$(".list-view-btn-reload").click();
+        }else{
+          window.navigate(\`/app/\${appId}/\${objectName}/grid/\${side_listview_id}\`);
+        }
+      `,
       expression: "${event.data.instanceFormValidate && event.data.approvalFormValidate}"
     },
     {
@@ -20322,11 +20368,11 @@ const getFieldEditTpl = async (field, label)=>{
             return payload;
           `,
           requestAdaptor: `
-            const filters = ${_.replace(field.filters, /_.pluck/g, '_.map')};
-            const url = ${field.url}
+            const filters = \`${_.replace(field.filters, /_.pluck/g, '_.map')}\`;
+            const url = \`${field.url}\`;
             if(filters){
               console.log('filters', filters);
-              const joinKey = field.url.indexOf('?') > 0 ? '&' : '?';
+              const joinKey = url.indexOf('?') > 0 ? '&' : '?';
               if(filters.startsWith('function(') || filters.startsWith('function (')){
                 const argsName = ${JSON.stringify(argsName)};
                 const fun = eval('_fun='+filters);
@@ -21053,10 +21099,6 @@ const getFlowFormSchema = async (instance, box) => {
     onEvent: {
       "@data.@instanceDetail.changed": {
         actions: [
-          {
-            actionType: "custom",
-            script:"debugger;",
-          },
           {
             componentId:"u:instancePage",
             actionType: "reload"
@@ -21065,6 +21107,10 @@ const getFlowFormSchema = async (instance, box) => {
       },
       "inited": {
         "actions": [
+          {
+              actionType: 'broadcast',
+              eventName: "recordLoaded"
+          },
           {
             "actionType": "setValue",
             "componentId": "instance_form",
@@ -21114,6 +21160,9 @@ const getFlowFormSchema = async (instance, box) => {
   };
 };
 
+const flowVersionCache = new Map();
+const formVersionCache = new Map();
+
 const getMoment = ()=>{
   if(window.amisRequire){
     return window.amisRequire("moment");
@@ -21164,17 +21213,29 @@ const getApproveValues = ({ instance, trace, step, approve, box }) => {
 };
 
 const getFlowVersion = async (instance) => {
-  const result = await amisLib.fetchAPI(`/api/workflow/flow/${instance.flow._id}/version/${instance.flow_version}`, {
-    method: "get"
-  });
-  return result;
+  const cacheKey = `${instance.flow._id}_${instance.flow_version}`;
+  
+  if (!flowVersionCache.has(cacheKey)) {
+    const result = await amisLib.fetchAPI(`/api/workflow/flow/${instance.flow._id}/version/${instance.flow_version}`, {
+      method: "get"
+    });
+    flowVersionCache.set(cacheKey, result);
+  }
+  
+  return flowVersionCache.get(cacheKey);
 };
 
 const getFormVersion = async (instance) => {
-  const result = await amisLib.fetchAPI(`/api/workflow/form/${instance.form._id}/version/${instance.form_version}`, {
-    method: "get"
-  });
-  return result;
+  const cacheKey = `${instance.form._id}_${instance.form_version}`;
+  
+  if (!formVersionCache.has(cacheKey)) {
+    const result = await amisLib.fetchAPI(`/api/workflow/form/${instance.form._id}/version/${instance.form_version}`, {
+      method: "get"
+    });
+    formVersionCache.set(cacheKey, result);
+  }
+  
+  return formVersionCache.get(cacheKey);
 };
 
 const getStep = ({ flowVersion, stepId }) => {
@@ -21231,12 +21292,29 @@ const isNeedToShowSignImage = (is_finished, judge, traceShowSignImage) => {
   return true;
 };
 
+// 缓存存储
+const signCache = new Map();
 const getSpaceUserSign = async (space, handler) => {
+  // 生成缓存键
+  const cacheKey = `${space}_${handler}`;
+  
+  // 检查缓存
+  if (signCache.has(cacheKey)) {
+    return signCache.get(cacheKey);
+  }
+  
+  // 调用API
   const result = await amisLib.fetchAPI(`/api/v1/space_user_signs?filters=[["space","=","${space}"],["user","=","${handler}"]]&fields=["sign"]`);
+  
+  let sign = null;
   if (result?.data?.items && result.data.items.length > 0) {
-    return result.data.items[0].sign;
+    sign = result.data.items[0].sign;
   }
-  return null;
+  
+  // 写入缓存
+  signCache.set(cacheKey, sign);
+  
+  return sign;
 };
 
 const getInstanceInfo = async (props) => {