agilebuilder-ui 1.1.13-tmp5 → 1.1.13-tmp7

package/lib/{tab-content-iframe-index-e32d4b3f.js → tab-content-iframe-index-12527a41.js}

@@ -1,5 +1,5 @@
 import { openBlock as r, createElementBlock as t, createCommentVNode as o } from "vue";
-import { _ as s } from "./index-e8b65d1a.js";
+import { _ as s } from "./index-42d5d61b.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-5f743a94.js → tab-content-index-56d7113b.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-e8b65d1a.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-42d5d61b.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-344d409e.js → tache-subprocess-history-b289d758.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-e8b65d1a.js";
+import { _ as I } from "./index-42d5d61b.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-tmp5",
+  "version": "1.1.13-tmp7",
   "type": "module",
   "private": false,
   "main": "./lib/super-ui.js",

package/packages/fs-preview/src/fs-preview.vue

@@ -5,28 +5,9 @@
       {{ label }}
       <el-icon class="annex-cell"><el-icon-view /></el-icon>
     </div>
-
-    <el-dialog
-      :append-to-body="true"
-      :show-close="true"
-      :title="$t('imatrixUIPublicModel.previewImage')"
-      v-model="showPreviewSingleImage"
-      @close="$emit('close')"
-    >
-      <template v-slot:title>
-        <span
-          >{{ $t('imatrixUIPublicModel.previewImage') }}
-          <!-- <i v-if="downloadable" class="el-icon-download" style="padding-left:5px;cursor:pointer;color:#409EFF" @click="downloadFile()" /> -->
-          <!-- <i v-if="deleteable" class="el-icon-delete" style="padding-left:5px;cursor:pointer;color:#F56C6C" @click="deleteFile()" /> -->
-        </span>
-      </template>
-      <el-image
-        v-if="previewImageInfo && previewImageInfo.isImg"
-        :preview-src-list="[previewImageInfo.src]"
-        :src="previewImageInfo.src"
-      />
-    </el-dialog>
+    <el-image-viewer v-if="showPreviewSingleImage" teleported :url-list="[previewImageInfo.src]" @close="showPreviewSingleImage = false" />
     <el-dialog
+      layout-mobile="bottom"
       :append-to-body="true"
       :show-close="true"
       :title="$t('imatrixUIPublicModel.preview')"
@@ -41,22 +22,24 @@
           <!-- <i v-if="deleteable" class="el-icon-delete" style="padding-left:5px;cursor:pointer;color:#F56C6C" @click="deleteFile()" /> -->
         </span>
       </template>
-      <el-table :show-header="false" :data="fileList">
-        <el-table-column prop="showName" width="200" />
-        <el-table-column align="right">
+      <el-table :show-header="false" :data="fileList" max-height="60vh">
+        <el-table-column prop="showName" show-overflow-tooltip />
+        <el-table-column width="80" align="center">
           <template v-slot="scope">
-            <el-tooltip :content="$t('imatrixUIPublicModel.preview')" class="item" effect="dark" placement="top">
-              <el-icon @click="previewSingle(scope.row)" style="cursor: pointer"><el-icon-view /></el-icon>
-            </el-tooltip>
-          </template>
-        </el-table-column>
-        <el-table-column>
-          <template v-slot="scope">
-            <el-tooltip :content="$t('imatrixUIPublicModel.download')" class="item" effect="dark" placement="top">
-              <el-icon v-if="downloadable" @click="donwloadFile(scope.$index, fileList)" style="cursor: pointer"
-                ><el-icon-download
-              /></el-icon>
-            </el-tooltip>
+            <div style="margin: -10px 0;">
+              <el-tooltip :content="$t('imatrixUIPublicModel.preview')" class="item" effect="dark" placement="top">
+                <el-button type="text" @click="previewSingle(scope.row)">
+                  <el-icon style="cursor: pointer"><el-icon-view /></el-icon>
+                </el-button>
+              </el-tooltip>
+              <el-tooltip :content="$t('imatrixUIPublicModel.download')" class="item" effect="dark" placement="top">
+                <el-button type="text" @click="donwloadFile(scope.$index, fileList)">
+                  <el-icon v-if="downloadable" style="cursor: pointer">
+                    <el-icon-download />
+                  </el-icon>
+                </el-button>
+              </el-tooltip>
+            </div>
           </template>
         </el-table-column>
       </el-table>
@@ -65,6 +48,7 @@
 </template>
 
 <script>
+// import { Image } from 'antd';
 import { Paperclip as ElIconPaperclip, View as ElIconView, Download as ElIconDownload } from '@element-plus/icons-vue'
 import * as Vue from 'vue'
 import { isPlateSys, getSystemFrontendUrl } from '../../../src/utils/common-util'
@@ -148,6 +132,7 @@ export default {
     },
     previewSingle(fileInfo) {
       fileInfo = packageFile(fileInfo.showName, fileInfo.serverPath)
+      debugger
       if (isImage(fileInfo.showName)) {
         this.previewImageInfo = fileInfo
         this.showPreviewSingleImage = true
@@ -281,3 +266,6 @@ export default {
   emits: ['close']
 }
 </script>
+
+<style lang="scss" scoped>
+</style>

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

@@ -113,6 +113,17 @@ export default defineComponent({
             }
         });
 
+        // 获取包含所有子表数据 LIST 一般用于勾选
+        const dataChildrenList = computed(() => {
+            const getChildrenData = (data) => {
+                return data?.flatMap(item => {
+                    if (item?.children?.length) return [item, ...getChildrenData(item.children)]
+                    return [item]
+                }) ?? []
+            }
+            return getChildrenData(dataList.value)
+        });
+
         const isLoadPaginationData = computed(() => {
             if (props.isStackingPaginatedData) {
                 return (paginationList.value[props.currentPage - 1]?.length ?? 0) > 0
@@ -195,6 +206,7 @@ export default defineComponent({
 
         // 写入选中
         const setCheckedList = (value) => {
+            debugger;
             if (!isCheck.value) return
             if (checkedList.value.includes(value)) {
                 checkedList.value = checkedList.value.filter(v => v !== value)
@@ -275,8 +287,8 @@ export default defineComponent({
             if (attrs.selection.length === newValue.length) {
                 if (attrs.selection.every(({ $rowDataGuId }) => newValue.includes($rowDataGuId ) )) return
             }
-            const selectData = dataList.value.filter(({ $rowDataGuId }) => newValue?.includes($rowDataGuId))
-            const findData = checkedClickId.value ? dataList.value.find(({ $rowDataGuId }) => checkedClickId.value === $rowDataGuId) : undefined
+            const selectData = dataChildrenList.value.filter(({ $rowDataGuId }) => newValue?.includes($rowDataGuId))
+            const findData = checkedClickId.value ? dataChildrenList.value.find(({ $rowDataGuId }) => checkedClickId.value === $rowDataGuId) : undefined
             // 新增选中
             if (newValue.length > oldValue?.length && findData) {
                 emit('select', selectData, findData)
@@ -367,7 +379,8 @@ export default defineComponent({
                                             isChecked={isChecked}
                                             isSubTable={isSubTable}
                                             isCheck={isCheck.value}
-                                            isShowDetailsMore={isShowDetailsMore.value && !columnFormData.$editing}
+                                            isMore={!columnFormData.$editing}
+                                            isShowDetailsMore={isShowDetailsMore.value}
                                             onChecked={onChecked}
                                             onShowSubTable={() => {
                                                 childrenBreadcrumbData.value =[...childrenBreadcrumbData.value, columnFormData];
@@ -412,7 +425,8 @@ export default defineComponent({
                                     isChecked={isChecked}
                                     isSubTable={isSubTable}
                                     isCheck={isCheck.value}
-                                    isShowDetailsMore={isShowDetailsMore.value && !columnFormData.$editing}
+                                    isMore={!columnFormData.$editing}
+                                    isShowDetailsMore={isShowDetailsMore.value}
                                     onChecked={onChecked}
                                     onShowSubTable={() => {
                                         childrenBreadcrumbData.value =[columnFormData];

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

@@ -71,7 +71,7 @@
         :highlight-current-row="true"
         :span-method="rowSpan"
         :max-height="maxHeight"
-        :height="maxHeight && maxHeight <= tableHeight ? maxHeight : tableHeight"
+        :height="tableHeight"
         :class="tableClass"
         :tree-props="getTreeProps(parentProp, isSql, isLazy, dataSourceType)"
         @sort-change="handleSortChange"
@@ -3315,4 +3315,9 @@ export default {
     padding: 2px 0 !important;
   }
 }
+.el-table ::v-deep {
+  & > .el-table__inner-wrapper {
+    height: 100% !important;
+  }
+}
 </style>

package/src/components/Card/index.jsx

@@ -41,6 +41,11 @@ export default defineComponent({
             type: Boolean,
             default: () => false
         },
+        // 是否收起
+        isMore: {
+            type: Boolean,
+            default: () => true
+        },
         setMaxHeight: {
             type: [Function, undefined],
             default: () => undefined
@@ -84,6 +89,10 @@ export default defineComponent({
             isMore.value = newValue
         });
 
+        watch(() => props.isMore, (newValue) => {
+            isMore.value = newValue
+        });
+
         onMounted(() => {
             const scrollElement = scrollbarRef.value?.$el?.querySelector?.('.el-scrollbar__view');
             if (scrollElement) {

package/src/styles/display-layout.scss

@@ -93,13 +93,22 @@
 .yx-card-main {
   &.is-checked {
     border-color: #409eff;
+    background-color: #ecf5ff;
   }
   &[header-padding] {
     & > .el-card__header {
+      display: flex;
+      flex-direction: column;
+      justify-content: center;
+      align-items: stretch;
       padding: 0 !important;
       overflow: hidden;
       min-height: 50px;
 
+      @media (max-width: 450px) {
+        min-height: 40px;
+      }
+
       & > .yx-flex-wrap {
         gap: 10px;
         height: 100%;
@@ -113,6 +122,7 @@
     }
   }
   .el-card__header {
+
     & > .yx-flex-wrap {
       flex: 1 1 auto;
 
@@ -131,6 +141,7 @@
   }
   .yx-card-body {
     padding: var(--el-card-padding);
+    background-color: var(--el-fill-color-blank);
   }
   @media (max-width: 450px) {
     &[header-padding] {
@@ -208,7 +219,6 @@
   .app-wrapper {
     .tab-main-container {
       & > .app-main {
-        padding: 10px 0;
 
         & > [style*='min-height'] {
           min-height: calc(100vh - 20px) !important;
@@ -261,3 +271,16 @@
       }
   }
 }
+
+.el-dialog {
+  @media (max-width: 768px) {
+    &[layout-mobile='bottom'] {
+      position: absolute;
+      bottom: 0;
+      left: 0;
+      right: 0;
+      width: 100%;
+      margin: 0;
+    }
+  }
+}