agilebuilder-ui 1.1.13-tmp4 → 1.1.13-tmp5

package/lib/{tab-content-iframe-index-728fe039.js → tab-content-iframe-index-e32d4b3f.js}

@@ -1,5 +1,5 @@
 import { openBlock as r, createElementBlock as t, createCommentVNode as o } from "vue";
-import { _ as s } from "./index-1a87600f.js";
+import { _ as s } from "./index-e8b65d1a.js";
 const u = ["src"], f = s({ data: () => ({ src: null }), watch: { $route(n, c) {
   this.src = this.$route.query.src;
 } }, mounted() {

package/lib/{tab-content-index-5481253a.js → tab-content-index-5f743a94.js}

@@ -1,4 +1,4 @@
-import { _ as v, c as $, g as x, b as P, s as h, m as M, M as O, i as I } from "./index-1a87600f.js";
+import { _ as v, c as $, g as x, b as P, s as h, m as M, M as O, i as I } from "./index-e8b65d1a.js";
 import { resolveComponent as m, openBlock as l, createBlock as b, withCtx as g, createVNode as w, TransitionGroup as L, createElementBlock as p, Fragment as T, renderList as C, createElementVNode as u, toDisplayString as y, createCommentVNode as f, normalizeClass as S } from "vue";
 const A = { class: "no-redirect" }, k = v({ name: "Breadcrumb", data: () => ({ levelList: null }), computed: { levelListWithTitle() {
   return this.levelList.filter((e) => e.meta.title !== void 0 && e.meta.title !== null);

package/lib/{tache-subprocess-history-051a2d26.js → tache-subprocess-history-344d409e.js}

@@ -1,5 +1,5 @@
 import { resolveComponent as t, openBlock as a, createElementBlock as s, createElementVNode as y, createVNode as l, withCtx as r, createTextVNode as n, toDisplayString as p, createCommentVNode as c, createBlock as h } from "vue";
-import { _ as I } from "./index-1a87600f.js";
+import { _ as I } from "./index-e8b65d1a.js";
 const g = { style: { "padding-bottom": "10px" } }, k = { key: 0, class: "graphDiv" }, N = I({ name: "TacheSubprocessHistory", data: () => ({ type: "graph", workflowId: null }), created() {
   const o = this.$route.query.workflowId;
   o && (this.workflowId = parseInt(o));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "agilebuilder-ui",
-  "version": "1.1.13-tmp4",
+  "version": "1.1.13-tmp5",
   "type": "module",
   "private": false,
   "main": "./lib/super-ui.js",

package/packages/super-grid/src/apis.js

@@ -21,6 +21,8 @@ import {
 import eventBus from './eventBus'
 import { isPromise } from '../../../src/utils/common-util'
 import { updateWithPageValue } from '../../../src/utils/jump-page-utils'
+import { getGuId } from '../../../src/utils/guid.js';
+
 const apis = {
   // 列表工具栏控件刷新列表数据。添加该方法解决工具栏值清空后，列表内容没有还原问题
   toolbarRefresh(parentRowIds, isLineEdit, toolbarFieldParam, isDeleteSubTableData) {
@@ -133,12 +135,13 @@ const apis = {
   // 新建行
   createRow(listCode, row, options) {
     return new Promise((resolve, reject) => {
+      debugger;
       if (!listCode) {
         listCode = store.get('_list_code')
       }
       const gridParams = store.get(listCode)
       const gridData = gridParams.gridData
-      gridParams.superGrid.clearSort()
+      gridParams.superGrid?.clearSort?.()
       // console.log('创建行记录的条件1', gridParams.lineEdit)
       // console.log('创建行记录的条件2', gridParams.lineEdit.editable)
       // console.log('创建行记录的条件3', gridParams.loaded)
@@ -364,7 +367,10 @@ const apis = {
         }
       }
     }
-    return row
+    return {
+      $rowDataGuId: getGuId(),
+      ...row,
+    }
   },
   // 设置默认值null
   setColumnsDefaultValue(allColumns, row, gridParams, getDefaultValueFunc) {
@@ -1005,7 +1011,7 @@ const apis = {
           }
         }
         if (gridParams.isMulitiSelect) {
-          gridParams.superGrid.clearSelection()
+          gridParams.superGrid?.clearSelection?.()
         }
         gridParams.isCreateRow = false
         if (isRestore === undefined || !isRestore) {
@@ -1382,3 +1388,40 @@ const apis = {
   }
 }
 export default apis
+
+export const apisMixin = {
+  data() {
+    return {
+      toolbarFieldParam: null,
+      showSearch: false,
+      isMobile: false,
+      baseURL: '',
+      currentPage: 1,
+      pageSize: 10,
+      code: '',
+      pageCode: '',
+      jumpPageSetting: null,
+      isShowPageDialog: false,
+      gridData: [],
+      subTableData: [],
+      searchForm: [],
+      options: {},
+      lineEdit: null,
+      loaded: false,
+      configureObj: {},
+      additionalParamMap: {},
+      basicInfo: {},
+      dynamicColumnInfo: {},
+      $dataTypeMap: {},
+      mainDefaultValueColumns: [],
+      dynamicServiceName: '',
+      isHasDynamic: false,
+      isMulitiSelect: false,
+      sql: false,
+      restoreCurrentRowTimer: null
+    };
+  },
+  methods: {
+    ...apis
+  }
+}

package/packages/super-grid/src/components/mobile-table-card.jsx

@@ -5,8 +5,9 @@ import NormalColumnContent from '../normal-column-content.vue';
 import CardView from '../../../../src/components/Card';
 import Scrollbar from '../../../../src/components/Scrollbar';
 import store from '../store';
+import { apisMixin } from '../apis'
 
-import { ArrowLeft, Bottom, Loading, Tickets } from '@element-plus/icons-vue';
+import { ArrowLeft, Bottom, CirclePlus, Loading, Tickets } from '@element-plus/icons-vue';
 // import { $emit, $off, $on } from '@/utils/gogocodeTransfer'
 
 export default defineComponent({
@@ -16,6 +17,7 @@ export default defineComponent({
         CardView,
         Scrollbar
     },
+    mixins: [apisMixin],
     props: {
         // 展示字段限制
         showFieldCount: {
@@ -61,8 +63,9 @@ export default defineComponent({
     setup(props, setupData) {
         const $emits = defineEmits(['currentChange', 'update:current-page', 'select']);
 
-        const { attrs, emit } = setupData
-        console.log('*mobile-table-card.JSX**********************************************=>', props, attrs, setupData)
+        const { attrs, emit, expose } = setupData
+
+        console.log('*mobile-table-card.JSX**********************************************=>', props, attrs, setupData, expose)
 
         // 分页加载状态
         const isPaginationLoading = ref(false)
@@ -92,6 +95,15 @@ export default defineComponent({
 
         setPaginationList(props.data)
 
+        const addColumnBtn = computed(() => {
+            const gridParams = store.get(attrs.listCode)
+            const showOperationButton = gridParams?.options?.showOperationButton ?? false
+            const isFormSubTable = gridParams?.options?.isFormSubTable ?? false
+            const subTableCanAdd = gridParams?.options?.subTableCanAdd ?? false
+            const isOperation = componentDatas.value?.some(({ prop }) => ['operation'].includes(prop))
+            return showOperationButton && isFormSubTable && subTableCanAdd && isOperation
+        })
+
         // 列表数据
         const dataList = computed(() => {
             if (props.isStackingPaginatedData) {
@@ -303,124 +315,135 @@ export default defineComponent({
             }
         }
 
-        return () => (
-            <Scrollbar onScrollToBottom={scrollLoad} set-max-height={data => {
-                if (data?.windowHeight) {
-                    const height = data?.windowHeight - 160
-                    return height > 400 ? height : 400
-                }
-            }}>
-                {(<ElDrawer v-model={isChildrenDrawer.value} modal-class='yx-drawer yx-scrollbar-body' with-header={true} direction="btt" append-to-body size='90vh' v-slots={{
-                        header: () => (<div class="yx-flex-wrap" style={{gap: '10px'}}>
-                            {layoutData.value.header[0] && `${layoutData.value.header[0].label}: `}
-                            <ElBreadcrumb separator-icon={<ArrowRight></ArrowRight>}>
-                                {childrenBreadcrumbData.value.map((columnFormData, i) => {
-                                    const label = columnViewDom(layoutData.value.header[0], columnFormData, undefined, true)
-                                    return (
-                                        <ElBreadcrumbItem>
-                                            {
-                                                childrenBreadcrumbData.value.length - 1 === i ? label : <ElLink onClick={() =>  childrenBreadcrumbData.value = childrenBreadcrumbData.value.slice(0, i + 1)}>{ label }</ElLink>
-                                            }
-                                        </ElBreadcrumbItem>
-                                    )
-                                    
-                                })}
-                            </ElBreadcrumb>
-                        </div>)
-                        }}
-                        onClosed={() => childrenBreadcrumbData.value = []}
-                    >
-                    
-                        <Scrollbar scrollable-main max-height='100%' style={{ 'flex': '1 1 auto'}}>
-                            <div class="yx-flex-wrap" vertical style={{ gap: '15px'}}>
-                                { childrenList.value.map((columnFormData, columnIndex) => {
-                                    // 开启编辑后禁止选中
-                                    const onChecked = () => !columnFormData.$editing && setCheckedList(columnFormData.$rowDataGuId)
-        
-                                    // 是否选中
-                                    const isChecked = checkedList.value.includes(columnFormData.$rowDataGuId)
-        
-                                    // 是否有子表
-                                    const isSubTable = !!((columnFormData?.children?.length ?? 0) > 0)
-
-                                    const clickPropertyData = layoutData.value.content?.find(({ property }) => property) ?? layoutData.value.content[0]
-
-                                    return (<CardView 
-                                        form={columnFormData}
-                                        no={ isIndex ? columnIndex + 1 : undefined}
-                                        isChecked={isChecked}
-                                        isSubTable={isSubTable}
-                                        isCheck={isCheck.value}
-                                        isShowDetailsMore={isShowDetailsMore.value && !columnFormData.$editing}
-                                        onChecked={onChecked}
-                                        onShowSubTable={() => {
-                                            childrenBreadcrumbData.value =[...childrenBreadcrumbData.value, columnFormData];
-                                        }}
-                                        onRowClick={(event) => emit('rowClick', columnFormData, clickPropertyData, event)}
-                                        onRowDblclick={(event) => emit('rowDblclick', columnFormData, clickPropertyData, event)}
-                                        v-slots={{
-                                            titleSlot: layoutData.value.header && layoutData.value.header?.map((columnCol) => columnViewDom(columnCol, columnFormData, columnIndex, true)),
-                                            children: ({ isMore }) => getElDescriptions(layoutData.value.content, columnFormData, columnIndex, !isMore ? undefined : props.showFieldCount),
-                                            footerSlot: isShowFooter.value && (<div class="yx-flex-wrap" wrap style={{gap: '15px'}}>
-                                                {layoutData.value.footer?.map((columnCol) => columnViewDom(columnCol, columnFormData, columnIndex))}
-                                            </div>)
-                                        }}
-                                    />)
-                                }) }
-                            </div>
-                        </Scrollbar>
-                    </ElDrawer>)}
-                    <div
-                        class="yx-flex-wrap"
-                        vertical
-                        style="overflow: auto; gap: 15px;"
-                    >
-                        {dataList.value.length === 0 && <ElEmpty />}
+        const getAddBtn = (Fun) => addColumnBtn.value && <ElButton type="primary" plain icon={<CirclePlus />} onClick={() => Fun?.(attrs.listCode)}>Add</ElButton>
+
+        return {
+            getAddBtn,
+            renderDom: (AddBtn) => (
+                <Scrollbar onScrollToBottom={scrollLoad} set-max-height={data => {
+                    if (data?.windowHeight) {
+                        const height = data?.windowHeight - 160
+                        return height > 400 ? height : 400
+                    }
+                }}>
+                    {(<ElDrawer v-model={isChildrenDrawer.value} modal-class='yx-drawer yx-scrollbar-body' with-header={true} direction="btt" append-to-body size='90vh' v-slots={{
+                            header: () => (<div class="yx-flex-wrap" style={{gap: '10px'}}>
+                                {layoutData.value.header[0] && `${layoutData.value.header[0].label}: `}
+                                <ElBreadcrumb separator-icon={<ArrowRight></ArrowRight>}>
+                                    {childrenBreadcrumbData.value.map((columnFormData, i) => {
+                                        const label = columnViewDom(layoutData.value.header[0], columnFormData, undefined, true)
+                                        return (
+                                            <ElBreadcrumbItem>
+                                                {
+                                                    childrenBreadcrumbData.value.length - 1 === i ? label : <ElLink onClick={() =>  childrenBreadcrumbData.value = childrenBreadcrumbData.value.slice(0, i + 1)}>{ label }</ElLink>
+                                                }
+                                            </ElBreadcrumbItem>
+                                        )
+                                        
+                                    })}
+                                </ElBreadcrumb>
+                            </div>)
+                            }}
+                            onClosed={() => childrenBreadcrumbData.value = []}
+                        >
                         
-                        {dataList.value.map((columnFormData, columnIndex) => {
-
-                            // 开启编辑后禁止选中
-                            const onChecked = () => !columnFormData.$editing && setCheckedList(columnFormData.$rowDataGuId)
-
-                            // 是否选中
-                            const isChecked = checkedList.value.includes(columnFormData.$rowDataGuId)
-
-                            // 是否有子表
-                            const isSubTable = !!(columnFormData?.children?.length ?? false)
-
-                            const clickPropertyData = layoutData.value.content?.find(({ property }) => property) ?? layoutData.value.content[0]
-
-                            return (<CardView 
-                                form={columnFormData}
-                                no={ isIndex ? columnIndex + 1 : undefined}
-                                isChecked={isChecked}
-                                isSubTable={isSubTable}
-                                isCheck={isCheck.value}
-                                isShowDetailsMore={isShowDetailsMore.value && !columnFormData.$editing}
-                                onChecked={onChecked}
-                                onShowSubTable={() => {
-                                    childrenBreadcrumbData.value =[columnFormData];
-                                    isChildrenDrawer.value = true
-                                }}
-                                onRowClick={(event) => emit('rowClick', columnFormData, clickPropertyData, event)}
-                                onRowDblclick={(event) => emit('rowDblclick', columnFormData, clickPropertyData, event)}
-                                v-slots={{
-                                    titleSlot: layoutData.value.header && layoutData.value.header?.map((columnCol) => columnViewDom(columnCol, columnFormData, columnIndex, true)),
-                                    children: ({ isMore }) => getElDescriptions(layoutData.value.content, columnFormData, columnIndex, !isMore ? undefined : props.showFieldCount),
-                                    footerSlot: isShowFooter.value && (<div class="yx-flex-wrap" wrap style={{gap: '15px'}}>
-                                        {layoutData.value.footer?.map((columnCol) => columnViewDom(columnCol, columnFormData, columnIndex))}
-                                    </div>)
-                                }}
-                            />)
-                        })}
-
-                        {
-                            dataList.value.length > 0 && pagesNumber.value > 1 && (<ElDivider>
-                                { (pagesNumber.value > props.currentPage || isPaginationLoading.value) ? (<ElIcon loading-rotate size={25} color="#409eff" style={{ margin: '15px auto' }}><Loading></Loading></ElIcon>) : (pagesNumber.value <= props.currentPage && isLoadPaginationData.value) && 'END' }
-                            </ElDivider>)
-                        }
-                    </div>
-            </Scrollbar>
-        );
+                            <Scrollbar scrollable-main max-height='100%' style={{ 'flex': '1 1 auto'}}>
+                                <div class="yx-flex-wrap" vertical style={{ gap: '15px'}}>
+                                    { childrenList.value.map((columnFormData, columnIndex) => {
+                                        // 开启编辑后禁止选中
+                                        const onChecked = () => !columnFormData.$editing && setCheckedList(columnFormData.$rowDataGuId)
+            
+                                        // 是否选中
+                                        const isChecked = checkedList.value.includes(columnFormData.$rowDataGuId)
+            
+                                        // 是否有子表
+                                        const isSubTable = !!((columnFormData?.children?.length ?? 0) > 0)
+    
+                                        const clickPropertyData = layoutData.value.content?.find(({ property }) => property) ?? layoutData.value.content[0]
+    
+                                        return (<CardView 
+                                            form={columnFormData}
+                                            no={ isIndex ? columnIndex + 1 : undefined}
+                                            isChecked={isChecked}
+                                            isSubTable={isSubTable}
+                                            isCheck={isCheck.value}
+                                            isShowDetailsMore={isShowDetailsMore.value && !columnFormData.$editing}
+                                            onChecked={onChecked}
+                                            onShowSubTable={() => {
+                                                childrenBreadcrumbData.value =[...childrenBreadcrumbData.value, columnFormData];
+                                            }}
+                                            onRowClick={(event) => emit('rowClick', columnFormData, clickPropertyData, event)}
+                                            onRowDblclick={(event) => emit('rowDblclick', columnFormData, clickPropertyData, event)}
+                                            v-slots={{
+                                                titleSlot: layoutData.value.header && layoutData.value.header?.map((columnCol) => columnViewDom(columnCol, columnFormData, columnIndex, true)),
+                                                children: ({ isMore }) => getElDescriptions(layoutData.value.content, columnFormData, columnIndex, !isMore ? undefined : props.showFieldCount),
+                                                footerSlot: isShowFooter.value && (<div class="yx-flex-wrap" wrap style={{gap: '15px'}}>
+                                                    {layoutData.value.footer?.map((columnCol) => columnViewDom(columnCol, columnFormData, columnIndex))}
+                                                </div>)
+                                            }}
+                                        />)
+                                    }) }
+                                </div>
+                            </Scrollbar>
+                        </ElDrawer>)}
+                        <div
+                            class="yx-flex-wrap"
+                            vertical
+                            style="overflow: auto; gap: 15px;"
+                        >
+                            {dataList.value.length === 0 && <ElEmpty>{AddBtn}</ElEmpty>}
+                            
+                            {dataList.value.map((columnFormData, columnIndex) => {
+    
+                                // 开启编辑后禁止选中
+                                const onChecked = () => !columnFormData.$editing && setCheckedList(columnFormData.$rowDataGuId)
+    
+                                // 是否选中
+                                const isChecked = checkedList.value.includes(columnFormData.$rowDataGuId)
+    
+                                // 是否有子表
+                                const isSubTable = !!(columnFormData?.children?.length ?? false)
+    
+                                const clickPropertyData = layoutData.value.content?.find(({ property }) => property) ?? layoutData.value.content[0]
+    
+                                return (<CardView 
+                                    form={columnFormData}
+                                    no={ isIndex ? columnIndex + 1 : undefined}
+                                    isChecked={isChecked}
+                                    isSubTable={isSubTable}
+                                    isCheck={isCheck.value}
+                                    isShowDetailsMore={isShowDetailsMore.value && !columnFormData.$editing}
+                                    onChecked={onChecked}
+                                    onShowSubTable={() => {
+                                        childrenBreadcrumbData.value =[columnFormData];
+                                        isChildrenDrawer.value = true
+                                    }}
+                                    onRowClick={(event) => emit('rowClick', columnFormData, clickPropertyData, event)}
+                                    onRowDblclick={(event) => emit('rowDblclick', columnFormData, clickPropertyData, event)}
+                                    v-slots={{
+                                        titleSlot: layoutData.value.header && layoutData.value.header?.map((columnCol) => columnViewDom(columnCol, columnFormData, columnIndex, true)),
+                                        children: ({ isMore }) => getElDescriptions(layoutData.value.content, columnFormData, columnIndex, !isMore ? undefined : props.showFieldCount),
+                                        footerSlot: isShowFooter.value && (<div class="yx-flex-wrap" wrap style={{gap: '15px'}}>
+                                            {layoutData.value.footer?.map((columnCol) => columnViewDom(columnCol, columnFormData, columnIndex))}
+                                        </div>)
+                                    }}
+                                />)
+                            })}
+    
+                            {dataList.value.length > 0 && AddBtn}
+    
+                            {
+                                dataList.value.length > 0 && pagesNumber.value > 1 && (<ElDivider>
+                                    { (pagesNumber.value > props.currentPage || isPaginationLoading.value) ? (<ElIcon loading-rotate size={25} color="#409eff" style={{ margin: '15px auto' }}><Loading></Loading></ElIcon>) : (pagesNumber.value <= props.currentPage && isLoadPaginationData.value) && 'END' }
+                                </ElDivider>)
+                            }
+                        </div>
+                </Scrollbar>
+            )
+        };
+    },
+    render() {
+        // 为了 能兼容 使用 mixins 参数
+        return this.renderDom(this.getAddBtn(this.createRow))
     }
 });

package/packages/super-grid/src/super-grid.vue

@@ -39,6 +39,7 @@
         v-if="isShowCard"
         :selection="selectionTableData"
         :columns="visibleColumns"
+        :listCode="code"
         :getColumnComponentData="getColumnComponentData"
         :data="tableDatas"
         v-model:current-page="currentPage"
@@ -70,7 +71,7 @@
         :highlight-current-row="true"
         :span-method="rowSpan"
         :max-height="maxHeight"
-        :height="maxHeight && maxHeight >= tableHeight ? maxHeight : tableHeight"
+        :height="maxHeight && maxHeight <= tableHeight ? maxHeight : tableHeight"
         :class="tableClass"
         :tree-props="getTreeProps(parentProp, isSql, isLazy, dataSourceType)"
         @sort-change="handleSortChange"

package/packages/super-grid/src/utils.js

@@ -564,7 +564,7 @@ export function getTableHeight(superGrid, listCode, pageHeight) {
   if (superGrid) {
     rect = superGrid.$el.getBoundingClientRect()
   }
-  const totalHeight = window.innerHeight - rect.y - 110
+  const totalHeight = window.innerHeight - (rect?.y ?? 0) - 110
   console.log('rect=', rect, 'window.innerHeight=', window.innerHeight, 'totalHeight=', totalHeight)
   return totalHeight