agilebuilder-ui 1.1.41-rc1 → 1.1.41-sit2

package/lib/{tab-content-iframe-index-64207b54.js → tab-content-iframe-index-dfd3cabf.js}

@@ -1,5 +1,5 @@
 import { openBlock as r, createElementBlock as t, createCommentVNode as o } from "vue";
-import { _ as s } from "./index-ea84c751.js";
+import { _ as s } from "./index-fd478b0b.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-e42e1938.js → tab-content-index-e9ae2b14.js}

@@ -1,4 +1,4 @@
-import { _ as f, c as _, g as x, b as P, s as h, m as M, M as O, i as I } from "./index-ea84c751.js";
+import { _ as f, c as _, g as x, b as P, s as h, m as M, M as O, i as I } from "./index-fd478b0b.js";
 import { resolveComponent as u, openBlock as l, createBlock as b, withCtx as g, createVNode as v, TransitionGroup as L, createElementBlock as p, Fragment as C, renderList as T, createElementVNode as m, toDisplayString as w, normalizeClass as S, createCommentVNode as y } from "vue";
 const k = { class: "no-redirect" }, A = f({ 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-85f0573c.js → tache-subprocess-history-0578aac9.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-ea84c751.js";
+import { _ as I } from "./index-fd478b0b.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.41-rc1",
+  "version": "1.1.41-sit2",
   "type": "module",
   "private": false,
   "main": "./lib/super-ui.js",

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

@@ -11,25 +11,15 @@
         </span>
       </template>
       <div v-if="firstFileName" ref="toolRef" class="fs-preview-tool">
-        <el-link v-if="enableDelete && !disabled" type="danger" :underline="false" @click="deleteFirst()">
-          {{ $t('fsUpload.delete') }}
-        </el-link>
-        <el-link
-          v-if="!disabled || !fileSetObj.disabledNoPreview"
-          type="primary"
-          :underline="false"
-          @click="previewFirst()"
-        >
-          {{ $t('fsUpload.preview') }}
-        </el-link>
-        <el-link
-          v-if="!disabled || !fileSetObj.disabledNoDownload"
-          type="primary"
-          :underline="false"
-          @click="downloadFirst()"
-        >
-          {{ $t('fsUpload.download') }}
-        </el-link>
+        <el-tooltip v-if="enableDelete && !disabled" :content="$t('fsUpload.delete')">
+          <super-icon @click="deleteFirst()" iconValue="amb-color-icon-shanchu" />
+        </el-tooltip>
+        <el-tooltip v-if="!disabled || !fileSetObj.disabledNoPreview" :content="$t('fsUpload.preview')">
+          <super-icon @click="previewFirst()" iconValue="amb-color-icon-yulan" />
+        </el-tooltip>
+        <el-tooltip v-if="!disabled || !fileSetObj.disabledNoDownload" :content="$t('fsUpload.download')">
+          <super-icon @click="downloadFirst()" iconValue="amb-color-icon-xiazai" />
+        </el-tooltip>
         <el-divider v-if="showMultipleFile" direction="vertical" />
         <el-popover :width="450" trigger="click">
           <template #reference>
@@ -41,7 +31,7 @@
           <div style="max-height: 300px; overflow-y: auto">
             <div v-for="(item, index) in fileList" :ref="item.serverPath" :key="item.serverPath" class="file-item">
               <div style="display: flex; align-items: center; flex: 1">
-                <span>
+                <span class="more-file-icon">
                   <super-icon :iconValue="getFileIconByName(item.showName)" />
                 </span>
                 <span class="amb-list-preivew-name" style="width: 230px; margin-left: 10px">
@@ -49,7 +39,7 @@
                 </span>
               </div>
               <div class="file-actions">
-                <el-link v-if="enableDelete" type="danger" underline @click="deleteFile(item)">
+                <!-- <el-link v-if="enableDelete" type="danger" underline @click="deleteFile(item)">
                   {{ $t('fsUpload.delete') }}
                 </el-link>
                 <el-link
@@ -60,14 +50,18 @@
                 >
                   {{ $t('fsUpload.preview') }}
                 </el-link>
-                <el-link
-                  type="primary"
-                  v-if="!disabled || !fileSetObj.disabledNoDownload"
-                  underline
-                  @click="donwloadFile(index)"
-                >
+                <el-link type="primary" v-if="!disabled || !fileSetObj.disabledNoDownload" underline>
                   {{ $t('fsUpload.download') }}
-                </el-link>
+                </el-link> -->
+                <el-tooltip v-if="enableDelete" :content="$t('fsUpload.delete')">
+                  <super-icon @click="deleteFile(item)" iconValue="amb-color-icon-shanchu" />
+                </el-tooltip>
+                <el-tooltip v-if="!disabled || !fileSetObj.disabledNoPreview" :content="$t('fsUpload.preview')">
+                  <super-icon @click="previewSingle(item)" iconValue="amb-color-icon-yulan" />
+                </el-tooltip>
+                <el-tooltip v-if="!disabled || !fileSetObj.disabledNoDownload" :content="$t('fsUpload.download')">
+                  <super-icon @click="donwloadFile(index)" iconValue="amb-color-icon-xiazai" />
+                </el-tooltip>
               </div>
             </div>
           </div>
@@ -413,10 +407,22 @@ export default {
   min-width: max-content;
   margin-left: auto; /* 添加这行，将工具栏推到右侧 */
 }
-.amb-color-iconfont {
+
+.fs-preview-container :deep(.amb-color-iconfont),
+.more-file-icon :deep(.amb-color-iconfont) {
   width: 30px;
   height: 30px;
 }
+.fs-preview-tool :deep(.amb-color-iconfont),
+.file-actions :deep(.amb-color-iconfont) {
+  font-size: 15px !important; /* 图标实际大小，按需改 */
+  display: inline-block;
+  width: 1em !important; /* 覆盖子组件 .super-icon 的 14px */
+  height: 1em !important;
+  line-height: 1em;
+  cursor: pointer;
+}
+
 .amb-list-preivew-name {
   overflow: hidden;
   text-overflow: ellipsis;
@@ -450,4 +456,7 @@ export default {
   gap: 5px;
   flex-shrink: 0; /* 防止按钮被压缩 */
 }
+.super-icon + .super-icon {
+  margin-left: 5px;
+}
 </style>

package/packages/super-grid/src/custom-formatter.js

@@ -212,7 +212,7 @@ const customFormatter = {
       // console.log('getHyperLinkSetting--resut=', result)
       if (result && result.label && result.label !== '') {
         console.log('label存在')
-      } else if(result && (result.displayTextJudge === undefined || result.displayTextJudge)){
+      } else if (result && (result.displayTextJudge === undefined || result.displayTextJudge)) {
         result.label = this.objectPropValueTwo(row, column)
       }
       if (result && result.title && result.title !== '') {
@@ -249,14 +249,8 @@ const customFormatter = {
       // 解析是否需要显示该超链接
       let canClick = true
       const gridParams = store.get(listCode)
-      console.log('super-grid---jumpPageLink--jumpPageSetting=', jumpPageSetting)
       if (jumpPageSetting.beforeClick) {
         const funName = jumpPageSetting.beforeClick
-        console.log('super-grid---jumpPageLink--jumpPageSetting.beforeClick=', funName)
-        console.log(
-          'super-grid---jumpPageLink--gridParams.options[eventCallBack]=',
-          gridParams.options['eventCallBack']
-        )
         if (
           gridParams.options &&
           gridParams.options['eventCallBack'] &&
@@ -287,11 +281,23 @@ const customFormatter = {
     if (gridParams.options.extraParam && gridParams.options.extraParam.entityMap) {
       parentFormData = gridParams.options.extraParam.entityMap
     }
-    console.log('gridParams.options.extraParam.entityMap', gridParams.options.extraParam)
-
+    if (gridParams.isSubTableShowPage && jumpPageSetting.jumpPageAdditional?.length > 0) {
+      // 如果是子表，则需要把配置的 ${data.字段} 改成 ${parent.字段}
+      jumpPageSetting.jumpPageAdditional.forEach((item, index) => {
+        if (item && item.paramValue) {
+          if (item.paramValue.startsWith('${data.')) {
+            item.paramValue = item.paramValue.replace('${data.', '${parent.')
+          }
+        }
+      })
+    }
     /// 把父页面的pageData传给弹出的页面或新页签
     const copyPageData = JSON.parse(
-      JSON.stringify(gridParams.pageContext && gridParams.pageContext.entity && gridParams.pageContext.entity.page ? gridParams.pageContext.entity.page : {})
+      JSON.stringify(
+        gridParams.pageContext && gridParams.pageContext.entity && gridParams.pageContext.entity.page
+          ? gridParams.pageContext.entity.page
+          : {}
+      )
     )
     jumpPageSetting._pageData = copyPageData
     jumpToPage(

package/packages/super-grid/src/normal-column-content.vue

@@ -107,6 +107,7 @@
             :is-show="operation.isShow"
             :label="operation.props.label ? operation.props.label : row[column.prop]"
             :on-click="operation.onClick"
+            :operation="operation"
             :operation-index="operationIndex"
             :operation-setting="operation.props"
             :event-name="operation.eventName"

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

@@ -1,10 +1,10 @@
 <template>
   <!--将@click改为@mousedown.native是因为操作列保存按钮时事件和input等组件的@blur冲突，导致保存需要保存两次，因为
       @blur先于@click执行的，所以只会执行@blur，@click就失效了，@mousedown是先于@blur执行的-->
-  <span :style="myStyle">
+  <span class="table-operation-row-btn" :style="myStyle">
     <template v-if="isShowButton()">
       <el-tooltip :disabled="tooltipDisabled" :content="label" placement="top">
-        <template v-if="operationSettingData.permission">
+        <template v-if="operationSettingData?.permission">
           <component
             v-bind="operationSettingData"
             :is="isElementType"
@@ -77,9 +77,13 @@ export default {
       type: String,
       default: null,
     },
+    operation: {
+      type: Object,
+      default: () => ({}),
+    },
     operationSetting: {
       type: Object,
-      default: null,
+      default: () => ({}),
     },
     operationIndex: {
       type: Number,
@@ -148,16 +152,16 @@ export default {
     },
     // 后置图标
     suffixIcon() {
-      if(['right'].includes(this.operationSettingData.iconPosition)) return this.operationSetting.iconValue
+      if(['right'].includes(this.operationSetting.iconPosition)) return this.operationSetting.iconValue
       return undefined
     },
     // 是否显示文字按钮 > 图标模式
     isTextIcon() {
       if (this.isTableBtnLinkShow) {
-        if (this.operationSettingData.isTextIcon === undefined) {
+        if (this.operationSetting.isTextIcon === undefined) {
           return this.isSaveRow || this.isDeleteRow || this.isEditRow || this.isRestoreRow
         }
-        return this.operationSettingData.isTextIcon
+        return this.operationSetting.isTextIcon
       } else {
         return false
       }
@@ -172,14 +176,14 @@ export default {
     },
     // 是否自动开启表格 按钮 转 文字按钮
     isTableBtnLinkShow() {
-      if (this.operationSetting.text) return true
+      if (this.operationSetting?.text) return true
       if (this.isTableBtnLink && this.elementType === 'el-button') {
-        return [this.operationSetting.text, this.operationSetting.plain, this.operationSetting.round].every(v => v === undefined)
+        return [this.operationSetting?.text, this.operationSetting?.plain, this.operationSetting?.round].every(v => v === undefined)
       }
       return false
     },
     operationSettingData() {
-      const dataList = { ...this.operationSetting }
+      const dataList = { ...(this.operationSetting ?? {}) }
       if (this.isTableBtnLinkShow) {
         dataList.underline = false
         delete dataList.text

package/packages/super-grid/src/search-form-item.vue

@@ -169,7 +169,6 @@
         :options="getDynamicDataSourceOptions(column)"
         :table-name="tableName"
         @change="multiselectChange"
-        @input="setValueToModelProp(column.prop, $event)"
       />
     </template>
     <!--
@@ -217,11 +216,8 @@
       @blur="hiddenEmpty()"
     >
       <template #suffix>
-        <el-tooltip
-          :content="$t('superGrid.searchEmpty')"
-          placement="bottom"
-        >
-          <el-checkbox v-if="isShowEmtpty" v-model="checkedEmpty" @change="checkEmptyChange"/>
+        <el-tooltip :content="$t('superGrid.searchEmpty')" placement="bottom">
+          <el-checkbox v-if="isShowEmtpty" v-model="checkedEmpty" @change="checkEmptyChange" />
         </el-tooltip>
       </template>
     </el-input>
@@ -293,7 +289,7 @@ export default {
       moduleConfig: {},
       dateVal: this.getFormItemValue(this.column.prop),
       controlConfig: getControlConfig(this.column),
-      isShowEmtptyFlag: false,
+      isShowEmtptyFlag: false
       // checkedEmpty: false,
     }
   },
@@ -308,12 +304,12 @@ export default {
     isShowEmtpty() {
       return this.isShowEmtptyFlag
     },
-    checkedEmpty(){
-      if(this.column._emptyValue  && this.column._emptyValue === '#blank#'){
+    checkedEmpty() {
+      if (this.column._emptyValue && this.column._emptyValue === '#blank#') {
         return true
       }
-      if(this.column._resetValue || this.column._resetValue === undefined){
-        if(this.column._resetValue){
+      if (this.column._resetValue || this.column._resetValue === undefined) {
+        if (this.column._resetValue) {
           this.column._resetValue = undefined
           this.isShowEmtptyFlag = false
         }
@@ -350,9 +346,7 @@ export default {
       return isDynamicDataSourceSource(column)
     },
     setValueToModelProp(prop, value, componentName, index) {
-      console.log(
-        '%c描述-105004',
-        'color:#2E3435;background:#F8BB07;padding:3px;border-radius:2px',
+      console.log('setValueToModelProp',
         prop,
         value,
         componentName,
@@ -503,31 +497,37 @@ export default {
           return ['00:00:00']
         }
       } else {
-        return ['00:00:00']
+        const now = new Date();
+        const year = now.getFullYear(); // e.g., 2023
+        const month = now.getMonth() + 1; // Months are 0-indexed, so add 1
+        const day = now.getDate(); // Day of the month        
+        return [`${year}-${month}-${day} 00:00:00`, `${year}-${month}-${day} 23:59:59`]
       }
     },
     multiselectChange(arr, selectedItem) {
-      if (arr.indexOf('saveAll') !== -1) {
+      debugger
+      if (arr && arr.indexOf('saveAll') !== -1) {
         if (this.searchForm[this.column.prop] && typeof this.searchForm[this.column.prop] === 'string') {
           this.searchForm[this.column.prop] = this.searchForm[this.column.prop].split(',')
         }
       } else {
+        debugger
         this.searchForm[this.column.prop] = arr
       }
     },
-    showEmpty(){
+    showEmpty() {
       this.isShowEmtptyFlag = true
     },
-    hiddenEmpty(){
-      if(!this.checkedEmpty){
+    hiddenEmpty() {
+      if (!this.checkedEmpty) {
         this.isShowEmtptyFlag = false
       }
     },
     checkEmptyChange(newValue) {
-      if(newValue){
-        this.column._emptyValue='#blank#'
+      if (newValue) {
+        this.column._emptyValue = '#blank#'
       } else {
-        this.column._emptyValue=undefined
+        this.column._emptyValue = undefined
       }
     }
   },