agilebuilder-ui 1.1.27 → 1.1.29

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

@@ -76,6 +76,7 @@ import FsPreview from '../../fs-preview'
 import RichEditorViewer from '../../rich-editor/viewer.vue'
 import GridIcon from './components/grid-icon.vue'
 import NormalColumnContent from './normal-column-content.vue'
+import eventBus from './eventBus'
 export default {
   components: {
     DynamicInput,
@@ -189,17 +190,8 @@ export default {
       }
     },
     fixed() {
-      if (
-        (this.column.fixed && this.column.fixed === 'false') ||
-        this.column.fixed === undefined ||
-        this.column.fixed === ''
-      ) {
-        return false
-      }
-      if (this.column.prop === 'operation' && this.column.fixed && this.column.fixed === 'left') {
-        // 操作列居右固定
-        return 'right'
-      }
+      if (!this.column.fixed) return false
+      if (['null', 'false', 'undefined'].includes(this.column.fixed)) return false
       return this.column.fixed
     },
     sortable() {
@@ -297,8 +289,17 @@ export default {
       gridParams.options &&
       gridParams.options.showOperationButton
   },
-  mounted() {},
-  unmounted() {},
+  mounted() {
+    if(this.column.prop === 'operation'){
+      const that = this
+      eventBus.$on('change-add-state',(value)=>{
+        that.isShowAdd = value
+      })
+    }
+  },
+  unmounted() {
+    eventBus.$off('change-add-state')
+  },
   methods: {
     ...customFormatter,
     ...apis,

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

@@ -4,41 +4,39 @@
   <span :style="myStyle">
     <template v-if="isShowButton()">
       <template v-if="label">
-        <!-- <el-tooltip :content="label" class="item" effect="dark" placement="top-start"> -->
-        <component
-          v-bind="operationSetting"
-          :is="elementType"
-          v-if="operationSetting.permission"
-          v-permission="operationSetting.permission"
-          :disabled="preventReclick"
-          @mousedown="onClickFun(operationSetting)"
-          >{{ label }}</component
-        >
-        <component
-          v-bind="operationSetting"
-          :is="elementType"
-          v-else
-          :disabled="preventReclick"
-          @mousedown="onClickFun(operationSetting)"
-          >{{ label }}</component
-        >
-        <!-- </el-tooltip> -->
+        <template v-if="operationSettingData.permission">
+          <component
+            v-bind="operationSettingData"
+            :is="isElementType"
+            v-permission="operationSettingData.permission"
+            :disabled="preventReclick"
+            @mousedown="onClickFun(operationSettingData)"
+            >{{ label }}</component>
+        </template>
+        <template v-else>
+          <component
+            v-bind="operationSettingData"
+            :is="isElementType"
+            :disabled="preventReclick"
+            @mousedown="onClickFun(operationSettingData)"
+            >{{ label }}</component>
+        </template>
       </template>
       <template v-else>
         <component
-          v-bind="operationSetting"
-          :is="elementType"
-          v-if="operationSetting.permission"
-          v-permission="operationSetting.permission"
+          v-bind="operationSettingData"
+          :is="isElementType"
+          v-if="operationSettingData.permission"
+          v-permission="operationSettingData.permission"
           :disabled="preventReclick"
-          @mousedown="onClickFun(operationSetting)"
+          @mousedown="onClickFun(operationSettingData)"
         />
         <component
-          v-bind="operationSetting"
-          :is="elementType"
+          v-bind="operationSettingData"
+          :is="isElementType"
           v-else
           :disabled="preventReclick"
-          @mousedown="onClickFun(operationSetting)"
+          @mousedown="onClickFun(operationSettingData)"
         />
       </template>
     </template>
@@ -58,6 +56,10 @@ export default {
       type: Boolean,
       default: false,
     },
+    isTableBtnLink: {
+      type: [Boolean],
+      default: false,
+    },
     isShow: {
       type: [Boolean, Function],
       default: true,
@@ -107,6 +109,26 @@ export default {
   },
   computed: {
     ...mapGetters(['preventReclick']),
+    // 是否自动开启表格 按钮 转 文字按钮
+    isTableBtnLinkShow() {
+      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 false
+    },
+    operationSettingData() {
+      const dataList = { ...this.operationSetting }
+      if (this.isTableBtnLinkShow) {
+        dataList.underline = false
+        delete dataList.text
+      }
+      return dataList
+    },
+    isElementType() {
+      if (this.isTableBtnLinkShow) return 'el-link'
+      return this.elementType
+    }
   },
   created() {
     if (

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

@@ -27,18 +27,8 @@ export default {
   },
   computed: {
     fixed() {
-      if (
-        this.column.fixed === undefined ||
-        this.column.fixed === null ||
-        this.column.fixed === '' ||
-        this.column.fixed === 'false'
-      ) {
-        return false
-      }
-      // 左右都固定会导致列表显示速度慢，暂只支持左侧固定
-      if (this.column.fixed && this.column.fixed === 'right') {
-        return 'left'
-      }
+      if (!this.column.fixed) return false
+      if (['null', 'false', 'undefined'].includes(this.column.fixed)) return false
       return this.column.fixed
     },
   },

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

@@ -1,5 +1,5 @@
 <template>
-  <div data-v="1.0.0" class="super-grid-main-view" :style="subTableStyle" @click="onClickTableMain">
+  <div v-resize="onResize" data-v="1.0.0" class="super-grid-main-view" :style="subTableStyle" @click="onClickTableMain">
     <search-form
       v-if="!isFormSubTable && hasLoadedColumns && query && query.showType === 'embedded'"
       v-show="!isMobile || (isMobile && isShowMobileSearch)"
@@ -305,7 +305,12 @@ export default {
     additionalParamMap: {
       type: Object,
       default: null
-    }
+    },
+    // 手动控制高度偏移
+    manualHeightOffset: {
+      type: [undefined, Number],
+      default: undefined
+    },
   },
   data() {
     let parentProp
@@ -453,15 +458,19 @@ export default {
     }
   },
   computed: {
+    // 高度偏移
+    heightOffset() {
+      return Number(this.manualHeightOffset ?? this.options?.configureObj?.props?.size?.pc?.heightOffset ?? 33)
+    },
     // 限制高度最低值
     hasMaxHeight() {
       if (this.maxHeight) {
-        return this.maxHeight <= 100 ? 100 : this.maxHeight ?? undefined
+        return this.maxHeight <= 100 ? 100 : this.maxHeight + this.heightOffset ?? undefined
       }
       return undefined
     },
 
-    // 是指固钉高度最低值
+    // 是指固定高度最低值
     hasTableHeight() {
       if (this.tableHeight) {
         return this.tableHeight <= 100 ? 100 : this.tableHeight ?? undefined
@@ -473,7 +482,7 @@ export default {
     },
     // 是否显示卡片
     isShowCard() {
-      return this.isShowAutoCard && this.isMobileListCard && !this.options.isAdministerListView
+      return this.isShowAutoCard && this.isMobileListCard && !this.options.isAdministerListView && (this.options?.configureObj?.props?.base?.isMobileCard ?? true)
     },
     visibleColumns() {
       const gridParams = store.get(this.code)
@@ -800,7 +809,7 @@ export default {
             }
           )
         }
-
+        window.addEventListener('resize', this.resizeTableHeight);
         this.$watch(
           'hasLoadData',
           function (newVal, oldVal) {
@@ -899,11 +908,17 @@ export default {
       )
     })
   },
+  beforeDestroy() {
+    window.removeEventListener('resize', this.resizeTableHeight);
+  },
   methods: {
     ...events,
     ...publicMethods,
     ...superGridService,
     ...apis,
+		onResize(entry) {
+      this.resizeTableHeight()
+		},
     onClickMain() {
       // 清理编辑选中
       storeVuex?.dispatch?.('clearAllEditing')
@@ -3270,6 +3285,7 @@ export default {
             'options': this.options,
             'current-page': this.currentPage,
             'pagination': this.pagination,
+            'is-data-children': this.tableDatas.some(d => Array.isArray(d?.children)),
             'grid-data': this.isSubTableShowPage ? this.subTableData : this.gridData,
             'page-grid-data': this.isSubTableShowPage ? this.getSubTableGridData(this.subTableData) : this.gridData,
             ...(myCustomFormatter ? {
@@ -3296,6 +3312,9 @@ export default {
           column
         }
       }
+    },
+    changeOperationAddState(state){
+      eventBus.$emit('change-add-state', state)
     }
   },
   emits: [
@@ -3309,7 +3328,8 @@ export default {
     'un-edit',
     'refresMainTableFields',
     'refresh',
-    'cancel-search'
+    'cancel-search',
+    'changeOperationAddState'
   ]
 }
 </script>

package/packages/workflow-history-list/src/workflow-history-list.vue

@@ -1,177 +1,112 @@
 <template>
   <el-table
-		  v-if="loaded"
-		  ref="historyList"
-		  :data="histories"
-		  :height="tableHeight"
-		  :load="getChildren"
-		  :max-height="tableMaxHeight"
-		  :tree-props="{ children: 'children', hasChildren: 'hasChildren' }"
-		  border
-		  element-loading-text="Loading"
-		  fit
-		  highlight-current-row
-		  lazy
-		  row-key="uuid"
-		  style="width: 100%"
+    v-if="loaded"
+    ref="historyList"
+    :data="histories"
+    :height="tableHeight"
+    :load="getChildren"
+    :max-height="tableMaxHeight"
+    :tree-props="{ children: 'children', hasChildren: 'hasChildren' }"
+    border
+    element-loading-text="Loading"
+    fit
+    highlight-current-row
+    lazy
+    row-key="uuid"
+    style="width: 100%"
   >
-	  <el-table-column
-			  :label="$t('workflowHistoryList.index')"
-			  align="left"
-			  width="80px"
-	  >
-		  <template v-slot="scope">
-			  {{ scope.$index + 1 }}
-		  </template>
-	  </el-table-column>
-	  <el-table-column
-			  :label="$t('workflowHistoryList.taskName')"
-			  align="left"
-			  width="250"
-	  >
-		  <template v-slot="scope">
-        <span
-		        v-if="
-            scope.row.historyType && scope.row.historyType === 'PROCESS_START'
-          "
-          >{{ $t('workflowHistoryList.processStart') }}</span
-        >
-        <span
-          v-else-if="
-            scope.row.historyType && scope.row.historyType === 'PROCESS_END'
-          "
-          >{{ $t('workflowHistoryList.processEnd') }}</span
-        >
-        <span v-else-if="scope.row.current" style="color: #e6a23c">{{
-          i18nTaskName(scope.row)
+    <el-table-column :label="$t('workflowHistoryList.index')" align="left" width="80px">
+      <template v-slot="scope">
+        {{ scope.$index + 1 }}
+      </template>
+    </el-table-column>
+    <el-table-column :label="$t('workflowHistoryList.taskName')" align="left" width="250">
+      <template v-slot="scope">
+        <span v-if="scope.row.historyType && scope.row.historyType === 'PROCESS_START'">{{
+          $t('workflowHistoryList.processStart')
         }}</span>
-        <span v-else-if="!scope.row.special">{{
-          i18nTaskName(scope.row)
+        <span v-else-if="scope.row.historyType && scope.row.historyType === 'PROCESS_END'">{{
+          $t('workflowHistoryList.processEnd')
         }}</span>
+        <span v-else-if="scope.row.current" style="color: #e6a23c">{{ i18nTaskName(scope.row) }}</span>
+        <span v-else-if="!scope.row.special">{{ i18nTaskName(scope.row) }}</span>
         <span v-else-if="scope.row.special === true" style="color: red">{{
-          i18nTaskName(scope.row) +
-          '[' +
-          $t('workflowHistoryList.specailText') +
-          ']'
+          i18nTaskName(scope.row) + '[' + $t('workflowHistoryList.specailText') + ']'
         }}</span>
       </template>
     </el-table-column>
-    <el-table-column
-      :label="$t('workflowHistoryList.operator')"
-      align="left"
-      width="250"
-    >
+    <el-table-column :label="$t('workflowHistoryList.operator')" align="left" width="250">
       <template v-slot="scope">
-        <span
-          v-if="
-            scope.row.historyType && scope.row.historyType === 'PROCESS_END'
-          "
-        />
+        <span v-if="scope.row.historyType && scope.row.historyType === 'PROCESS_END'" />
         <span v-else>{{ scope.row.creatorName }}</span>
       </template>
     </el-table-column>
-    <el-table-column
-      :label="$t('workflowHistoryList.operatorLg')"
-      align="left"
-      width="250"
-    >
+    <el-table-column :label="$t('workflowHistoryList.operatorLg')" align="left" width="250">
       <template v-slot="scope">
-        <span
-          v-if="
-            scope.row.historyType && scope.row.historyType === 'PROCESS_END'
-          "
-        />
+        <span v-if="scope.row.historyType && scope.row.historyType === 'PROCESS_END'" />
         <span v-else>{{ scope.row.creator }}</span>
       </template>
     </el-table-column>
-    <el-table-column
-      :label="$t('workflowHistoryList.operatorDept')"
-      align="left"
-      width="150"
-    >
+    <el-table-column :label="$t('workflowHistoryList.operatorDept')" align="left" width="150">
       <template v-slot="scope">
-        <span
-          v-if="
-            scope.row.historyType && scope.row.historyType === 'PROCESS_END'
-          "
-        />
+        <span v-if="scope.row.historyType && scope.row.historyType === 'PROCESS_END'" />
         <span v-else>{{ scope.row.departmentName }}</span>
       </template>
     </el-table-column>
-    <el-table-column
-      :label="$t('workflowHistoryList.operationTime')"
-      align="left"
-      width="200"
-    >
+    <el-table-column :label="$t('workflowHistoryList.operationTime')" align="left" width="200">
       <template v-slot="scope">
-        <span
-          v-if="
-            scope.row.historyType && scope.row.historyType === 'PROCESS_END'
-          "
-        />
+        <span v-if="scope.row.historyType && scope.row.historyType === 'PROCESS_END'" />
         <span v-else>{{ scope.row.formatCreatedTime }}</span>
       </template>
     </el-table-column>
-    <el-table-column
-      :label="$t('workflowHistoryList.operation')"
-      align="left"
-      width="400"
-    >
+    <el-table-column :label="$t('workflowHistoryList.operation')" align="left" width="400">
       <template v-slot="scope">
-        <span
-          v-if="
-            scope.row.historyType && scope.row.historyType === 'PROCESS_END'
-          "
-        />
+        <span v-if="scope.row.historyType && scope.row.historyType === 'PROCESS_END'" />
         <span v-else-if="scope.row.current" style="color: #e6a23c"
-          >{{ scope.row.transactionResult }}
-          {{ $t('workflowHistoryList.toDoText') }}</span
+          >{{ scope.row.transactionResult }} {{ $t('workflowHistoryList.toDoText') }}</span
         >
         <span v-else>{{ i18nOperation(scope.row) }}</span>
       </template>
     </el-table-column>
-    <el-table-column
-      :label="$t('workflowHistoryList.opinion')"
-      align="left"
-      width="400"
-    >
+    <el-table-column :label="$t('workflowHistoryList.opinion')" align="left" width="400">
       <template v-slot="scope">
-        <span
-          v-if="
-            scope.row.historyType && scope.row.historyType === 'PROCESS_END'
-          "
-        />
+        <span v-if="scope.row.historyType && scope.row.historyType === 'PROCESS_END'" />
         <span v-else>{{ scope.row.opinion }}</span>
       </template>
     </el-table-column>
+    <el-table-column :label="$t('workflowHistoryList.remark')" align="left" width="400">
+      <template v-slot="scope">
+        <span>{{ scope.row.remark }}</span>
+      </template>
+    </el-table-column>
   </el-table>
 </template>
 
 <script>
-import {i18nOperation} from '../../../src/utils/workflow-util'
-import {getLanguageWithLocale} from '../../../src/utils/util'
+import { i18nOperation } from '../../../src/utils/workflow-util'
+import { getLanguageWithLocale } from '../../../src/utils/util'
 import ApiJs from './api'
 
 export default {
-	name: 'WorkflowHistoryList',
-	props: {
-		workflowId: {
-			type: Number,
-			default: null,
-		},
-		// 流转历史列表，在图形流转历史中查看子流程流转历史需要使用
-		historyList: {
-			type: Array,
-			default: null,
-		},
-		// 主子流程的国际化配置
-		allProcessI18n: {
-			type: Object,
-			default: null,
-		},
-		maxHeight: {
+  name: 'WorkflowHistoryList',
+  props: {
+    workflowId: {
+      type: Number,
+      default: null
+    },
+    // 流转历史列表，在图形流转历史中查看子流程流转历史需要使用
+    historyList: {
+      type: Array,
+      default: null
+    },
+    // 主子流程的国际化配置
+    allProcessI18n: {
+      type: Object,
+      default: null
+    },
+    maxHeight: {
       type: [String, Number],
-      default: null,
+      default: null
     },
     beanName: {
       type: String,
@@ -193,16 +128,16 @@ export default {
       processI18n: null,
       processNameI18n: null,
       tableMaxHeight: null,
-	    tableHeight: null
+      tableHeight: null
     }
   },
   computed: {},
   provide() {
     return {}
   },
-	created() {
+  created() {
     console.log('historyList---workflowId==', this.workflowId)
-    if(this.workflowId !== undefined && this.workflowId !== null){
+    if (this.workflowId !== undefined && this.workflowId !== null) {
       this.getI18nSet().then((processI18n) => {
         this.processI18n = processI18n
         if (!this.histories || this.histories === null) {
@@ -212,37 +147,43 @@ export default {
         }
       })
     } else {
-        // 页面设计器预览页面时会用该方法
-        this.initTableData()
+      // 页面设计器预览页面时会用该方法
+      this.initTableData()
     }
-	},
-	mounted() {
-		this.$nextTick(() => {
-			this.tableHeight = window.innerHeight - 120
-		})
-	},
-	methods: {
-		...ApiJs,
-		getData() {
+  },
+  mounted() {
+    this.$nextTick(() => {
+      this.tableHeight = window.innerHeight - 120
+    })
+  },
+  methods: {
+    ...ApiJs,
+    getData() {
       if (this.beanName || this.entityName) {
         const params = {
           beanName: this.beanName,
           entityName: this.entityName,
           workflowId: this.workflowId
         }
-        this.$http.post(window.$vueApp.config.globalProperties.baseURL + '/dsc/workflow-commons/instance-histories', params).then(data => {
-          this.handleHistory(data)
-        }).catch(error => {
-          console.log(error)
-          this.loaded = true
-        })
+        this.$http
+          .post(window.$vueApp.config.globalProperties.baseURL + '/dsc/workflow-commons/instance-histories', params)
+          .then((data) => {
+            this.handleHistory(data)
+          })
+          .catch((error) => {
+            console.log(error)
+            this.loaded = true
+          })
       } else {
-        this.$http.get(window.$vueApp.config.globalProperties.baseAPI + '/wf-editor/instance-histories/' + this.workflowId).then(data => {
-          this.handleHistory(data)
-        }).catch(error => {
-          console.log(error)
-          this.loaded = true
-        })
+        this.$http
+          .get(window.$vueApp.config.globalProperties.baseAPI + '/wf-editor/instance-histories/' + this.workflowId)
+          .then((data) => {
+            this.handleHistory(data)
+          })
+          .catch((error) => {
+            console.log(error)
+            this.loaded = true
+          })
       }
     },
     handleHistory(data) {
@@ -263,7 +204,7 @@ export default {
       }
     },
     initTableData(data) {
-      if(data) {
+      if (data) {
         this.histories = data.histories
         if (data && data.currentTasks) {
           this.histories = this.histories.concat(data.currentTasks)
@@ -341,7 +282,7 @@ export default {
     },
     getChildren(row, treeNode, resolve) {
       resolve(row.children)
-    },
-  },
+    }
+  }
 }
 </script>