@steedos-widgets/amis-lib 6.10.1 → 6.10.2-beta.2

package/dist/index.cjs.js

@@ -2321,9 +2321,13 @@ var sfield_control_create_allowance$1 = "Allow Creation in Popup";
 var sfield_control_depend_on$1 = "Dependency Fields";
 var sfield_control_depend_on_remark$1 = "Changes in dependent fields trigger recalculation of the current field";
 var sfield_control_enable_thousands$1 = "Show Thousands Separator";
+var sfield_control_filters$1 = "Lookup Relationship Filters Condition";
+var sfield_control_filters_remark$1 = "When the field type is Lookup Relationship or Master Detail Relationship, filtering conditions can be configured for the field, filtering option list; The field values can be configured as formulas, and the fields referenced in the formulas need to be configured in Dependent Fields at the same time";
 var sfield_control_create_unique_index$1 = "Create Unique Index";
 var sfield_control_create_unique_index_remark$1 = "Performed once every day at midnight; existing indexes are not recreated.";
+var sfield_control_filterable$1 = "Enable quick search on the list page";
 var sfield_control_default_filter_field$1 = "Default Filter Field";
+var sfield_control_sortable$1 = "Sortable";
 var sfield_control_create_index$1 = "Create Index";
 var sfield_control_create_index_remark$1 = "Performed once every day at midnight; existing indexes are not recreated.";
 var sfield_control_name_field$1 = "Name Field";
@@ -2489,9 +2493,13 @@ var widget_ed = {
 	sfield_control_depend_on: sfield_control_depend_on$1,
 	sfield_control_depend_on_remark: sfield_control_depend_on_remark$1,
 	sfield_control_enable_thousands: sfield_control_enable_thousands$1,
+	sfield_control_filters: sfield_control_filters$1,
+	sfield_control_filters_remark: sfield_control_filters_remark$1,
 	sfield_control_create_unique_index: sfield_control_create_unique_index$1,
 	sfield_control_create_unique_index_remark: sfield_control_create_unique_index_remark$1,
+	sfield_control_filterable: sfield_control_filterable$1,
 	sfield_control_default_filter_field: sfield_control_default_filter_field$1,
+	sfield_control_sortable: sfield_control_sortable$1,
 	sfield_control_create_index: sfield_control_create_index$1,
 	sfield_control_create_index_remark: sfield_control_create_index_remark$1,
 	sfield_control_name_field: sfield_control_name_field$1,
@@ -3097,9 +3105,13 @@ var sfield_control_create_allowance = "弹出选择时允许新建";
 var sfield_control_depend_on = "依赖字段";
 var sfield_control_depend_on_remark = "依赖字段的变化会触发当前字段重算";
 var sfield_control_enable_thousands = "显示千分符";
+var sfield_control_filters = "相关表过滤条件";
+var sfield_control_filters_remark = "当字段类型为相关表关系或主/子表关系时，可以为该字段配置过滤条件，过滤选项列表；其中字段值可以配置为公式，公式中引用的字段需要同时配置在依赖的字段中";
 var sfield_control_create_unique_index = "创建唯一索引";
 var sfield_control_create_unique_index_remark = "默认每天凌晨执行一次创建，已有的索引不重复创建。";
+var sfield_control_filterable = "启用列表页快速搜索";
 var sfield_control_default_filter_field = "列表页过滤器默认字段";
+var sfield_control_sortable = "可排序";
 var sfield_control_create_index = "创建索引";
 var sfield_control_create_index_remark = "默认每天凌晨执行一次创建，已有的索引不重复创建。";
 var sfield_control_name_field = "名称字段";
@@ -3265,9 +3277,13 @@ var widget_zh = {
 	sfield_control_depend_on: sfield_control_depend_on,
 	sfield_control_depend_on_remark: sfield_control_depend_on_remark,
 	sfield_control_enable_thousands: sfield_control_enable_thousands,
+	sfield_control_filters: sfield_control_filters,
+	sfield_control_filters_remark: sfield_control_filters_remark,
 	sfield_control_create_unique_index: sfield_control_create_unique_index,
 	sfield_control_create_unique_index_remark: sfield_control_create_unique_index_remark,
+	sfield_control_filterable: sfield_control_filterable,
 	sfield_control_default_filter_field: sfield_control_default_filter_field,
+	sfield_control_sortable: sfield_control_sortable,
 	sfield_control_create_index: sfield_control_create_index,
 	sfield_control_create_index_remark: sfield_control_create_index_remark,
 	sfield_control_name_field: sfield_control_name_field,
@@ -5065,12 +5081,15 @@ async function getTableApi(mainObject, fields, options){
         let selfData = JSON.parse(JSON.stringify(api.data.$self));
         // 保留一份初始data，以供自定义发送适配器中获取原始数据。
         const data = _.cloneDeep(api.data);
+        let needToStoreListViewProps;
         try{
             // TODO: 不应该直接在这里取localStorage，应该从外面传入
             const listName = api.data.listName;
+            // 只有在列表页面中才需要存储和读取本地存储中的参数，相关子表组件不需要
+            needToStoreListViewProps = !!listName && !api.body.$self._isRelated;
             const listViewPropsStoreKey = location.pathname + "/crud";
             let localListViewProps = sessionStorage.getItem(listViewPropsStoreKey);
-            if(localListViewProps){
+            if(needToStoreListViewProps && localListViewProps){
                 localListViewProps = JSON.parse(localListViewProps);
                 selfData = Object.assign({}, localListViewProps, selfData);
                 if(!api.data.filter){
@@ -5212,7 +5231,7 @@ async function getTableApi(mainObject, fields, options){
 
         //写入本次存储filters、sort
         const listViewPropsStoreKey = location.pathname + "/crud/query";
-        sessionStorage.setItem(listViewPropsStoreKey, JSON.stringify({
+        needToStoreListViewProps && sessionStorage.setItem(listViewPropsStoreKey, JSON.stringify({
             filters: filters,
             sort: sort.trim(),
             pageSize: pageSize,
@@ -5319,9 +5338,12 @@ async function getTableApi(mainObject, fields, options){
     }
 
 
+    let needToStoreListViewProps;
     try{
         // TODO: 不应该直接在这里取localStorage，应该从外面传入
         const listName = api.body.listName;
+        // 只有在列表页面中才需要存储和读取本地存储中的参数，相关子表组件不需要
+        needToStoreListViewProps = !!listName && !api.body.$self._isRelated;
         const listViewPropsStoreKey = location.pathname + "/crud";
         /**
          * localListViewProps规范来自crud请求api中api.data.$self参数值的。
@@ -5333,7 +5355,7 @@ async function getTableApi(mainObject, fields, options){
          * orderBy:排序字段
          * orderDir:排序方向
          */
-        let localListViewProps = sessionStorage.getItem(listViewPropsStoreKey);
+        let localListViewProps = needToStoreListViewProps && sessionStorage.getItem(listViewPropsStoreKey);
         let selfData = JSON.parse(JSON.stringify(api.body.$self));
         if(localListViewProps){
             localListViewProps = JSON.parse(localListViewProps);
@@ -5351,7 +5373,7 @@ async function getTableApi(mainObject, fields, options){
         
         delete selfData.context;
         delete selfData.global;
-        sessionStorage.setItem(listViewPropsStoreKey, JSON.stringify(selfData));
+        needToStoreListViewProps && sessionStorage.setItem(listViewPropsStoreKey, JSON.stringify(selfData));
         // 返回页码到UI界面
         payload.data.page= selfData.page;
     }
@@ -15656,6 +15678,7 @@ async function convertSFieldToAmisField(field, readonly, ctx) {
                 format: 'YYYY-MM-DDTHH:mm:00.000Z',
                 tpl: readonly ? getDateTimeTpl(field) : null,
                 utc: true,
+                closeOnSelect: false
             };
             break;
         case 'input-time-range':
@@ -18925,7 +18948,7 @@ const getNextStepUsersInput = async (instance) => {
           },
           {
             type: "list-select",
-            label: "list-select1",
+            label: "",
             name: "next_users",
             id: "u:next_users",
             required: true,
@@ -18969,7 +18992,7 @@ const getNextStepUsersInput = async (instance) => {
           },
           {
             type: "list-select",
-            label: "list-select2",
+            label: "",
             name: "next_users",
             id: "u:next_users",
             required: true,
@@ -19132,7 +19155,7 @@ const getPostEngineRequestAdaptor = async (instance) => {
  * @param instance
  * @returns
  */
-const getSubmitActions = async (instance) => {
+const getSubmitActions = async (instance, submitEvents) => {
   let api = "";
   let requestAdaptor = "";
   if(instance.approve?.type == "cc"){
@@ -19211,6 +19234,7 @@ const getSubmitActions = async (instance) => {
       `,
       expression: "${event.data.instanceFormValidate}"
     },
+    ...submitEvents,
     {
       componentId: "",
       args: {
@@ -19250,7 +19274,7 @@ const getSubmitActions = async (instance) => {
   ];
 };
 
-const getApprovalDrawerSchema = async (instance) => {
+const getApprovalDrawerSchema = async (instance, submitEvents) => {
   return {
     type: "drawer",
     overlay: false,
@@ -19343,7 +19367,7 @@ const getApprovalDrawerSchema = async (instance) => {
         label: "${'Submit' | t}",
         onEvent: {
           click: {
-            actions: await getSubmitActions(instance),
+            actions: await getSubmitActions(instance, submitEvents),
           },
         },
         id: "u:f6f8c3933f6c",
@@ -20420,7 +20444,7 @@ const getApplicantTableView = async (instance) => {
   };
 };
 
-const getApproveButton = async (instance)=>{
+const getApproveButton = async (instance, submitEvents)=>{
   if(!instance.approve || ( instance.box != 'inbox' && instance.box != 'draft')){
     return null;
   }
@@ -20434,7 +20458,7 @@ const getApproveButton = async (instance)=>{
             componentId: "",
             args: {},
             actionType: "drawer",
-            drawer: await getApprovalDrawerSchema(instance),
+            drawer: await getApprovalDrawerSchema(instance, submitEvents),
           },
         ],
       },
@@ -20456,6 +20480,19 @@ const getFlowFormSchema = async (instance, box) => {
     formContentSchema = await getFormTableView(instance);
   }
 
+  const amisSchemaStr = instance.formVersion?.amis_schema;
+  
+  let initedEvents = [];
+  let changeEvents = [];
+  let submitEvents = [];
+
+  if(amisSchemaStr){
+    const onEvent = JSON.parse(instance.formVersion.amis_schema).onEvent;
+    initedEvents = onEvent.inited.actions || [];
+    changeEvents = onEvent.change.actions || [];
+    submitEvents = onEvent.submit.actions || [];
+  }
+
   console.log('getFlowFormSchema formContentSchema', formContentSchema);
   return {
     type: "page",
@@ -20561,13 +20598,14 @@ const getFlowFormSchema = async (instance, box) => {
                 "componentId": "u:next_step",
                 "args": {
                 }
-              }
+              },
+              ...changeEvents
             ]
           }
         }
       },
       await getInstanceApprovalHistory(),
-      await getApproveButton(instance)
+      await getApproveButton(instance, submitEvents)
     ],
     id: "u:63849ea39e12",
     messages: {},
@@ -20593,7 +20631,8 @@ const getFlowFormSchema = async (instance, box) => {
               "value": "${event.data.context.approveValues}"
             },
             "expression": "${event.data.context.form.current.style === 'wizard'}"// 表单为 wizard 样式时需要初始同步表单数据，否则直接点击暂存按钮会清空数据
-          }
+          },
+          ...initedEvents
         ]
       },
       // inited: {