agilebuilder-ui 1.1.80 → 1.1.81-tmp1

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

@@ -0,0 +1,295 @@
+<template>
+  <el-dialog
+    :close-on-click-modal="false"
+    :model-value="true"
+    :show-close="true"
+    :title="$t('superGrid.tabConfig')"
+    append-to-body
+    top="5vh"
+    width="50%"
+    @close="closeTabConfig"
+    @closed="$emit('closed')"
+    @open="$emit('open')"
+    @opend="$emit('opend')"
+  >
+    <div class="operation-area">
+      <el-button size="default" type="primary" @click="saveConfig">
+        {{ $t('imatrixUIPublicModel.sure') }}
+      </el-button>
+      <el-button size="default" @click="resetConfig">
+        {{ $t('imatrixUIPublicModel.reset') }}
+      </el-button>
+      <el-button size="default" @click="closeTabConfig">
+        {{ $t('imatrixUIPublicModel.cancel') }}
+      </el-button>
+      <span style="padding-left: 10px; color: red"
+        >({{ $t('superGrid.dragColumnOrderMessage') }})</span
+      >
+    </div>
+    <el-table v-if="hasLoaded" :data="tabs" class="custom-tab-config-elTable" max-height="450" row-key="code">
+      <el-table-column :label="$t('superGrid.tabCode')" property="code" width="150">
+         <template v-slot="scope">
+          <span :title="scope.row.code" class="ellipsis cell--span">{{ scope.row.code }}</span>
+        </template>
+        <!-- <template v-slot="scope">
+          <el-input
+            v-model="scope.row.code"
+            clearable
+            size="default"
+          />
+        </template> -->
+      </el-table-column>
+      <el-table-column :label="$t('superGrid.tabName')" property="name">
+        <template v-slot="scope">
+          <el-input
+            v-model="scope.row.name"
+            clearable
+            size="default"
+          />
+        </template>
+      </el-table-column>
+      <el-table-column :label="$t('superGrid.displayOrder')" property="displayOrder" sortable width="150">
+        <template v-slot="scope">
+          <el-input
+            v-model="scope.row.displayOrder"
+            clearable
+            type="number"
+            size="default"
+          />
+        </template>
+      </el-table-column>
+      <!-- <el-table-column :label="$t('imatrixUIPublicModel.edit')" width="90">
+          <template #header>
+          <el-icon
+            size="14"
+            style="color: #5893ef; cursor: pointer; font-weight: bold;"
+            @click="addTab(null)"
+          >
+            <Plus />
+          </el-icon>
+        </template>
+        <template #default="scope">
+          <el-icon
+            size="14"
+            style="color: #5893ef; cursor: pointer; font-weight: bold; margin-right: 8px"
+            @click="addTab(scope.row)"
+          >
+            <Plus />
+          </el-icon>
+          <el-icon size="14" style="color: #5893ef; cursor: pointer" @click="deleteTab(scope.row)">
+            <Delete />
+          </el-icon>
+        </template>
+      </el-table-column> -->
+    </el-table>
+  </el-dialog>
+</template>
+
+<script>
+import { $on, $off, $once, $emit } from '../../utils/gogocodeTransfer'
+import * as Vue from 'vue'
+import store from './store'
+import Sortable from 'sortablejs'
+
+export default {
+  name: 'ColumnsConfig',
+  props: {
+    listCode: {
+      type: String,
+      default: ''
+    },
+    listTabs: {
+      type: Array,
+      default: () => {
+        return []
+      }
+    }
+  },
+  data() {
+    const listTabsCopy = JSON.parse(JSON.stringify(this.listTabs))
+    return {
+      tabs: listTabsCopy,
+      hasLoaded: false
+    }
+  },
+  created() {
+  },
+  mounted() {
+    // this.listAllTabs().then((tabs) => {
+      // this.tabs = tabs
+      this.hasLoaded = true
+      this.$nextTick(() => {
+        this.dragColumnDisplayOrder()
+      })
+    // })
+  },
+  methods: {
+    saveConfig() {
+      if(!this.tabs || this.tabs.length === 0){
+          this.$message({
+            type: 'warning',
+            message: this.$t('superGrid.emptyTabInfo'),
+            showClose: true
+          })
+        return 
+      }
+      const params = {
+        tabs: this.tabs,
+        listCode: this.listCode
+      }
+      this.$http
+        .post(window.$vueApp.config.globalProperties.baseAPI + '/component/super-grids/setting-list-tabs', params)
+        .then((data) => {
+          this.$message({
+            type: 'success',
+            message: this.$t('imatrixUIMessage.saveSuccessfully'),
+            showClose: true
+          })
+          $emit(this, 'close', this.tabs)
+        })
+    },
+    closeTabConfig(){
+      $emit(this, 'close')
+    },
+    resetConfig() {
+      this.$confirm(this.$t('superGrid.whetherToConfirmReset'), this.$t('imatrixUIMessage.tips'), {
+        confirmButtonText: this.$t('imatrixUIPublicModel.sure'),
+        cancelButtonText: this.$t('imatrixUIPublicModel.cancel'),
+        type: 'warning'
+      }).then(() => {
+        const url =
+          window.$vueApp.config.globalProperties.baseAPI + '/component/super-grids/reset-list-tabs/' + this.listCode
+        this.$http.delete(url).then(() => {
+          this.$message({
+            type: 'success',
+            message: this.$t('superGrid.resetSuccessful'),
+            showClose: true
+          })
+          this.hasLoaded = false
+          this.listAllTabs().then((tabs) => {
+            this.tabs = tabs
+            this.hasLoaded = true
+            this.$nextTick(() => {
+              this.dragColumnDisplayOrder()
+            })
+            $emit(this, 'reset', true)
+          })
+          //  $emit(this, 'close', this.tabs)
+        })
+      })
+    },
+    listAllTabs() {
+      return new Promise((resolve, reject) => {
+        const url =
+          window.$vueApp.config.globalProperties.baseAPI + '/component/super-grids/user-list-tabs/' + this.listCode
+        this.$http
+          .get(url)
+          .then((tabs) => {
+            resolve(tabs)
+          })
+          .catch((error) => {
+            reject(error)
+          })
+      })
+    },
+    // 拖动列顺序
+    dragColumnDisplayOrder() {
+      return new Promise((resolve, reject) => {
+        const tbody = document.querySelector('.custom-tab-config-elTable .el-table__body-wrapper tbody')
+        if (tbody != null) {
+          const vm = this
+          Sortable.create(tbody, {
+            onEnd({ newIndex, oldIndex }) {
+              if (
+                oldIndex !== null &&
+                oldIndex !== undefined &&
+                oldIndex !== -1 &&
+                newIndex !== null &&
+                newIndex !== undefined &&
+                newIndex !== -1
+              ) {
+                // 如果是 序号、复选框列，不要修改元素
+                const dragColumn = JSON.parse(JSON.stringify(vm.tabs[oldIndex]))
+              console.log('config拖动页签dragColumn', dragColumn)
+                // 将拖动的元素删除
+                vm.tabs.splice(oldIndex, 1)
+                // 将拖动的元素插入到新位置
+                vm.tabs.splice(newIndex, 0, dragColumn)
+              }
+              // 重置列顺序
+              for (let i = 0; i < vm.tabs.length; i++) {
+                let tab = vm.tabs[i]
+                tab.displayOrder = i + 1
+              }
+              console.log('config拖动页签', vm.tabs)
+              console.log('config拖动页签oldIndex', oldIndex)
+              console.log('config拖动页签newIndex', newIndex)
+            }
+          })
+        }
+      })
+    },
+    /**
+     * 添加Tab
+     */
+    addTab(rowItem) {
+      const items = this.tabs
+      if(items && items.length === 0){
+        const code = 'Tab1'
+        items.push({
+          name: code,
+          displayOrder: 1,
+          code: code
+        })
+      } else if(items && items.length > 0) {
+        //查询最大的index
+        let maxIndex = -1
+        let currentIndex = -1
+        if(!rowItem){
+          // 表示点击的操作列表头的增加按钮时
+          currentIndex = items.length - 1
+          maxIndex = items[items.length - 1].index
+        } else {
+          items.find((item, index) => {
+            if (item.index == rowItem.index) {
+              currentIndex = index
+            }
+            if (item.displayOrder > maxIndex) {
+              maxIndex = item.displayOrder
+            }
+          })
+        }
+        if (currentIndex > -1) {
+          const code = 'Tab' + (maxIndex + 1)
+          items.splice(currentIndex + 1, 0, {
+            name: code,
+            displayOrder: maxIndex + 1,
+            code: code
+          })
+        }
+
+      }
+    },
+    /**
+     * 删除Tab
+     */
+    deleteTab(rowItem) {
+      const items = this.tabs
+      if (!confirm('确定要删除吗?')) {
+        return
+      }
+      let delIdnex = -1
+      for (let index in items) {
+        if (items[index].code == rowItem.code) {
+          delIdnex = index
+          break
+        }
+      }
+      if (delIdnex > -1) {
+        items.splice(delIdnex, 1)
+      }
+    }
+  },
+  emits: ['open', 'opend', 'close', 'closed', 'reset', 'opend', 'close', 'closed']
+}
+</script>

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

@@ -60,13 +60,7 @@
       </template>
     </el-table-column>
     <el-table-column :label="$t('workflowHistoryList.stayDuration')" align="center" width="90">
-      <template #header>
-        {{ $t('workflowHistoryList.stayDuration') }}
-        <el-tooltip :content="$t('workflowHistoryList.stayDurationComment')" placement="top">
-          <el-icon><InfoFilled /></el-icon>
-        </el-tooltip>
-      </template>
-      <template #default="scope">
+      <template v-slot="scope">
         <span v-if="scope.row.historyType && scope.row.historyType === 'PROCESS_END'" />
         <span v-else-if="!scope.row.copyTask">{{ scope.row.stayDuration }}</span>
       </template>
@@ -84,13 +78,7 @@
       align="center"
       width="110"
     >
-      <template #header>
-        {{ $t('workflowHistoryList.processingDuration') }}
-        <el-tooltip :content="$t('workflowHistoryList.processingDurationComment')" placement="top">
-          <el-icon><InfoFilled /></el-icon>
-        </el-tooltip>
-      </template>
-      <template #default="scope">
+      <template v-slot="scope">
         <span v-if="scope.row.historyType && scope.row.historyType === 'PROCESS_END'" />
         <span v-else-if="!scope.row.copyTask">{{ scope.row.processingDuration }}</span>
       </template>
@@ -137,12 +125,9 @@ import { i18nOperation } from '../../../src/utils/workflow-util'
 import { getLanguageWithLocale } from '../../../src/utils/util'
 import ApiJs from './api'
 import dayjs from 'dayjs'
-import { InfoFilled } from '@element-plus/icons-vue'
+
 export default {
   name: 'WorkflowHistoryList',
-  components: {
-    InfoFilled
-  },
   props: {
     workflowId: {
       type: Number,
@@ -381,6 +366,7 @@ export default {
         if (minutes > 0) {
           parts.push(minutes + this.$t('IntervalSelection.minute'))
         }
+        debugger
         if (parts.length === 0) {
           parts.push('0' + this.$t('IntervalSelection.minute'))
         }

package/src/i18n/langs/cn.js

@@ -155,7 +155,13 @@ const cn = {
     orderType: '排序方式',
     orderTypeAsc: '升序',
     orderTypeDesc: '降序',
-    close: '关闭'
+    close: '关闭',
+    tabConfig: '页签配置',
+    tab: '所属页签',
+    tabCode:'页签编码',
+    tabName:'页签名称',
+    emptyTabInfo:'页签信息为空，不能保存!',
+    otherTabName: '其它信息'
   },
   // 部门树组件
   departmentTree: {},
@@ -285,11 +291,9 @@ const cn = {
     taskStateDoing: '进行中',
     taskStateDone: '已完成',
     cancel_trust_task: '{key_1}取消了用户[{key_2}]的委托任务',
-    restore_trust_task: '{key_1}恢复了受托人[{key_2}]的任务',
-    cancel_trust_record_task: '{key_1}的委托已取消，办理人[{key_2}]环节[{key_3}]的委托任务被取消',
-    cancel_trust_task_complete_task: '{key_1}执行了[{key_2}]操作，办理人[{key_3}]的任务被取消',
-    stayDurationComment: '停留时长为上个节点完成的时间到当前节点完成时间的时长，根据自然日计算',
-    processingDurationComment: '处理时长为上个节点完成的时间到当前节点完成时间的时长，根据工作日小时数计算'
+    restore_trust_task: '{key_1}恢复了受托人[{key_2}]的任务', 
+    cancel_trust_record_task: '{key_1}的委托已取消，办理人[{key_2}]环节[{key_3}]的委托任务被取消', 
+    cancel_trust_task_complete_task: '{key_1}执行了[{key_2}]操作，办理人[{key_3}]的任务被取消'
   },
   gateway: {
     timeout: '接口调用超时',

package/src/i18n/langs/en.js

@@ -156,7 +156,13 @@ const en = {
     orderType: 'Order Type',
     orderTypeAsc: 'Asc',
     orderTypeDesc: 'Desc',
-    close: 'Close'
+    close: 'Close',
+    tabConfig: 'Tab Config',
+    tab: 'Tab',
+    tabCode:'Tab Code',
+    tabName:'Tab Name',
+    emptyTabInfo:'Tab Information is emtpty,cannot save!',
+    otherTabName: 'Other Information'
   },
   departmentTree: {},
   departmentTreeInline: {
@@ -285,15 +291,9 @@ const en = {
     taskStateDoing: 'Doing',
     taskStateDone: 'Done',
     cancel_trust_task: '{key_1} canceled the delegated task of user [{key_2}]',
-    restore_trust_task: '{key_1} has restored the task of the trustee [{key_2}]',
-    cancel_trust_record_task:
-      'The delegation of {key_1} has been canceled, and the delegated task in the [{key_2}] phase of [{key_3}] has been canceled',
-    cancel_trust_task_complete_task:
-      '{key_1} performed the [{key_2}] operation, and the task of the handler [{key_3}] was canceled',
-    stayDurationComment:
-      'The stay duration is the natural day duration from the completion time of the previous node to the completion time of the current node',
-    processingDurationComment:
-      'The processing duration is the duration from the completion time of the previous node to the completion time of the current node, measured in working hours between the two node tasks'
+    restore_trust_task: '{key_1} has restored the task of the trustee [{key_2}]', 
+    cancel_trust_record_task: 'The delegation of {key_1} has been canceled, and the delegated task in the [{key_2}] phase of [{key_3}] has been canceled', 
+    cancel_trust_task_complete_task: '{key_1} performed the [{key_2}] operation, and the task of the handler [{key_3}] was canceled'
   },
   gateway: {
     timeout: 'Interface call timeout',

package/src/utils/jump-page-utils.js

@@ -718,7 +718,7 @@ function openDialogWhenPopup(jumpPageSetting, system, pageCode, dataId, jumpMode
   return popPageSetting
 }
 
-export function packageOpenUrl(system, pageCode, dataId, jumpPageSetting, jumpMode, ids, buttonCode, isHasIdParam) {
+function packageOpenUrl(system, pageCode, dataId, jumpPageSetting, jumpMode, ids, buttonCode, isHasIdParam) {
   const frontendUrl = getSystemFrontendUrl(system.frontendUrl)
   let path =
     frontendUrl +

package/src/utils/workflow-util.js

@@ -5,6 +5,7 @@ import { getI18n } from './util'
  * @param {*} processNameI18n 流程名称国际化后的值
  */
 export function i18nOperation(history, processNameI18n, processI18n, language) {
+  debugger
   let operation = history.transactionResult
   const historyType = history.historyType
   if (!history.current && historyType) {
@@ -18,11 +19,7 @@ export function i18nOperation(history, processNameI18n, processI18n, language) {
       } else if (i18nKey === 'process_end') {
         i18nKey = 'processEnd'
       }
-      if (
-        isButtonOperation ||
-        historyType === 'HISTORY_COMPLETE_TRANSFER' ||
-        historyType === 'CANCEL_TRUST_TASK_COMPLETE_TASK'
-      ) {
+      if (isButtonOperation || historyType === 'HISTORY_COMPLETE_TRANSFER' || historyType === 'CANCEL_TRUST_TASK_COMPLETE_TASK') {
         // 是普通任务办理按钮 或 完成移交任务时，才会传“操作”（例如：submit、save、approve等等）
         // 需要把这些操作进行国际化显示。
         // 在params中2对应的是操作

package/lib/architecture-O4VJ6CD3-ZoZ2IAk2-6b17acd8.js

@@ -1,11 +0,0 @@
-import { A as a, e as s } from "./mermaid-parser.core-CH9ryA1K-54fad62d.js";
-import "./index-13e73297.js";
-import "vue";
-import "./mermaid.core-CAqkCmS1-1a2bb6c5.js";
-import "./_baseUniq-BXtq6_NW-b5fc489d.js";
-import "./min-BngCxx8g-f2fc5ef1.js";
-import "./clone-CEJtuQzg-87b6fde3.js";
-export {
-  a as ArchitectureModule,
-  s as createArchitectureServices
-};

package/lib/gitGraph-ZV4HHKMB-BSmtVGRu-3e09653d.js

@@ -1,11 +0,0 @@
-import { G, f as s } from "./mermaid-parser.core-CH9ryA1K-54fad62d.js";
-import "./index-13e73297.js";
-import "vue";
-import "./mermaid.core-CAqkCmS1-1a2bb6c5.js";
-import "./_baseUniq-BXtq6_NW-b5fc489d.js";
-import "./min-BngCxx8g-f2fc5ef1.js";
-import "./clone-CEJtuQzg-87b6fde3.js";
-export {
-  G as GitGraphModule,
-  s as createGitGraphServices
-};

package/lib/info-63CPKGFF-C8sYWczU-1e29ebd2.js

@@ -1,11 +0,0 @@
-import { I as c, c as f } from "./mermaid-parser.core-CH9ryA1K-54fad62d.js";
-import "./index-13e73297.js";
-import "vue";
-import "./mermaid.core-CAqkCmS1-1a2bb6c5.js";
-import "./_baseUniq-BXtq6_NW-b5fc489d.js";
-import "./min-BngCxx8g-f2fc5ef1.js";
-import "./clone-CEJtuQzg-87b6fde3.js";
-export {
-  c as InfoModule,
-  f as createInfoServices
-};

package/lib/packet-HUATNLJX-bfFWFja0-667f6600.js

@@ -1,11 +0,0 @@
-import { P as c, a as s } from "./mermaid-parser.core-CH9ryA1K-54fad62d.js";
-import "./index-13e73297.js";
-import "vue";
-import "./mermaid.core-CAqkCmS1-1a2bb6c5.js";
-import "./_baseUniq-BXtq6_NW-b5fc489d.js";
-import "./min-BngCxx8g-f2fc5ef1.js";
-import "./clone-CEJtuQzg-87b6fde3.js";
-export {
-  c as PacketModule,
-  s as createPacketServices
-};

package/lib/pie-WTHONI2E-QPrWs3SR-e78315cf.js

@@ -1,11 +0,0 @@
-import { b as s, d as c } from "./mermaid-parser.core-CH9ryA1K-54fad62d.js";
-import "./index-13e73297.js";
-import "vue";
-import "./mermaid.core-CAqkCmS1-1a2bb6c5.js";
-import "./_baseUniq-BXtq6_NW-b5fc489d.js";
-import "./min-BngCxx8g-f2fc5ef1.js";
-import "./clone-CEJtuQzg-87b6fde3.js";
-export {
-  s as PieModule,
-  c as createPieServices
-};

package/lib/radar-NJJJXTRR-BnUCJhQL-da5b5f7d.js

@@ -1,11 +0,0 @@
-import { R as d, g as s } from "./mermaid-parser.core-CH9ryA1K-54fad62d.js";
-import "./index-13e73297.js";
-import "vue";
-import "./mermaid.core-CAqkCmS1-1a2bb6c5.js";
-import "./_baseUniq-BXtq6_NW-b5fc489d.js";
-import "./min-BngCxx8g-f2fc5ef1.js";
-import "./clone-CEJtuQzg-87b6fde3.js";
-export {
-  d as RadarModule,
-  s as createRadarServices
-};

package/lib/treemap-75Q7IDZK-B2atdfMH-54046a6a.js

@@ -1,11 +0,0 @@
-import { T as s, h as T } from "./mermaid-parser.core-CH9ryA1K-54fad62d.js";
-import "./index-13e73297.js";
-import "vue";
-import "./mermaid.core-CAqkCmS1-1a2bb6c5.js";
-import "./_baseUniq-BXtq6_NW-b5fc489d.js";
-import "./min-BngCxx8g-f2fc5ef1.js";
-import "./clone-CEJtuQzg-87b6fde3.js";
-export {
-  s as TreemapModule,
-  T as createTreemapServices
-};