@steedos-widgets/amis-lib 1.3.17 → 1.3.19

package/dist/index.cjs.js

@@ -2013,9 +2013,9 @@ function getFieldWidth(width){
     const defaultWidth = "unset";//用于使table内的td标签下生成div，实现将快速编辑按钮固定在右侧的效果，并不是为了unset效果
     if(typeof width == 'string'){
         if(isNaN(width)){
-            return width;
+            return width || defaultWidth;
         }else {
-            return Number(width);
+            return Number(width) || defaultWidth;
         }
     }else if(typeof width == 'number'){
         return width;
@@ -2116,6 +2116,7 @@ async function getTableColumns(fields, options){
                 width: getFieldWidth(field.width),
                 toggled: field.toggled,
                 className,
+                inputClassName: "inline",
                 static: true,
             }, field.amis, {name: field.name});
         }
@@ -2153,6 +2154,7 @@ async function getTableColumns(fields, options){
                     tpl: tpl,
                     toggled: field.toggled,
                     className,
+                    inputClassName: "inline",
                     static: true,
                     options: field.type === 'html' ? {html: true} : null
                     // toggled: true 
@@ -2174,8 +2176,8 @@ async function getTableColumns(fields, options){
         const href = Router.getObjectDetailPath({
             ...options,  formFactor: options.formFactor, appId: "${appId}", objectName: options.objectName || "${objectName}", recordId: `\${${options.idFieldName}}`
         });
-        columns[0].type = "tpl";
-        columns[0].tpl = `<a href="${href}">\${${columns[0].name}}</a>`;
+        columns[1].type = "tpl";
+        columns[1].tpl = `<a href="${href}">\${${columns[1].name}}</a>`;
     }
     return columns;
 }
@@ -2871,7 +2873,25 @@ async function getTableApi(mainObject, fields, options){
     if(enable_tree){
         const records = payload.data.rows || [];
         const getTreeOptions = SteedosUI.getTreeOptions
-        payload.data.rows = getTreeOptions(records,{"valueField":"_id"});
+        let isTreeOptionsComputed = false;
+        if(records.length === 1 && records[0].children){
+            isTreeOptionsComputed = true;
+        }
+        if(!isTreeOptionsComputed){
+            // 如果api接口设置在缓存，缓存期间并不会重新请求接口，payload.data.rows是上次计算后的结果
+            payload.data.rows = getTreeOptions(records,{"valueField":"_id"});
+        }
+        try{
+            setTimeout(() => {
+                let expandBtn = $('.steedos-object-listview-content .antd-Table-content .antd-Table-table thead .antd-Table-expandBtn');
+                if(expandBtn && expandBtn.length > 0 && !expandBtn.hasClass("is-active")){
+                    expandBtn[0].click();
+                }
+            }, 600);
+        }
+        catch(ex){
+            console.error("tree数据格式展开异常：", ex);
+        }
     }
 
 
@@ -6178,12 +6198,13 @@ async function getObjectFieldsFilterBarSchema(objectSchema, ctx) {
  */
 function getObjectListHeaderFirstLine(objectSchema, listViewName, ctx) {
   const { icon, label } = objectSchema;
+  const disabled_list_views = objectSchema.permissions.disabled_list_views;
   const listViewButtonOptions = [];
   _$1.each(
     objectSchema.list_views,
     (listView, name) => {
-      if(name === "lookup"){
-        // 内置lookup为弹出选择专用视图，不显示在列表切换区域
+      if(name === "lookup" || (disabled_list_views && disabled_list_views.indexOf(listView._id)>-1)){
+        // 内置lookup为弹出选择专用视图，根据用户权限被禁用的视图，不显示在列表切换区域
         return;
       }
       listViewButtonOptions.push({
@@ -6735,78 +6756,97 @@ function fields$1(){
 
 function fieldsExtend$4(){
   return {
+    "group": "",
     "label": {
       "is_wide": true
     },
     "name": {
+      "group": "",
       "amis": {
         "hidden": true,
         "required": false
       }
     },
     "object_name": {
+      "group": "",
       "amis": {
         "hidden": true
       }
     },
     "filter_scope": {
+      "group": "",
       "amis": {
         "hidden": true,
         "required": false
       }
     },
     "columns": {
+      "group": "",
       "amis": {
         "hidden": true,
         "required": false
       }
     },
     "mobile_columns":{
+      "group": "",
       "amis": {
         "hidden": true,
         "required": false
       }
     },
     "searchable_fields":{
+      "group": "",
       "amis": {
         "hidden": true,
         "required": false
       }
     },
     "filter_fields": {
+      "group": "",
       "amis": {
         "hidden": true,
         "required": false
       }
     },
     "scrolling_mode": {
+      "group": "",
       "amis": {
         "hidden": true,
         "required": false
       }
     },
     "sort": {
+      "group": "",
       "amis": {
         "hidden": true,
         "required": false
       }
     },
     "show_count": {
+      "group": "",
       "amis": {
         "hidden": true,
         "required": false
       }
     },
     "type": {
+      "group": "",
       "amis": {
         "hidden": true,
         "required": false
       }
     },
     "shared": {
+      "group": "",
       "amis": {
         "visibleOn": "${global.user.is_space_admin}"
       }
+    },
+    "filters": {
+      "group": "",
+      "amis": {
+        "hidden": true
+      }
     }
   }
 }
@@ -6953,6 +6993,12 @@ function fieldsExtend$3(){
       "amis": {
         "visibleOn": "${global.user.is_space_admin}"
       }
+    },
+    "filters": {
+      "group": "",
+      "amis": {
+        "hidden": true
+      }
     }
   }
 }
@@ -7291,7 +7337,6 @@ function fieldsExtend$1(){
       }
     },
     "mobile_columns": {
-      "group": i18next__default["default"].t('frontend_listview_control_columns_mobile_group'),
       "amis": {
         "type": "transfer",
         "sortable": true,
@@ -8243,7 +8288,15 @@ async function getObjectCRUD(objectSchema, fields, options){
         hiddenOn: options.tableHiddenOn,
         autoFillHeight,
         className: `flex-auto ${crudClassName || ""}`,
-        bodyClassName: "bg-white",
+        // 这里不可以用动态className，因为它会把样式类加到.antd-Crud和.antd-Table.antd-Crud-body这两层div中，而子表列表中crudClassName中有hidden样式类会造成所有子表都不显示的bug
+        // className: {
+        //   [`flex-auto ${crudClassName || ""}`]: "true",
+        //   "is-steedos-crud-data-empty": "${!items || COUNT(items) == 0}"
+        // },
+        bodyClassName: {
+          "bg-white": "true",
+          "is-steedos-crud-data-empty": "${!items || COUNT(items) == 0}"
+        },
         crudClassName: crudClassName,
         quickSaveApi: {
           url: `\${context.rootUrl}/graphql`,
@@ -10134,8 +10187,6 @@ async function lookupToAmisTreeSelect(field, readonly, ctx) {
     return amisSchema;
 }
 
-const keywordsSearchBoxName = `__keywords_lookup`;
-
 const getReferenceToFieldSchema = (field, refObjectConfig)=>{
     let referenceTo = field.reference_to;
     if(!referenceTo){
@@ -10394,7 +10445,10 @@ async function lookupToAmisPicker(field, readonly, ctx){
     
     source.data.$term = "$term";
     source.data.$self = "$$";
-    
+
+    // field.name可能是带点的名称，比如审批王中子表字段'instances.instances_submitter'，如果不替换掉点，会造成审批王表单中新建子表行时报错
+    let keywordsSearchBoxName = `__keywords_lookup__${field.name.replace(/\./g, "_")}__to__${refObjectConfig.name}`;
+
     source.requestAdaptor = `
         let __changedFilterFormValues = api.data.$self.__changedFilterFormValues || {};
         let __changedSearchBoxValues = api.data.$self.__changedSearchBoxValues || {};
@@ -10537,6 +10591,14 @@ async function lookupToAmisPicker(field, readonly, ctx){
             }
         });
         payload.data.rows = treeRecords;
+        try{
+            setTimeout(() => {
+                $('.amis-dialog-widget.antd-Modal .antd-Table-content .antd-Table-table thead .antd-Table-expandBtn')[0]?.click();
+            }, 600);
+        }
+        catch(ex){
+            console.error("tree数据格式展开异常：", ex);
+        }
     }
     return payload;
     `;
@@ -10709,6 +10771,7 @@ async function lookupToAmisPicker(field, readonly, ctx){
 
 async function lookupToAmisSelect(field, readonly, ctx){
     let referenceTo = await getReferenceTo(field);
+    const isMobile = window.innerWidth <= 768;
     const valueFieldKey = referenceTo && referenceTo.valueField?.name || '_id' ;
     // const labelFieldKey = referenceTo && referenceTo.labelField?.name || 'name';
 
@@ -10889,7 +10952,11 @@ async function lookupToAmisSelect(field, readonly, ctx){
         </span>
         <span class='pl-1.5'>\${label}</span>
     </span>`;
-    data.menuTpl = "${icon ? `"+select_menuTpl+"` : label}";
+    const menuTpl = "${icon ? `"+select_menuTpl+"` : label}";
+    // TODO: 待amis修复了此bug， 就可以撤销添加menuTpl的判断。
+    if(!(isMobile && field.multiple)){
+        data.menuTpl = menuTpl;
+    }
     if(field.multiple){
         data.multiple = true;
         data.extractValue = true;
@@ -11397,6 +11464,8 @@ function getSelectFieldOptions(field){
 }
 
 async function convertSFieldToAmisField(field, readonly, ctx) {
+    // console.log('convertSFieldToAmisField====>', field, readonly, ctx)
+    const isMobile = window.innerWidth <= 768;
     // 创建人和修改人、创建时间和修改时间不显示
     if(___namespace.includes(OMIT_FIELDS, field.name) && ctx.showSystemFields != true){
         return;
@@ -11459,7 +11528,11 @@ async function convertSFieldToAmisField(field, readonly, ctx) {
                     </span>
                     <span class='pl-1.5'>\${label}</span>
                 </span>`;
-                convertData.menuTpl = "${icon ? `"+select_menuTpl+"` : label}";
+                const menuTpl = "${icon ? `"+select_menuTpl+"` : label}";
+                // TODO: 待amis修复了此bug， 就可以撤销添加menuTpl的判断。
+                if(!(isMobile && field.multiple)){
+                    convertData.menuTpl = menuTpl;
+                }
                 if(field.multiple){
                     convertData.multiple = true;
                     convertData.extractValue = true;
@@ -12320,7 +12393,7 @@ async function getFormBody(permissionFields, formFields, ctx){
  * @Author: 殷亮辉 yinlianghui@hotoa.com
  * @Date: 2023-11-15 09:50:22
  * @LastEditors: 殷亮辉 yinlianghui@hotoa.com
- * @LastEditTime: 2023-11-29 17:48:02
+ * @LastEditTime: 2023-12-04 17:36:50
  */
 
 /**
@@ -12650,11 +12723,20 @@ const getAmisInputTableSchema = async (props, readonly) => {
         ],
         "className": props.className
     };
+    let footerToolbar = _$1.clone(props.footerToolbar || []); //这里不clone的话，会造成死循环，应该是因为props属性变更会让组件重新渲染
     if (props.addable) {
         let buttonNewSchema = await getButtonNew(props);
-        schema.body.push(buttonNewSchema);
+        footerToolbar.unshift(buttonNewSchema);
+    }
+    if (footerToolbar.length) {
+        schema.body.push({
+            "type": "wrapper",
+            "size": "none",
+            "body": footerToolbar
+        });
     }
     if (props.amis) {
+        delete props.amis.id;
         Object.assign(schema.body[0], props.amis);
     }
     return schema;