@steedos-widgets/amis-lib 1.2.38 → 1.2.39-beta.1

package/dist/index.esm.js

@@ -1050,6 +1050,7 @@ var frontend_message_modification_failed$1 = "Modification failed!";
 var frontend_objects_related_alert_start$1 = "No related table fields associated with the related list object";
 var frontend_objects_related_alert_end$1 = "were found.";
 var frontend_no_records_found$1 = "No records found.";
+var frontend_records_no_allowedit$1 = "You do not have edit permission for this record";
 var en_us = {
 	frontend_field_group_generalization: frontend_field_group_generalization$1,
 	frontend_download: frontend_download$1,
@@ -1132,7 +1133,8 @@ var en_us = {
 	frontend_message_modification_failed: frontend_message_modification_failed$1,
 	frontend_objects_related_alert_start: frontend_objects_related_alert_start$1,
 	frontend_objects_related_alert_end: frontend_objects_related_alert_end$1,
-	frontend_no_records_found: frontend_no_records_found$1
+	frontend_no_records_found: frontend_no_records_found$1,
+	frontend_records_no_allowedit: frontend_records_no_allowedit$1
 };
 
 var frontend_field_group_generalization = "通用";
@@ -1156,7 +1158,7 @@ var frontend_display_type_is_split = "分栏视图";
 var frontend_display_as = "显示为";
 var frontend_record_sum = "个项目";
 var frontend_button_reload_tooltip = "刷新";
-var frontend_button_search_tooltip = "搜索";
+var frontend_button_search_tooltip = "查询";
 var frontend_fields_filter_button_search = "搜索";
 var frontend_fields_filter_button_settings = "设置搜索项";
 var frontend_button_listview_control_tooltip = "列表视图控制";
@@ -1218,6 +1220,7 @@ var frontend_message_modification_failed = "修改失败！";
 var frontend_objects_related_alert_start = "未找到与相关列表对象";
 var frontend_objects_related_alert_end = "关联的相关表字段";
 var frontend_no_records_found = "无法找到记录";
+var frontend_records_no_allowedit = "您对这条记录没有编辑权限";
 var zh_cn = {
 	frontend_field_group_generalization: frontend_field_group_generalization,
 	frontend_download: frontend_download,
@@ -1301,7 +1304,8 @@ var zh_cn = {
 	frontend_message_modification_failed: frontend_message_modification_failed,
 	frontend_objects_related_alert_start: frontend_objects_related_alert_start,
 	frontend_objects_related_alert_end: frontend_objects_related_alert_end,
-	frontend_no_records_found: frontend_no_records_found
+	frontend_no_records_found: frontend_no_records_found,
+	frontend_records_no_allowedit: frontend_records_no_allowedit
 };
 
 const resources = {
@@ -3355,12 +3359,14 @@ async function getObjectFieldsFilterBarSchema(objectSchema, ctx) {
     if(!event.data.isLookup){
       // 刷新浏览器后，filterFormValues值是空的，只能从本地存储中取出并重置为空值
       const listName = event.data.listName;
-      const listViewPropsStoreKey = location.pathname + "/crud/" + (listName || "");
+      const listViewPropsStoreKey = location.pathname + "/crud";
       let localListViewProps = sessionStorage.getItem(listViewPropsStoreKey);
       if(localListViewProps){
         localListViewProps = JSON.parse(localListViewProps);
         for(var k in localListViewProps){
-          removedValues[k] = null;
+          if(k !== "__keywords"){
+            removedValues[k] = null;
+          }
         }
       }
     }
@@ -3382,12 +3388,9 @@ async function getObjectFieldsFilterBarSchema(objectSchema, ctx) {
     const objectName = data.objectName;
     const isLookup = data.isLookup;
     const listName = data.listName;
-    let searchableFieldsStoreKey = location.pathname + "/searchable_fields/";
+    let searchableFieldsStoreKey = location.pathname + "/searchable_fields";
     if(isLookup){
-      searchableFieldsStoreKey += "lookup/" + objectName;
-    }
-    else{
-      searchableFieldsStoreKey += (listName || "");
+      searchableFieldsStoreKey += "/lookup/" + objectName;
     }
     let defaultSearchableFields = sessionStorage.getItem(searchableFieldsStoreKey);
     if(defaultSearchableFields){
@@ -3414,7 +3417,7 @@ async function getObjectFieldsFilterBarSchema(objectSchema, ctx) {
       setData({ showFieldsFilter: false });
     }
     else{
-      const listViewPropsStoreKey = location.pathname + "/crud/" + (listName || "");
+      const listViewPropsStoreKey = location.pathname + "/crud";
       let localListViewProps = sessionStorage.getItem(listViewPropsStoreKey);
       if(localListViewProps){
         localListViewProps = JSON.parse(localListViewProps);
@@ -3454,12 +3457,9 @@ async function getObjectFieldsFilterBarSchema(objectSchema, ctx) {
       return n.props.type === "service";
     });
     filterService.setData({ filterFormSearchableFields: value });
-    let searchableFieldsStoreKey = location.pathname + "/searchable_fields/";
+    let searchableFieldsStoreKey = location.pathname + "/searchable_fields";
     if(isLookup){
-      searchableFieldsStoreKey += "lookup/" + objectName;
-    }
-    else{
-      searchableFieldsStoreKey += (listName || "");
+      searchableFieldsStoreKey += "/lookup/" + objectName;
     }
     sessionStorage.setItem(searchableFieldsStoreKey, value);
 
@@ -3517,7 +3517,7 @@ async function getObjectFieldsFilterBarSchema(objectSchema, ctx) {
     }
     
     // 列表视图crud支持本地缓存，所以需要进一步清除浏览器本地缓存里面用户在可搜索项中移除的字段值
-    const listViewPropsStoreKey = location.pathname + "/crud/" + (listName || "");
+    const listViewPropsStoreKey = location.pathname + "/crud";
     let localListViewProps = sessionStorage.getItem(listViewPropsStoreKey);
     if(localListViewProps){
       localListViewProps = JSON.parse(localListViewProps);
@@ -5238,9 +5238,23 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
 `;
 
 
-function getObjectHeaderToolbar(mainObject, formFactor, {showDisplayAs = false, hiddenCount = false, headerToolbarItems, filterVisible = true} = {}){
+function getObjectHeaderToolbar(mainObject, fields, formFactor, {showDisplayAs = false, hiddenCount = false, headerToolbarItems, filterVisible = true} = {}){
   // console.log(`getObjectHeaderToolbar====>`, filterVisible)
-  console.log(`getObjectHeaderToolbar`, mainObject);
+  // console.log(`getObjectHeaderToolbar`, mainObject)
+  const searchableFieldsLabel = [];
+  _.each(fields, function (field) {
+    if (field.searchable) {
+      searchableFieldsLabel.push(field.label);
+    }
+  });
+  const listViewPropsStoreKey = location.pathname + "/crud";
+  let localListViewProps = sessionStorage.getItem(listViewPropsStoreKey);
+  let crudKeywords = "";
+  if(localListViewProps){
+    localListViewProps = JSON.parse(localListViewProps);
+    crudKeywords = (localListViewProps && localListViewProps.__keywords) || "";
+  }
+
   const isMobile = window.innerWidth < 768;
   if(isMobile){
     showDisplayAs = false;
@@ -5330,21 +5344,9 @@ function getObjectHeaderToolbar(mainObject, formFactor, {showDisplayAs = false,
         "type": "tpl",
         "tpl":  "${count} " + i18next.t('frontend_record_sum')
       },
-      {
-        "type": "reload",
-        "align": "right",
-        //TODO: dropdown-button只支持在按钮上方配置提示，对于上方按钮的点击会有影响，为保持统一，暂时去除，等待amis优化，https://github.com/baidu/amis/issues/7330
-        // "tooltip": i18next.t('frontend_button_reload_tooltip'),
-        "tooltip":"",
-        "tooltipPlacement": "top",
-        "className": "bg-white p-2 rounded border-gray-300 text-gray-500"
-      },
-      // getExportExcelToolbarButtonSchema(),
-      mainObject?.permissions?.allowCreateListViews ? getSettingListviewToolbarButtonSchema() : {},
-      getDisplayAsButton(mainObject?.name),
       filterVisible ? {
         "label": i18next.t('frontend_button_search_tooltip'),
-        "icon": "fa fa-search",
+        "icon": "fa fa-filter",
         //TODO: dropdown-button只支持在按钮上方配置提示，对于上方按钮的点击会有影响，为保持统一，暂时去除，等待amis优化，https://github.com/baidu/amis/issues/7330
         // "tooltip": i18next.t('frontend_button_search_tooltip'),
         // "tooltipPlacement": "top",
@@ -5370,14 +5372,39 @@ function getObjectHeaderToolbar(mainObject, formFactor, {showDisplayAs = false,
             ]
           }
         }
-      } : {}
-      // {
-      //   "type": "search-box",
-      //   "align": "right",
-      //   "name": "__keywords",
-      //   "placeholder": "请输入关键字",
-      //   "mini": true
-      // },
+      } : {},
+      {
+        "type": "reload",
+        "align": "right",
+        //TODO: dropdown-button只支持在按钮上方配置提示，对于上方按钮的点击会有影响，为保持统一，暂时去除，等待amis优化，https://github.com/baidu/amis/issues/7330
+        // "tooltip": i18next.t('frontend_button_reload_tooltip'),
+        "tooltip":"",
+        "tooltipPlacement": "top",
+        "className": "bg-white p-2 rounded border-gray-300 text-gray-500"
+      },
+      // getExportExcelToolbarButtonSchema(),
+      mainObject?.permissions?.allowCreateListViews ? getSettingListviewToolbarButtonSchema() : {},
+      getDisplayAsButton(mainObject?.name),
+      {
+        "type": "tooltip-wrapper",
+        "align": "right",
+        "title": "",
+        "content": "可模糊搜索字段：" + searchableFieldsLabel.join(","),
+        "placement": "bottom",
+        "tooltipTheme": "dark",
+        "trigger": "click",
+        "className": "mr-1",
+        "body": [
+          {
+            "type": "search-box",
+            "name": "__keywords",
+            "placeholder": "请输入关键字",
+            "value": crudKeywords,
+            "clearable": true,
+            "clearAndSubmit": true
+          }
+        ]
+      },
       // {
       //     "type": "drag-toggler",
       //     "align": "right"
@@ -5721,16 +5748,17 @@ function getLookupSapceUserTreeSchema(){
         "autoCheckChildren": false,
         "searchable": true,
         "searchConfig": {
-          "sticky": true
+          "sticky": true,
+          "placeholder": "查找部门"
         },
         "unfoldedLevel": 2,
         "style": {
           "max-height": "100%",
           "position": "absolute",
-          "left": "-200px",
-          "width": "190px",
+          "left": "-220px",
+          "width": "210px",
           "bottom": 0,
-          "top": "2px",
+          "top": "0",
           "overflow": "auto",
           "min-height":"300px"
         },
@@ -5749,7 +5777,7 @@ async function lookupToAmisPicker(field, readonly, ctx){
     ctx.idFieldName = refObjectConfig.idFieldName;
     ctx.objectName = refObjectConfig.name;
 
-    const tableFields = [];
+    let tableFields = [];
     let i = 0;
     const searchableFields = [];
 
@@ -5878,16 +5906,31 @@ async function lookupToAmisPicker(field, readonly, ctx){
             }
         }
 
-
         if(allowSearchFields){
             allowSearchFields.forEach(function(key){
                 const keyValue = selfData[key];
-                if(keyValue){
+                if(_.isString(keyValue)){
                     filters.push([key, "contains", keyValue]);
+                }else if(_.isArray(keyValue) || _.isBoolean(keyValue) || keyValue){
+                    filters.push([key, "=", keyValue]);
                 }
             })
         }
 
+        if(selfData.__keywords && allowSearchFields){
+            const keywordsFilters = [];
+            allowSearchFields.forEach(function(key, index){
+                const keyValue = selfData.__keywords;
+                if(keyValue){
+                    keywordsFilters.push([key, "contains", keyValue]);
+                    if(index < allowSearchFields.length - 1){
+                        keywordsFilters.push('or');
+                    }
+                }
+            })
+            filters.push(keywordsFilters);
+        };
+
         var fieldFilters = ${JSON.stringify(field.filters)};
         if(fieldFilters && fieldFilters.length){
             filters.push(fieldFilters);
@@ -5976,6 +6019,7 @@ async function lookupToAmisPicker(field, readonly, ctx){
     if(refObjectConfig.paging && refObjectConfig.paging.enabled === false){
         top = 1000;
     }
+
     let pickerSchema = null;
     if(ctx.formFactor === 'SMALL'){
         pickerSchema = await getListSchema$1(tableFields, {
@@ -5997,7 +6041,7 @@ async function lookupToAmisPicker(field, readonly, ctx){
         if(referenceTo.objectName === "space_users" && field.reference_to_field === "user" && !isMobile){
              headerToolbarItems = getLookupSapceUserTreeSchema();
              pickerSchema["style"] = {
-                "margin-left":"200px",
+                "margin-left":"220px",
                 "min-height": "300px"
              };
              pickerSchema.className = pickerSchema.className || "" + " steedos-select-user";
@@ -6008,7 +6052,8 @@ async function lookupToAmisPicker(field, readonly, ctx){
         if (isAllowCreate) {
             const new_button = await getSchema$5(refObjectConfig, { appId: ctx.appId, objectName: refObjectConfig.name, formFactor: ctx.formFactor });
             new_button.align = "right";
-            pickerSchema.headerToolbar.push(new_button);
+            // 保持快速搜索放在最左侧，新建按钮往里插，而不是push到最后
+            pickerSchema.headerToolbar.splice(pickerSchema.headerToolbar.length - 1, 0, new_button);
         }
         pickerSchema.footerToolbar = refObjectConfig.enable_tree ? [] : getObjectFooterToolbar();
         if (ctx.filterVisible !== false) {
@@ -7698,7 +7743,71 @@ async function getQuickEditSchema(field, options){
                 `;
                 break;
             }
-
+            quickEditSchema.body[0].visibleOn = "${quickedit_record_permissions.allowEdit && quickedit_record_permissions_loading == false}";
+            quickEditSchema.body.push({
+                "type":"service",
+                "body":[
+                    {
+                        "type": "tpl",
+                        "tpl": i18next.t('frontend_records_no_allowedit'),
+                        "visibleOn": "${!quickedit_record_permissions.allowEdit && quickedit_record_permissions_loading == false}"
+                    },
+                    {
+                        "type": "spinner",
+                        "showOn": "${quickedit_record_permissions_loading}"
+                    }
+                ],
+                "onEvent":{
+                    "init":{
+                        "actions":[
+                            {
+                                "actionType": "setValue",
+                                "componentId": `service_listview_${options.objectName}`,
+                                "args": {
+                                    "value":{
+                                        "quickedit_record_permissions_loading": true
+                                    }
+                                }
+                            },
+                            {
+                                "actionType": "ajax",
+                                "args": {
+                                    "api": {
+                                      "url": "${context.rootUrl}/service/api/@\${objectName}/recordPermissions/${_id}",
+                                      "method": "get",
+                                      "headers": {
+                                        "Authorization": "Bearer ${context.tenantId},${context.authToken}"
+                                      },
+                                      "cache": 30000,
+                                      "messages": {
+                                        "failed": "失败了呢。。"
+                                      }
+                                    }
+                                }
+                            },
+                            {
+                                "actionType": "setValue",
+                                "componentId": `service_listview_${options.objectName}`,
+                                "args": {
+                                    "value":{
+                                        "quickedit_record_permissions_loading": false
+                                    }
+                                }
+                            },
+                            {
+                                "actionType": "setValue",
+                                "componentId": `service_listview_${options.objectName}`,
+                                "args": {
+                                    "value":{
+                                        "quickedit_record_permissions": "${event.data}"
+                                    }
+                                }
+                            }
+                        ]
+                    }
+                }
+                
+            });
         } else {
             quickEditSchema = false;
         }
@@ -7731,7 +7840,7 @@ function getFieldWidth(width){
 
 async function getTableColumns(fields, options){
     const columns = [{name: '_index',type: 'text', width: 32, placeholder: ""}];
-    const allowEdit = options.permissions?.allowEdit && options.permissions?.modifyAllRecords && !options.isLookup && options.enable_inline_edit != false;
+    const allowEdit = options.permissions?.allowEdit && !options.isLookup && options.enable_inline_edit != false;
     
     for (const field of fields) {
         //增加quickEdit属性，实现快速编辑
@@ -8269,7 +8378,7 @@ async function getTableApi(mainObject, fields, options){
         try{
             // TODO: 不应该直接在这里取localStorage，应该从外面传入
             const listName = api.data.listName;
-            const listViewPropsStoreKey = location.pathname + "/crud/" + (listName || "");
+            const listViewPropsStoreKey = location.pathname + "/crud";
             let localListViewProps = sessionStorage.getItem(listViewPropsStoreKey);
             if(localListViewProps){
                 localListViewProps = JSON.parse(localListViewProps);
@@ -8470,7 +8579,7 @@ async function getTableApi(mainObject, fields, options){
     try{
         // TODO: 不应该直接在这里取localStorage，应该从外面传入
         const listName = api.body.listName;
-        const listViewPropsStoreKey = location.pathname + "/crud/" + (listName || "");
+        const listViewPropsStoreKey = location.pathname + "/crud";
         /**
          * localListViewProps规范来自crud请求api中api.data.$self参数值的。
          * 比如：{"perPage":20,"page":1,"__searchable__name":"7","__searchable__between__n1__c":[null,null],"filter":[["name","contains","a"]]}
@@ -9660,7 +9769,7 @@ async function getObjectCRUD(objectSchema, fields, options){
       }
     }
     // console.log(`getObjectHeaderToolbar====2===>`, options.filterVisible)
-    bodyProps.headerToolbar = getObjectHeaderToolbar(objectSchema, options.formFactor, {
+    bodyProps.headerToolbar = getObjectHeaderToolbar(objectSchema, fields, options.formFactor, {
       showDisplayAs, 
       hiddenCount: options.queryCount === false, 
       headerToolbarItems: options.headerToolbarItems,
@@ -9785,6 +9894,7 @@ async function getObjectCRUD(objectSchema, fields, options){
     return {
       type: 'service',
       className: '',
+      //目前crud的service层id不认用户自定义id，只支持默认规则id
       id: `service_${id}`,
       name: `page`,
       data: {