@steedos-widgets/amis-lib 1.3.0-beta.14 → 1.3.0-beta.15

package/dist/index.esm.js

@@ -382,8 +382,8 @@ const Router = {
 /*
  * @Author: baozhoutao@steedos.com
  * @Date: 2022-07-20 16:29:22
- * @LastEditors: Please set LastEditors
- * @LastEditTime: 2023-05-18 15:22:51
+ * @LastEditors: 殷亮辉 yinlianghui@hotoa.com
+ * @LastEditTime: 2023-09-06 18:59:40
  * @Description: 
  */
 
@@ -396,6 +396,32 @@ function getContrastColor(bgColor) {
   return brightness < 128 ? "#ffffff" : "#000000";
 }
 
+function getLookupListView(refObjectConfig) {
+  const listNameAll = "all";
+  const listNameLookup = "lookup";
+  let listViewAll, listViewLookup;
+
+  _.each(
+    refObjectConfig.list_views,
+    (view, name) => {
+      if (name === listNameAll) {
+        listViewAll = view;
+        if(!listViewAll.name){
+          listViewAll.name = name;
+        }
+      }
+      else if (name === listNameLookup) {
+        listViewLookup = view;
+        if(!listViewLookup.name){
+          listViewLookup.name = name;
+        }
+      }
+    }
+  );
+  let listView = listViewLookup || listViewAll;
+  return listView;
+}
+
 /*
  * @Author: baozhoutao@steedos.com
  * @Date: 2022-05-23 09:53:08
@@ -1653,10 +1679,7 @@ async function getSearchApi(field, ctx) {
 }
 
 function getRefListViewSort$1(refObject){
-    const listView = _$1.find(
-        refObject.list_views,
-        (view, name) => name === "all"
-    );
+    let listView = getLookupListView(refObject);
     let sort = "";
     if(listView){
         sort = getListViewSort(listView);
@@ -3591,6 +3614,10 @@ function getObjectListHeaderFirstLine(objectSchema, listViewName, ctx) {
   each(
     objectSchema.list_views,
     (listView, name) => {
+      if(name === "lookup"){
+        // 内置lookup为弹出选择专用视图，不显示在列表切换区域
+        return;
+      }
       listViewButtonOptions.push({
         type: "button",
         label: listView.label,
@@ -5454,10 +5481,8 @@ async function getDeferApi(field, ctx) {
 }
 
 function getRefListViewSort(refObject){
-    const listView = _$1.find(
-        refObject.list_views,
-        (view, name) => name === "all"
-    );
+    let listView = getLookupListView(refObject);
+    
     let sort = "";
     if(listView){
         sort = getListViewSort(listView);
@@ -5674,19 +5699,14 @@ async function lookupToAmisPicker(field, readonly, ctx){
     ctx.objectName = refObjectConfig.name;
 
     let tableFields = [];
-    let i = 0;
     const searchableFields = [];
 
-    const fieldsArr = [];
-
-    const listName = "all";
+    let fieldsArr = [];
     
     const isMobile = window.innerWidth < 768;
 
-    const listView = _$1.find(
-        refObjectConfig.list_views,
-        (listView, name) => name === listName
-    );
+    let listView = getLookupListView(refObjectConfig);
+    let listName = listView && listView.name;
     if (listView && listView.columns) {
         _$1.each(listView.columns, function (column) {
             if (_$1.isString(column) && refObjectConfig.fields[column]) {
@@ -5701,7 +5721,7 @@ async function lookupToAmisPicker(field, readonly, ctx){
             }
         });
     }else {
-        _$1.each(refObjectConfig.fields , (field, field_name)=>{
+        _$1.each(refObjectConfig.fields, (field, field_name)=>{
             if(field_name != '_id' && !field.hidden){
                 if(!_$1.has(field, "name")){
                     field.name = field_name;
@@ -5709,16 +5729,15 @@ async function lookupToAmisPicker(field, readonly, ctx){
                 fieldsArr.push(field);
             }
         });
+        // 没有视图权限时，取对象上前5个字段，按sort_no排序
+        fieldsArr = _$1.sortBy(fieldsArr, "sort_no").slice(0,5);
     }
 
-    _$1.each(_$1.sortBy(fieldsArr, "sort_no"),function(field){
-        if(i < 5){
-            if(!_$1.find(tableFields, function(f){
-                return f.name === field.name
-            })){
-                i++;
-                tableFields.push(field);
-            }
+    _$1.each(fieldsArr,function(field){
+        if(!_$1.find(tableFields, function(f){
+            return f.name === field.name
+        })){
+            tableFields.push(field);
         }
     });
 
@@ -6105,10 +6124,7 @@ async function lookupToAmisSelect(field, readonly, ctx){
     }
 
     const refObjectConfig = referenceTo && await getUISchema(referenceTo.objectName);
-    const listView = refObjectConfig && _$1.find(
-        refObjectConfig.list_views,
-        (listView, name) => name === "all"
-    );
+    let listView = getLookupListView(refObjectConfig);
 
     let sort = "";
     if(listView){
@@ -6343,7 +6359,7 @@ async function getIdsPickerSchema(field, readonly, ctx){
 
     const tableFields = [referenceTo.labelField];
 
-    const source = await getApi$1(refObjectConfig, null, fields, {expand: true, alias: 'rows', queryOptions: `filters: {__filters}, top: {__top}, skip: {__skip}`});
+    const source = await getApi$1(refObjectConfig, null, fields, {expand: true, alias: 'rows', queryOptions: `filters: {__filters}, top: {__top}, skip: {__skip}, sort: "{__sort}"`});
     
     source.data.$term = "$term";
     source.data.$self = "$$";
@@ -6352,6 +6368,12 @@ async function getIdsPickerSchema(field, readonly, ctx){
         source.sendOn = `\${${idsDependOn} && ${idsDependOn}.length}`;
         source.url = `${source.url}&depend_on_${idsDependOn}=\${${idsDependOn}|join}`;
     }
+
+    let listView = getLookupListView(refObjectConfig);
+    let sort = "";
+    if(listView){
+        sort = getListViewSort(listView);
+    }
    
     source.requestAdaptor = `
         const selfData = JSON.parse(JSON.stringify(api.data.$self));
@@ -6359,6 +6381,10 @@ async function getIdsPickerSchema(field, readonly, ctx){
         var pageSize = api.data.pageSize || 1000;
         var pageNo = api.data.pageNo || 1;
         var skip = (pageNo - 1) * pageSize;
+        var orderBy = api.data.orderBy || '';
+        var orderDir = api.data.orderDir || '';
+        var sort = orderBy + ' ' + orderDir;
+        sort = orderBy ? sort : "${sort}";
         if(selfData.op === 'loadOptions' && selfData.value){
             if(selfData.value && selfData.value.indexOf(',') > 0){
                 filters = [["${referenceTo.valueField.name}", "=", selfData.value.split(',')]];
@@ -6376,7 +6402,7 @@ async function getIdsPickerSchema(field, readonly, ctx){
             filters.push(["${referenceTo.valueField.name}", "=", ids]);
         }
 
-        api.data.query = api.data.query.replace(/{__filters}/g, JSON.stringify(filters)).replace('{__top}', pageSize).replace('{__skip}', skip);
+        api.data.query = api.data.query.replace(/{__filters}/g, JSON.stringify(filters)).replace('{__top}', pageSize).replace('{__skip}', skip).replace('{__sort}', sort.trim());
         return api;
     `;
 
@@ -8881,7 +8907,7 @@ async function getEditFormInitApi(object, recordId, fields, options){
                 var defaultValues = {};
                 _.each(uiSchema && uiSchema.fields, function(field){
                     var value = SteedosUI.getFieldDefaultValue(field, api.body.global);
-                    if(value){
+                    if(!_.isNil(value)){
                         defaultValues[field.name] = value;
                     }
                 });