@steedos-labs/plugin-workflow 3.0.0-beta.8 → 3.0.0

package/main/default/pages/flowdetail.page.amis.json

@@ -72,7 +72,7 @@
 															"actionType": "dialog",
 															"dialog": {
 																"type": "dialog",
-																"title": "编辑表单",
+																"title": "${'flows_page_record_action_edit_dialog_title' | t}",
 																"body": [
 																	{
 																		"type": "form",
@@ -80,13 +80,13 @@
 																		"body": [
 																			{
 																				"type": "input-text",
-																				"label": "表单名称",
+																				"label": "${'flows_page_record_field_form_name' | t}",
 																				"name": "name",
 																				"id": "u:84af37d53da42"
 																			},
 																			{
 																				"type": "textarea",
-																				"label": "表单描述",
+																				"label": "${'flows_page_record_field_form_description' | t}",
 																				"name": "description",
 																				"id": "u:84af37d53da4",
 																				"minRows": 3,
@@ -94,7 +94,7 @@
 																			},
 																			{
 																				"type": "textarea",
-																				"label": "标题公式",
+																				"label": "${'flows_page_record_field_form_name_forumla' | t}",
 																				"name": "name_forumla",
 																				"id": "u:69b6536e9fd8",
 																				"minRows": 3,
@@ -102,7 +102,7 @@
 																			},
 																			{
 																				"type": "editor",
-																				"label": "表单脚本",
+																				"label": "${'flows_page_record_field_form_script' | t}",
 																				"name": "form_script",
 																				"id": "u:025f8c4f09b6",
 																				"minRows": 3,
@@ -163,13 +163,13 @@
 									"body": [
 										{
 											"type": "input-text",
-											"label": "表单名称",
+											"label": "${'flows_page_record_field_form_name' | t}",
 											"name": "name",
 											"id": "u:84af37d53da42"
 										},
 										{
 											"type": "textarea",
-											"label": "表单描述",
+											"label": "${'flows_page_record_field_form_description' | t}",
 											"name": "description",
 											"id": "u:84af37d53da4",
 											"minRows": 3,
@@ -177,7 +177,7 @@
 										},
 										{
 											"type": "textarea",
-											"label": "标题公式",
+											"label": "${'flows_page_record_field_form_name_forumla' | t}",
 											"name": "name_forumla",
 											"id": "u:69b6536e9fd8",
 											"minRows": 3,
@@ -185,7 +185,7 @@
 										},
 										{
 											"type": "editor",
-											"label": "表单脚本",
+											"label": "${'flows_page_record_field_form_script' | t}",
 											"name": "form_script",
 											"id": "u:025f8c4f09b6",
 											"minRows": 3,

package/main/default/pages/instance_detail.page.amis.json

@@ -3,7 +3,7 @@
   "body": [{
       "type": "wrapper",
       "visibleOn": "${AND(display != 'split', ${window:innerWidth > 768},!!!_inDrawer)}",
-      "className": "bg-white m-0 p-0 flex-shrink-0 min-w-[240px] lg:order-first lg:flex lg:flex-col border-r border-gray-300",
+      "className": "bg-white p-0 flex-shrink-0 min-w-[240px] lg:order-first lg:flex lg:flex-col rounded shadow my-4 ml-4 mr-1 my-4 sm:rounded",
       "body": [{
         "type": "service",
         "className": "w-full h-full",
@@ -18,7 +18,7 @@
           "type": "input-tree",
           "treeContainerClassName": "h-full",
           "name": "tree",
-          "className": "instance-box-tree bg-white w-full",
+          "className": "instance-box-tree w-full",
           "id": "u:9f3dd961ca12",
           "stacked": true,
           "multiple": false,
@@ -87,7 +87,7 @@
     },
     {
       "type": "wrapper",
-      "className": "steedos-instance-detail-wrapper m-0 p-0 flex-1 focus:outline-none lg:order-last sm:pt-3 sm:px-3",
+      "className": "steedos-instance-detail-wrapper m-0 p-0 flex-1 focus:outline-none lg:order-last sm:m-4 shadow sm:rounded",
       "body": [{
         "type": "service",
         "id": "u:d6db0c84f150",

package/main/default/pages/instance_tasks_detail.page.amis.json

@@ -4,7 +4,7 @@
     {
       "type": "wrapper",
       "visibleOn": "${AND(display != 'split', ${window:innerWidth > 768})}",
-      "className": "bg-white m-0 p-0 flex-shrink-0 min-w-[240px] lg:order-first lg:flex lg:flex-col border-r border-gray-300",
+      "className": "bg-white p-0 flex-shrink-0 min-w-[240px] lg:order-first lg:flex lg:flex-col rounded shadow my-4 ml-4 mr-1 my-4 sm:rounded",
       "body": [
         {
           "type": "service",
@@ -23,7 +23,7 @@
               "type": "input-tree",
               "treeContainerClassName": "h-full",
               "name": "tree",
-              "className": "instance-box-tree bg-white w-full",
+              "className": "instance-box-tree w-full",
               "id": "u:9f3dd961ca12",
               "stacked": true,
               "multiple": false,
@@ -90,7 +90,7 @@
     },
     {
       "type": "wrapper",
-      "className": "steedos-instance-detail-wrapper m-0 p-0 flex-1 focus:outline-none lg:order-last sm:pt-3 sm:px-3",
+      "className": "steedos-instance-detail-wrapper m-0 p-0 flex-1 focus:outline-none lg:order-last sm:m-4 shadow sm:rounded",
       "body": [
         {
           "type": "service",

package/main/default/pages/instance_tasks_list.page.amis.json

@@ -1,77 +1,23 @@
 {
   "type": "page",
-  "title": "Welcome to Steedos",
   "body": [
     {
       "type": "service",
-      "id": "instance_tasks_list_service",
-      "className": "h-full w-full p-0 m-0",
-      "pageGridClassName": "h-full m-0",
+      "className": "h-full",
       "body": [
         {
-          "type": "steedos-object-listview",
-          "objectApiName": "instance_tasks",
-          "columnsTogglable": false,
-          "filterVisible": true,
-          "visibleOn": "${!!!flowId}",
-          "showHeader": true,
-          "id": "u:d29cef0d1007",
-          "showDisplayAs": true,
-          "className": "h-full w-full bg-white instance-tasks-list",
-          "hiddenColumnOperation": true,
-          "formFactor": "LARGE",
-          "headerToolbarItems": [
-            {
-              "type": "button",
-              "label": "",
-              "icon": "fa fa-bars",
-              "className": "bg-white p-2 rounded border-gray-300 text-gray-500",
-              "align": "right",
-              "onEvent": {
-                "click": {
-                  "actions": [
-                    {
-                      "actionType": "custom",
-                      "script": "console.log(event.target);document.querySelector('.instances-customPage').classList.toggle('instances-sidebar-open');if(window.innerWidth < 768){document.querySelector('.isInset').classList.toggle('inset-0')}"
-                    }
-                  ]
-                }
-              },
-              "id": "u:115e270cae4d"
-            }
-          ],
-          "listName": "inbox",
-          "rowClassNameExpr": "<%=(data.is_read === false && (!data.clientIds || data.clientIds.length == 0 || !data.clientIds.includes(data._id))) ? 'unread-instance' : '' %>",
-          "rebuildOn": "\\${flowId || categoryId}",
-          "adaptor": "const isSearch = _.some(_.keys(api.body.self), key => key.includes('__keywords') || key.includes('__searchable__'));\nif(payload.data.count==0 && !isSearch){\n    const searchParams = new URLSearchParams(window.location.search);\n    const flowId = searchParams.get(\"flowId\");\n    const categoryId = searchParams.get(\"categoryId\");\n    const pathname = window.location.pathname;\n    if(flowId || categoryId){\n      window.FlowRouter.go(pathname + \"?additionalFilters=&flowId=&categoryId=\");\n    }\n    // if(flowId) {\n    //     window.FlowRouter.go(pathname + \"?additionalFilters=['category','=','\" + categoryId +\"']&flowId=&categoryId=\" + categoryId);\n    // }else if(categoryId) {\n    //     window.FlowRouter.go(pathname + \"?additionalFilters=&flowId=&categoryId=\");\n    // }\n};\nif (api.body.self.listName == \"inbox\") {\n  _.each(payload.data.rows, function (item, index) {\n    if (item.type == 'cc') {\n      item.instance_name += '（传阅）';\n    }\n    if (item.instance__expand.values) {\n      const form_fields = api.body.self.form_fields;\n      _.each(item.instance__expand.values, function (field, field_code) {\n        const form_field = _.find(form_fields, { code: field_code });\n        if (form_field && form_field.type == \"group\") {\n          if (form_field.is_multiselect) {\n            item.instance__expand.values[field_code] = field && field.length > 0 ? _.map(field, 'fullname').toString() : \"\";\n          } else {\n            item.instance__expand.values[field_code] = field ? field.fullname : \"\";\n          }\n        } else if (form_field && form_field.type == \"user\") {\n          if (form_field.is_multiselect) {\n            item.instance__expand.values[field_code] = field && field.length > 0 ? _.map(field, 'name').toString() : \"\";\n          } else {\n            item.instance__expand.values[field_code] = field ? field.name : \"\";\n          }\n        }\n      })\n    }\n  })\n}\n"
-        },
-        {
-          "type": "service",
-          "visibleOn": "${!!flowId}",
-          "schemaApi":  {
-            "url": "/graphql?flowId=${flowId}&categoryId=${categoryId}",
-            "method": "post",
-            "data": {
-              "query": "{flow: flows__findOne(id:\"${flowId}\"){form__expand{current}}}"
-            },
-            "adaptor": "const schema = window.SteedosWorkflow.InstanceTask.getListViewSchema(payload.data.flow); return schema;"
-          }
-        },
-        {
-          "type": "action",
+          "type": "wrapper",
+          "size": "none",
+          "className": "flex flex-1 overflow-hidden h-full",
           "body": [
             {
-              "type": "action",
-              "className": {
-                "mobileCss": "${window:innerWidth < 768}",
-                "pcCss": "${window:innerWidth > 768}",
-                "instances-sidebar-wrapper px-0 fixed z-20 h-full h-fill ease-in-out duration-300 flex flex-col overflow-y-auto bg-white block -translate-x-0 py-0": "true"
-              },
+              "type": "wrapper",
+              "size": "none",
+              "className": "instances-sidebar-wrapper flex-shrink-0 min-w-[240px] overflow-y-auto sm:rounded shadow bg-white my-4 ml-4 mr-1 lg:order-first lg:flex lg:flex-col ",
               "body": [
                 {
                   "type": "service",
-                  "id": "u:aa4f4dc5f439",
-                  "className": "w-full h-full border-r",
+                  "className": "bg-none",
                   "onEvent": {
                     "@data.changed.instance_tasks": {
                       "actions": [
@@ -87,14 +33,13 @@
                       "name": "tree",
                       "treeContainerClassName": "h-full",
                       "className": "instance-box-tree bg-white h-full w-full p-0",
-                      "id": "u:9f3dd961ca12",
                       "stacked": true,
                       "multiple": false,
                       "enableNodePath": false,
                       "hideRoot": true,
                       "showIcon": true,
                       "initiallyOpen": false,
-                      "value": "${CONCATENATE('/app/', appId, '/', objectName, '/grid/', listViewId, '?additionalFilters=', additionalFilters,'&flowId=',flowId,'&categoryId=',categoryId)}",
+                      "value": "${value}",
                       "size": "md",
                       "onEvent": {
                         "change": {
@@ -110,7 +55,7 @@
                             },
                             {
                               "actionType": "custom",
-                              "script": "if (window.innerWidth < 768) { document.querySelector('.instances-customPage').classList.remove('instances-sidebar-open'); document.querySelector('.isInset').classList.remove('inset-0') }\n//获取上一次的flowId和categoryId\nconst lastFlowId = event.data.flowId;\nconst lastCategoryId = event.data.categoryId;\n//从value中获取最新的flowId\nvar flowIdRegex = /&flowId=([^&]+)/;\nvar flowIdMatch = event.data.value.match(flowIdRegex);\nconst flowId = flowIdMatch && flowIdMatch.length > 0 ? flowIdMatch[1] : \"\";\n//从value中获取最新的categoryId\nvar categoryIdRegex = /&categoryId=([^&]+)/;\nvar categoryIdMatch = event.data.value.match(categoryIdRegex);\nconst categoryId = categoryIdMatch && categoryIdMatch.length > 0 ? categoryIdMatch[1] : \"\";\n//获取上一次的listname和最新的listname\nconst lastListName = event.data.listName;\nconst listName = event.data.value.split('?')[0].split('instance_tasks/grid/')[1];\n//切换流程时清除过滤条件\nif (lastListName == \"inbox\" && listName == \"inbox\" && (flowId != lastFlowId || categoryId != lastCategoryId)) {\n  listViewPropsStoreKey = window.location.pathname + \"/crud\";\n  sessionStorage.removeItem(listViewPropsStoreKey);\n  sessionStorage.removeItem(listViewPropsStoreKey + \"/query\");\n}\n\n"
+                              "script": "if (window.innerWidth < 768) { document.querySelector('.instances-customPage').classList.remove('instances-sidebar-open'); }\n//获取上一次的flowId和categoryId\nconst lastFlowId = event.data.flowId;\nconst lastCategoryId = event.data.categoryId;\n//从value中获取最新的flowId\nvar flowIdRegex = /&flowId=([^&]+)/;\nvar flowIdMatch = event.data.value.match(flowIdRegex);\nconst flowId = flowIdMatch && flowIdMatch.length > 0 ? flowIdMatch[1] : \"\";\n//从value中获取最新的categoryId\nvar categoryIdRegex = /&categoryId=([^&]+)/;\nvar categoryIdMatch = event.data.value.match(categoryIdRegex);\nconst categoryId = categoryIdMatch && categoryIdMatch.length > 0 ? categoryIdMatch[1] : \"\";\n//获取上一次的listname和最新的listname\nconst lastListName = event.data.listName;\nconst listName = event.data.value.split('?')[0].split('instance_tasks/grid/')[1];\n//切换流程时清除过滤条件\nif (lastListName == \"inbox\" && listName == \"inbox\" && (flowId != lastFlowId || categoryId != lastCategoryId)) {\n  listViewPropsStoreKey = window.location.pathname + \"/crud\";\n  sessionStorage.removeItem(listViewPropsStoreKey);\n  sessionStorage.removeItem(listViewPropsStoreKey + \"/query\");\n}\n\n"
                             },
                             {
                               "actionType": "setValue",
@@ -166,7 +111,8 @@
                         "id": "u:74a18fd2df0b"
                       },
                       "unfoldedLevel": 2,
-                      "source": "${options}"
+                      "source": "${options}",
+                      "id": "u:09e092ab054a"
                     }
                   ],
                   "api": {
@@ -175,33 +121,100 @@
                     "headers": {
                       "Authorization": "Bearer ${context.tenantId},${context.authToken}"
                     },
-                    "messages": {
-                    },
-                    "trackExpression": "${_reloadKey}"
+                    "messages": {},
+                    "trackExpression": "${_reloadKey}",
+                    "adaptor": "payload.data.value = window.location.pathname + decodeURIComponent(window.location.search); return payload;"
                   },
-                  "messages": {
-                  }
+                  "messages": {},
+                  "dsType": "api",
+                  "id": "u:b22ab9089a5e"
                 }
               ],
-              "id": "u:5d1f5d7c38d2"
-            }
-          ],
-          "onEvent": {
-            "click": {
-              "actions": [
+              "id": "u:fd659f5c3657",
+              "isFixedHeight": false,
+              "isFixedWidth": false
+            },
+            {
+              "type": "button",
+              "className": "instances-sidebar-overlay",
+              "id": "u:773b1d00aab2",
+              "visibleOn": "${isMobile}",
+              "body": [],
+              "onEvent": {
+                "click": {
+                  "actions": [
+                    {
+                      "actionType": "custom",
+                      "script": "document.querySelector('.instances-customPage').classList.toggle('instances-sidebar-open');"
+                    }
+                  ]
+                }
+              }
+            },
+            {
+              "type": "wrapper",
+              "size": "none",
+              "className": "flex-1 focus:outline-none lg:order-last w-96",
+              "body": [
+                {
+                  "type": "steedos-object-listview",
+                  "objectApiName": "instance_tasks",
+                  "columnsTogglable": false,
+                  "filterVisible": true,
+                  "visibleOn": "${!!!flowId}",
+                  "showHeader": true,
+                  "id": "u:d29cef0d1007",
+                  "showDisplayAs": true,
+                  "className": "h-full w-full instance-tasks-list",
+                  "hiddenColumnOperation": true,
+                  "formFactor": "LARGE",
+                  "headerToolbarItems": [
+                    {
+                      "type": "button",
+                      "label": "",
+                      "align": "left",
+                      "icon": "fa fa-bars",
+                      "className": "bg-white p-2 rounded border-gray-300 text-gray-500",
+                      "onEvent": {
+                        "click": {
+                          "actions": [
+                            {
+                              "actionType": "custom",
+                              "script": "document.querySelector('.instances-customPage').classList.toggle('instances-sidebar-open');"
+                            }
+                          ]
+                        }
+                      },
+                      "id": "u:5f2ce9ca2de6"
+                    }
+                  ],
+                  "listName": "inbox",
+                  "rowClassNameExpr": "<%=(data.is_read === false && (!data.clientIds || data.clientIds.length == 0 || !data.clientIds.includes(data._id))) ? 'unread-instance' : '' %>",
+                  "rebuildOn": "\\${flowId || categoryId}",
+                  "adaptor": "const isSearch = _.some(_.keys(api.body.self), key => key.includes('__keywords') || key.includes('__searchable__'));\nif(payload.data.count==0 && !isSearch){\n    const searchParams = new URLSearchParams(window.location.search);\n    const flowId = searchParams.get(\"flowId\");\n    const categoryId = searchParams.get(\"categoryId\");\n    const pathname = window.location.pathname;\n    if(flowId || categoryId){\n      window.FlowRouter.go(pathname + \"?additionalFilters=&flowId=&categoryId=\");\n    }\n    // if(flowId) {\n    //     window.FlowRouter.go(pathname + \"?additionalFilters=['category','=','\" + categoryId +\"']&flowId=&categoryId=\" + categoryId);\n    // }else if(categoryId) {\n    //     window.FlowRouter.go(pathname + \"?additionalFilters=&flowId=&categoryId=\");\n    // }\n};\nif (api.body.self.listName == \"inbox\") {\n  _.each(payload.data.rows, function (item, index) {\n    if (item.type == 'cc') {\n      item.instance_name += '（传阅）';\n    }\n    if (item.instance__expand.values) {\n      const form_fields = api.body.self.form_fields;\n      _.each(item.instance__expand.values, function (field, field_code) {\n        const form_field = _.find(form_fields, { code: field_code });\n        if (form_field && form_field.type == \"group\") {\n          if (form_field.is_multiselect) {\n            item.instance__expand.values[field_code] = field && field.length > 0 ? _.map(field, 'fullname').toString() : \"\";\n          } else {\n            item.instance__expand.values[field_code] = field ? field.fullname : \"\";\n          }\n        } else if (form_field && form_field.type == \"user\") {\n          if (form_field.is_multiselect) {\n            item.instance__expand.values[field_code] = field && field.length > 0 ? _.map(field, 'name').toString() : \"\";\n          } else {\n            item.instance__expand.values[field_code] = field ? field.name : \"\";\n          }\n        }\n      })\n    }\n  })\n}\n"
+                },
                 {
-                  "actionType": "custom",
-                  "script": "if(window.innerWidth < 768){document.querySelector('.instances-customPage').classList.remove('instances-sidebar-open');document.querySelector('.isInset').classList.remove('inset-0') }"
+                  "type": "service",
+                  "visibleOn": "${!!flowId && listName == 'inbox'}",
+                  "schemaApi": {
+                    "url": "/graphql?flowId=${flowId}&categoryId=${categoryId}",
+                    "method": "post",
+                    "data": {
+                      "query": "{flow: flows__findOne(id:\"${flowId}\"){form__expand{current}}}"
+                    },
+                    "adaptor": "const schema = window.SteedosWorkflow.InstanceTask.getListViewSchema(payload.data.flow); return schema;"
+                  },
+                  "id": "u:dbe8ed1cab9d",
+                  "dsType": "api"
                 }
-              ]
+              ],
+              "id": "u:a3a1e6aa0e2f"
             }
-          },
-          "className": {
-            "absolute isInset": "true"
-          },
-          "id": "u:c8fc09ce5d6b"
+          ],
+          "id": "u:e0bc37818327"
         }
       ],
+      "id": "instance_tasks_list_service",
       "onEvent": {
         "@data.changed.steedos_keyvalues": {
           "actions": [
@@ -219,8 +232,10 @@
         }
       },
       "data": {
+        "isMobile": "${window:innerWidth <= 768}",
         "isFlowDataDone": false
-      }
+      },
+      "dsType": "api"
     }
   ],
   "regions": [
@@ -229,30 +244,52 @@
   "data": {
     "objectName": "instance_tasks",
     "initialValues": {},
-    "title": ""
+    "title": "",
+    "context": {}
   },
-  "id": "u:7e20ab64163e",
+  "id": "u:b7167e2fcaf0",
+  "name": "page_instances_list",
+  "bodyClassName": "p-0",
   "asideResizor": false,
   "pullRefresh": {
     "disabled": true
   },
-  "bodyClassName": {
-    "p-0 instances-customPage instances-sidebar": "true",
-    "pc instances-sidebar-open instances-minwidth": "${window:innerWidth > 768}"
+  "className": {
+    "instances-customPage h-full": true,
+    "instances-list-mobile": "${window:innerWidth < 768}",
+    "instances-list-pc instances-sidebar-open": "${window:innerWidth > 768}"
   },
+  "style": {},
+  "dsType": "api",
   "css": {
-    ".instances-customPage.instances-sidebar.instances-sidebar-open.pc": {
-      "margin-left": "240px"
+    ".instances-customPage.instances-list-mobile .instances-sidebar-wrapper": {
+      "z-index": "601",
+      "top": "50px",
+      "left": "0px",
+      "bottom": "0px",
+      "position": "fixed",
+      "margin": "0px"
+    },
+    ".instances-customPage.instances-list-mobile .instances-sidebar-overlay": {
+      "z-index": "600",
+      "position": "fixed",
+      "bottom": "0px",
+      "right": "0px",
+      "left": "0px",
+      "top": "50px",
+      "display": "none"
+    },
+    ".instances-customPage.instances-list-mobile.instances-sidebar-open .instances-sidebar-overlay": {
+      "display": "block"
     },
-    ".instances-sidebar-wrapper": {
+    ".instances-customPage .instances-sidebar-wrapper": {
       "transition": "0.5s ease transform",
       "will-change": "transform",
       "transform": "translate(-100%,0)",
       "-webkit-transform": "translate(-100%,0)",
       "-moz-transform": "translate(-100%,0)",
       "-ms-transform": "translate(-100%,0)",
-      "-o-transform": "translate(-100%,0)",
-      "width": "240px"
+      "-o-transform": "translate(-100%,0)"
     },
     ".instances-customPage.instances-sidebar-open .instances-sidebar-wrapper": {
       "transform": "translate(0,0)",
@@ -261,20 +298,20 @@
       "-ms-transform": "translate(0,0)",
       "-o-transform": "translate(0,0)"
     },
-    ".pcCss": {
-      "top": "90px",
-      "left": "0px"
+    ".instances-customPage.instances-list-pc .instances-sidebar-wrapper": {
+      "min-width": "0px",
+      "width": "0px"
     },
-    ".sidebar .pcCss": {
-      "left": "220px"
-    },
-    ".mobileCss": {
-      "top": "50px",
-      "left": "0px",
-      "padding-bottom": "65px"
-    },
-    ".instances-minwidth": {
-      "min-width": "388px"
+    ".instances-customPage.instances-list-pc.instances-sidebar-open .instances-sidebar-wrapper": {
+      "min-width": "240px"
     }
-  }
+  },
+  "themeCss": {
+    "baseControlClassName": {
+      "padding-and-margin:default": {
+        "padding": "${displayAs == 'grid'?'':'0px'}"
+      }
+    }
+  },
+  "title": "Welcome to Steedos"
 }