@steedos-widgets/amis-lib 6.10.12 → 6.10.14

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);
 
@@ -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);
@@ -11727,7 +11761,6 @@ async function getObjectCRUD(objectSchema, fields, options){
       }, bodyProps);
 
     }
-
     body = defaultsDeep({}, listSchema, body);
     body = await getCrudSchemaWithDataFilter(body, { crudDataFilter, onCrudDataFilter, amisData, env });
 
@@ -15566,6 +15599,13 @@ async function convertSFieldToAmisField(field, readonly, ctx) {
                     labelField: 'label',
                     valueField: 'value'
                 };
+                if(field.isAmis){
+                    delete field.mode;
+                    convertData = {
+                        ...convertData,
+                        ...field
+                    };
+                }
                 const select_menuTpl = `<span class='flex items-center mt-0.5'>
                     <span role='img' aria-label='smile' class='anticon anticon-smile'>
                         <span class='slds-icon_container slds-icon-standard-\${REPLACE(icon,'_','-')}'>
@@ -16803,7 +16843,7 @@ function getFormFields(props, mode = "edit") {
         fields = getTableFieldsWithoutFieldPrefix(fields, fieldPrefix);
     }
     return (fields || []).map(function (item) {
-        let formItem = {
+        let formItem = item.isAmis ? item : {
             "type": "steedos-field",
             "name": item.name,
             "config": item
@@ -16818,6 +16858,9 @@ function getFormFields(props, mode = "edit") {
 function getInputTableCell(field, showAsInlineEditMode) {
     if (showAsInlineEditMode) {
         // 这里不可以用quickEdit，因为amis存在bug：input-table内的字段在行编辑模式时会受到外层相同name的字段的影响 https://github.com/baidu/amis/issues/9653
+        if(field.isAmis){
+            return field;
+        }
         return {
             "type": "steedos-field",
             "config": Object.assign({}, field, {
@@ -16836,6 +16879,16 @@ function getInputTableCell(field, showAsInlineEditMode) {
         }
     }
     else {
+        if(field.isAmis){
+            return {
+                ...field,
+                inInputTable: true,
+                "static": true,
+                "readonly": true,
+                label: field.label,
+                name: field.name
+            };
+        }
         return {
             "type": "steedos-field",
             "config": Object.assign({}, field, {
@@ -17238,6 +17291,7 @@ function getFormPaginationWrapper(props, form, mode) {
             "method": "get",
             "adaptor": `
                 const formBody = ${JSON.stringify(formBody)};
+                console.log('formBody===>', formBody);
                 return {
                     "body": formBody
                 }
@@ -18978,7 +19032,6 @@ const showApproveSignImage = (judge) => {
 };
 
 const getUserApprove = ({ instance, userId }) => {
-  console.log(`getUserApprove===>`, instance, userId);
   const currentTrace = _$1.find(instance.traces, (trace) => {
     return trace.is_finished != true;
   });
@@ -19561,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}"
     },
     {
@@ -19995,6 +20061,7 @@ const getArgumentsList = (func)=>{
 };
 
 const getFieldEditTpl = async (field, label)=>{
+  console.log('field',field);
   const tpl = {
     label: label === true ? field.name : false,
     name: field.code,
@@ -20202,6 +20269,7 @@ const getFieldEditTpl = async (field, label)=>{
         break;
       case "number":
         tpl.type = "input-number";
+        tpl.precision=2;
         break;
       case "date":
         tpl.type = "input-date";
@@ -20272,7 +20340,6 @@ const getFieldEditTpl = async (field, label)=>{
         tpl.options = getSelectOptions(field);
         break;
       case "odata":
-        console.log('odata field', field);
         const argsName = getArgumentsList(field.filters);
         var labelField = field.formula.substr(1, field.formula.length - 2);
         labelField = labelField.substr(labelField.indexOf(".") + 1);
@@ -20281,9 +20348,7 @@ const getFieldEditTpl = async (field, label)=>{
         // tpl.labelField = labelField;
         // tpl.valueField = "_value";
         tpl.source = {
-          url: _$1.startsWith(field.url, "http")
-            ? field.url
-            : `\${context.rootUrl}${field.url}`,
+          url: field.url,
           method: "get",
           dataType: "json",
           adaptor:`
@@ -20303,28 +20368,32 @@ const getFieldEditTpl = async (field, label)=>{
             return payload;
           `,
           requestAdaptor: `
-            const field = ${JSON.stringify(field)};
-            if(field.filters){
+            const filters = ${_.replace(field.filters, /_.pluck/g, '_.map')};
+            const url = ${field.url}
+            if(filters){
+              console.log('filters', filters);
               const joinKey = field.url.indexOf('?') > 0 ? '&' : '?';
-              if(field.filters.startsWith('function(') || field.filters.startsWith('function (')){
+              if(filters.startsWith('function(') || filters.startsWith('function (')){
                 const argsName = ${JSON.stringify(argsName)};
-                const fun = eval('_fun='+field.filters);
+                const fun = eval('_fun='+filters);
                 const funArgs = [];
                 for(const item of argsName){
                   funArgs.push(context[item])
                 }
-                api.url = field.url + joinKey + "$filter=" + fun.apply({}, funArgs)
+                api.url = url + joinKey + "$filter=" + fun.apply({}, funArgs)
               }else{
-                api.url = field.url + joinKey + "$filter=" + field.filters
+                api.url = url + joinKey + "$filter=" + filters
               }
+            }else{
+              api.url = url  
             }
             api.query = {};
-            console.log('api', api);
             return api;
-          `
+          `,
+          trackExpression: _.join(_.map(argsName, (item)=>{return `\${${item}|json}`}), '-')
         };
-        // delete tpl.source;
-        console.log('odata tpl', tpl);
+        tpl.isAmis=true;
+        console.log(`odata`, tpl);
         break;
       case "html":
         if (tpl.disabled) {
@@ -20401,7 +20470,7 @@ const getFieldReadonlyTpl = async (field, label)=>{
       map[item.value] = item.label;
     });
     tpl.type = 'static';
-    tpl.tpl = `<% var options = ${JSON.stringify(map)}; return (options && options[data.${field.code}]) || ''%>`;
+    tpl.tpl = `<% var options = ${JSON.stringify(map)}; return (options && options[data["${field.code}"]]) || ''%>`;
   }else if(field.type === 'odata'){
     tpl.type = 'static';
     tpl.tpl = `<div>\${${field.code}['@label']}</div>`;
@@ -20552,7 +20621,6 @@ const getFormTrs = async (instance) => {
   const trs = [];
   let tdFields = [];
   let fields = [];
-  console.log('getFormTrs===>', instance.fields);
   _$1.each(instance.fields, (field) => {
     fields.push(field);
     if (field.type === "section" && field.fields) {
@@ -20885,7 +20953,6 @@ const getFlowFormSchema = async (instance, box) => {
   else {
     formContentSchema = await getFormTableView(instance);
   }
-  console.log(`formContentSchema`, formContentSchema);
   const amisSchemaStr = instance.formVersion?.amis_schema;
   
   let initedEvents = [];
@@ -20909,7 +20976,6 @@ const getFlowFormSchema = async (instance, box) => {
     });
   }
 
-  console.log('getFlowFormSchema formContentSchema', formContentSchema);
   return {
     type: "page",
     name: "instancePage",
@@ -21033,10 +21099,6 @@ const getFlowFormSchema = async (instance, box) => {
     onEvent: {
       "@data.@instanceDetail.changed": {
         actions: [
-          {
-            actionType: "custom",
-            script:"debugger;",
-          },
           {
             componentId:"u:instancePage",
             actionType: "reload"
@@ -21045,6 +21107,10 @@ const getFlowFormSchema = async (instance, box) => {
       },
       "inited": {
         "actions": [
+          {
+              actionType: 'broadcast',
+              eventName: "recordLoaded"
+          },
           {
             "actionType": "setValue",
             "componentId": "instance_form",
@@ -21094,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");
@@ -21144,19 +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"
-  });
-  console.log(`getFlowVersion: `, result);
-  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"
-  });
-  console.log(`getFormVersion: `, result);
-  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 }) => {
@@ -21213,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) => {
@@ -21276,7 +21372,6 @@ const getInstanceInfo = async (props) => {
   if (!instance) {
     return undefined;
   }
-  console.log(`box====>`, box);
   if (box === "inbox" || box === "draft") {
     userApprove = getUserApprove({ instance, userId });
   }
@@ -21291,9 +21386,6 @@ const getInstanceInfo = async (props) => {
     step = getStep({ flowVersion, stepId: trace.step });
   }
 
-  console.log(`userApprove===>`, userApprove);
-  console.log(`step===>`, step);
-
   let currentStep = getStep({ flowVersion, stepId: ___default["default"].last(instance.traces).step });
 
   const lastCCStep = getLastCCStep(instance, userId);