@steedos-widgets/amis-lib 6.10.34-beta.5 → 6.10.34-beta.7

package/dist/index.cjs.js

@@ -1241,8 +1241,8 @@ async function getPage({type, pageId = '', appId, objectName = '', recordId = ''
 /*
  * @Author: baozhoutao@steedos.com
  * @Date: 2022-10-28 14:15:09
- * @LastEditors: baozhoutao@steedos.com
- * @LastEditTime: 2025-02-13 09:31:02
+ * @LastEditors: 殷亮辉 yinlianghui@hotoa.com
+ * @LastEditTime: 2025-12-12 16:47:28
  * @Description: 
  */
 
@@ -1390,7 +1390,7 @@ const  getAmisFileReadonlySchema = async (steedosField,ctx = {})=>{
             //             <a href='<%= item.url %>' target='_self' class='block'><%= item.name %></a> 
             //     <% });} %>`
             "type": "control",
-            "name": "",//control若存在name，内部each组件的source则会获取不到内容
+            // "name": "",//control若存在name，内部each组件的source则会获取不到内容 //加上这个空nmae字段会造成列表页面报错 TypeError: Unexpected token } in 1:3，移除后原issue #6977 经测试并没有问题
             "body": {
                 type: 'each',
                 placeholder: "",
@@ -7354,30 +7354,30 @@ function getObjectListHeaderFirstLine(objectSchema, listViewName, ctx) {
   let amisButtonsSchema = getObjectListViewButtonsSchemas(objectSchema, {formFactor: ctx.formFactor});
   const reg = new RegExp('_', 'g');
   const standardIcon = icon && icon.replace(reg, '-');
-  const standardNewButton = _.find(amisButtonsSchema, { name: "standard_new" });
+  _.find(amisButtonsSchema, { name: "standard_new" });
   const buttonSchema = [{
     "type": "flex",
     "items": amisButtonsSchema,
-    "visibleOn": "${display == 'split'?false:true}"
+    // "visibleOn": "${display == 'split'?false:true}"
   }];
-  if(ctx.formFactor !== 'SMALL'){
-    const restButtons = Array.isArray(amisButtonsSchema) ? amisButtonsSchema.filter(obj => obj.name !== "standard_new"):[];
-    buttonSchema.push({
-      "type": "flex",
-      "items":[
-        standardNewButton,
-        (restButtons.length > 0) && {
-          "type": "dropdown-button",
-          "buttons": restButtons,
-          "className": " ml-1",
-          "menuClassName": "p-none split-dropdown-buttons",
-          "align": "right",
-          "size": "sm"
-        }
-      ],
-      "visibleOn": "${display == 'split'?true:false}"
-    });
-  }
+  // if(ctx.formFactor !== 'SMALL'){
+  //   const restButtons = Array.isArray(amisButtonsSchema) ? amisButtonsSchema.filter(obj => obj.name !== "standard_new"):[]
+  //   buttonSchema.push({
+  //     "type": "flex",
+  //     "items":[
+  //       standardNewButton,
+  //       (restButtons.length > 0) && {
+  //         "type": "dropdown-button",
+  //         "buttons": restButtons,
+  //         "className": " ml-1",
+  //         "menuClassName": "p-none split-dropdown-buttons",
+  //         "align": "right",
+  //         "size": "sm"
+  //       }
+  //     ],
+  //     "visibleOn": "${display == 'split'?true:false}"
+  //   })
+  // }
   const listviewNewButton = getNewListviewButtonSchema();
   listviewNewButton.visibleOn = "global.user.is_space_admin";
   return {
@@ -8780,11 +8780,12 @@ function adaptor(){
 const getSettingListviewToolbarButtonSchema = ()=>{
     return {
         "type": "dropdown-button",
+        "hideCaret": true,
         "trigger": "click",
         "icon": "fa fa-cog",
         //TODO: dropdown-button只支持在按钮上方配置提示，对于上方按钮的点击会有影响，为保持统一，暂时去除，等待amis优化，https://github.com/baidu/amis/issues/7330
         // "tooltip": i18next.t('frontend_button_listview_control_tooltip'),
-        "btnClassName": "antd-Button--iconOnly bg-white !p-2 rounded text-gray-500",
+        "btnClassName": "antd-Button--iconOnly bg-white !p-2 rounded !text-gray-500",
         "align": "right",
         "visibleOn": "${!isLookup && !!isObjectListview}",
         "buttons": [
@@ -8827,9 +8828,10 @@ const getDisplayAsButton = function(objectName, defaultEnableSplit){
   return {
     "type": "dropdown-button",
     "icon": "fa fa-table-columns",
+    "hideCaret": true,
     //TODO: dropdown-button只支持在按钮上方配置提示，对于上方按钮的点击会有影响，暂时去除，等待amis优化，https://github.com/baidu/amis/issues/7330
     // "tooltip": `${i18next.t('frontend_display_as')} ${displayAsLabel}`,
-    "btnClassName": "antd-Button--iconOnly bg-white !p-2 rounded text-gray-500",
+    "btnClassName": "antd-Button--iconOnly bg-white !p-2 rounded !text-gray-500",
     "align": "right",
     "visibleOn": "${window:innerWidth > 768 && !!!isLookup && !!isObjectListview}",
     "buttons": [ 
@@ -9055,7 +9057,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 ${formFactor === 'SMALL' ? 'hidden' : ''}`,
+    "className": `bg-white p-2 rounded !text-gray-500 list-view-btn-reload ${formFactor === 'SMALL' ? 'hidden' : ''}`,
     "label": "",
     "icon": "fa fa-sync",
     // "visibleOn": "${!showFieldsFilter}",
@@ -9112,7 +9114,7 @@ function getObjectHeaderToolbar(mainObject, fields, formFactor, {
         "visibleOn": "${isFieldsFilterEmpty == false && isLookup != true}"
       },
       "align": "right",
-      "className": "bg-white p-2 rounded text-gray-500",
+      "className": "bg-white p-2 rounded !text-gray-500",
       "onEvent": {
         "click": {
           "actions": [
@@ -17164,8 +17166,7 @@ const getNextStepInput = async (instance, nextStepChangeEvents) => {
             required: true,
             // selectFirst: true,
             autoFill: {
-              "new_next_step": "${step}",
-              "next_users": null
+              "new_next_step": "${step}"
             },
             "source": {
               "url": "/api/workflow/v2/nextStep?judge=${new_judge}",
@@ -19189,6 +19190,24 @@ const getScrollToBottomAutoOpenApproveDrawerScript = () => {
   `;
 };
 
+const checkInstanceFlowVersion = async (instance) => {
+  const flow = await amisLib.fetchAPI(`/api/v1/flows/${instance.flow._id}?fields=["name","current._id"]`, {
+    method: "get"
+  });
+  if (flow.data.current._id !== instance.flowVersion._id) {
+    console.log("checkInstanceFlowVersion: flow version changed");
+    return false;
+  }
+  const form = await amisLib.fetchAPI(`/api/v1/forms/${instance.form._id}?fields=["name","current._id"]`, {
+    method: "get"
+  });
+  if (form.data.current._id !== instance.formVersion._id) {
+    console.log("checkInstanceFlowVersion: form version changed");
+    return false;
+  }
+  return true;
+};
+
 const getFlowFormSchema = async (instance, box) => {
   const formStyle = instance.formVersion.style || "table";
   let formContentSchema;
@@ -19216,7 +19235,28 @@ const getFlowFormSchema = async (instance, box) => {
     nextStepChangeEvents = onEvent?.nextStepChange?.actions || [];
     nextStepUserChangeEvents = onEvent?.nextStepUserChange?.actions || [];
   }
-  // if (box == 'inbox' || box == 'draft') {
+  if (box == 'draft' && instance.state === 'draft') {
+    // 草稿调用流程版本接口确认是否有新版本，有则调用一次暂存接口，它会提示升级并自动刷新浏览器
+    let isFlowVersionChecked = await checkInstanceFlowVersion(instance);
+    if (!isFlowVersionChecked) {
+      initedEvents.push({
+        "actionType": "ajax",
+        "api": {
+          "url": "/api/workflow/v2/instance/save",
+          "method": "post",
+          "sendOn": "",
+          "requestAdaptor": "var _SteedosUI$getRef$get, _approveValues$next_s;\nconst formValues = context._scoped.getComponentById(\"instance_form\").getValues(); const _formValues = JSON.parse(JSON.stringify(formValues)); if(_formValues){delete _formValues.__applicant} \nconst approveValues = (_SteedosUI$getRef$get = context._scoped.getComponentById(\"instance_approval\")) === null || _SteedosUI$getRef$get === void 0 ? void 0 : _SteedosUI$getRef$get.getValues();\nlet nextUsers = approveValues === null || approveValues === void 0 ? void 0 : approveValues.next_users;\nif (_.isString(nextUsers)) {\n  nextUsers = [approveValues.next_users];\n}\nconst instance = context.record;\nconst body = {\n  instance: {\n    _id: instance._id,\n    applicant: context.__applicant,\n    submitter: formValues.submitter,\n    traces: [{\n      _id: instance.trace._id,\n      step: instance.step._id,\n      approves: [{\n        _id: instance.approve._id,\n        next_steps: [{\n          step: approveValues === null || approveValues === void 0 || (_approveValues$next_s = approveValues.next_step) === null || _approveValues$next_s === void 0 ? void 0 : _approveValues$next_s._id,\n          users: nextUsers\n        }],\n        description: approveValues === null || approveValues === void 0 ? void 0 : approveValues.suggestion,\n        values: _formValues\n      }]\n    }]\n  }\n};\napi.data = body;\nreturn api;",
+          "adaptor": "if (payload.instance == \"upgraded\") { window.setTimeout(function(){ window.location.reload(); }, 2000); return {...payload, status: 1, msg: t('instance_action_instance_save_msg_upgraded')}; } \n return payload.instance === true ? {...payload, status: 0, msg: ''} : {...payload, status: 1, msg: t('instance_action_instance_save_msg_failed')};",
+          "headers": {
+            "Authorization": "Bearer ${context.tenantId},${context.authToken}"
+          },
+          "data": {
+            "&": "$$"
+          }
+        }
+      });
+    }
+  }
   if ((box == 'inbox' || box == 'draft') && !!!window.disableAutoOpenApproveDrawer) {
     // 滚动条滚动到底部弹出底部签批drawer窗口
     initedEvents.push({