adtec-core-package 2.0.5 → 2.0.7

package/src/components/workflow/components/SelectAssigneeDialog.vue

@@ -1,109 +1,109 @@
-<!--创建人 xux-->
-<!--说明: SelectAssigneeDialog-->
-<!--创建时间: 2024/11/14 下午5:56-->
-<!--修改时间: 2024/11/14 下午5:56-->
-<template>
-  <el-dialog v-model="dialogVisible" title="指定执行人" append-to-body width="450">
-    <el-flex v-loading="loading" :vertical="true">
-      <el-form
-        v-for="(data, index) of datas"
-        labelPosition="top"
-        size="default"
-        :style="{ width: '100%' }"
-      >
-        <el-form-item label="任务名">
-          <span>{{ data?.taskName }}({{ data?.procName }})</span>
-        </el-form-item>
-        <el-form-item label="候选人" :required="true">
-          <el-checkbox-group
-            v-if="data?.candidate && data?.candidate.length > 0"
-            v-model="data.assignee"
-          >
-            <el-checkbox
-              style="width: 80px"
-              v-for="user in data?.candidate"
-              :key="user.id"
-              :label="user.userName"
-              :value="user.id"
-            />
-          </el-checkbox-group>
-        </el-form-item>
-        <el-divider v-if="index != datas?.length - 1"></el-divider>
-      </el-form>
-    </el-flex>
-    <template #footer>
-      <div class="dialog-footer">
-        <el-button @click="dialogVisible = false">取消</el-button>
-        <el-button type="primary" @click="save" :loading="loading">确定</el-button>
-      </div>
-    </template>
-  </el-dialog>
-</template>
-<script setup lang="ts">
-import { ref } from 'vue'
-import workflowInstApi from '../../../api/workflow/workflowInstApi'
-import type { IWfTaskUsersVo } from '../../../interface/workflow/IWfTaskUsersVo'
-import { ElMessage } from 'element-plus'
-import frameworkUtils from '../../../utils/FrameworkUtils.ts'
-const emit = defineEmits(['success'])
-const datas = ref<IWfTaskUsersVo[]>([])
-const dialogVisible = ref(false)
-const loading = ref(false)
-const open = async (taskId: string) => {
-  try {
-    datas.value = [
-      {
-        assignee: [],
-      },
-    ]
-    dialogVisible.value = true
-    loading.value = true
-    const taskUsers = await workflowInstApi.getTaskCandidateList(taskId)
-    if (taskUsers?.length > 0) {
-      for (let taskUser of taskUsers) {
-        taskUser.assignee = []
-      }
-      datas.value = taskUsers
-    } else {
-      ElMessage.warning('无候选人数据')
-    }
-  } catch (err: any) {
-    frameworkUtils.messageError(err)
-  } finally {
-    loading.value = false
-  }
-}
-const save = async () => {
-  for (let data of datas.value) {
-    if (data.candidate?.length == 0 || data.assignee.length == 0) {
-      ElMessage.warning('请指定执行人！')
-      return
-    }
-  }
-  try {
-    loading.value = true
-    await workflowInstApi.setAssigneeList(datas.value)
-    ElMessage.success('操作成功')
-    emit('success', '')
-    dialogVisible.value = false
-  } catch (err: any) {
-    frameworkUtils.messageError(err)
-  } finally {
-    loading.value = false
-  }
-}
-
-defineExpose({
-  open,
-})
-</script>
-<style scoped lang="scss">
-:deep {
-  .el-divider--horizontal {
-    margin: 10px 0;
-  }
-  .el-checkbox {
-    margin-right: 10px;
-  }
-}
-</style>
+<!--创建人 xux-->
+<!--说明: SelectAssigneeDialog-->
+<!--创建时间: 2024/11/14 下午5:56-->
+<!--修改时间: 2024/11/14 下午5:56-->
+<template>
+  <el-dialog v-model="dialogVisible" title="指定执行人" append-to-body width="450">
+    <el-flex v-loading="loading" :vertical="true">
+      <el-form
+        v-for="(data, index) of datas"
+        labelPosition="top"
+        size="default"
+        :style="{ width: '100%' }"
+      >
+        <el-form-item label="任务名">
+          <span>{{ data?.taskName }}({{ data?.procName }})</span>
+        </el-form-item>
+        <el-form-item label="候选人" :required="true">
+          <el-checkbox-group
+            v-if="data?.candidate && data?.candidate.length > 0"
+            v-model="data.assignee"
+          >
+            <el-checkbox
+              style="width: 80px"
+              v-for="user in data?.candidate"
+              :key="user.id"
+              :label="user.userName"
+              :value="user.id"
+            />
+          </el-checkbox-group>
+        </el-form-item>
+        <el-divider v-if="index != datas?.length - 1"></el-divider>
+      </el-form>
+    </el-flex>
+    <template #footer>
+      <div class="dialog-footer">
+        <el-button @click="dialogVisible = false">取消</el-button>
+        <el-button type="primary" @click="save" :loading="loading">确定</el-button>
+      </div>
+    </template>
+  </el-dialog>
+</template>
+<script setup lang="ts">
+import { ref } from 'vue'
+import workflowInstApi from '../../../api/workflow/workflowInstApi'
+import type { IWfTaskUsersVo } from '../../../interface/workflow/IWfTaskUsersVo'
+import { ElMessage } from 'element-plus'
+import frameworkUtils from '../../../utils/FrameworkUtils.ts'
+const emit = defineEmits(['success'])
+const datas = ref<IWfTaskUsersVo[]>([])
+const dialogVisible = ref(false)
+const loading = ref(false)
+const open = async (taskId: string) => {
+  try {
+    datas.value = [
+      {
+        assignee: [],
+      },
+    ]
+    dialogVisible.value = true
+    loading.value = true
+    const taskUsers = await workflowInstApi.getTaskCandidateList(taskId)
+    if (taskUsers?.length > 0) {
+      for (let taskUser of taskUsers) {
+        taskUser.assignee = []
+      }
+      datas.value = taskUsers
+    } else {
+      ElMessage.warning('无候选人数据')
+    }
+  } catch (err: any) {
+    frameworkUtils.messageError(err)
+  } finally {
+    loading.value = false
+  }
+}
+const save = async () => {
+  for (let data of datas.value) {
+    if (data.candidate?.length == 0 || data.assignee.length == 0) {
+      ElMessage.warning('请指定执行人！')
+      return
+    }
+  }
+  try {
+    loading.value = true
+    await workflowInstApi.setAssigneeList(datas.value)
+    ElMessage.success('操作成功')
+    emit('success', '')
+    dialogVisible.value = false
+  } catch (err: any) {
+    frameworkUtils.messageError(err)
+  } finally {
+    loading.value = false
+  }
+}
+
+defineExpose({
+  open,
+})
+</script>
+<style scoped lang="scss">
+:deep {
+  .el-divider--horizontal {
+    margin: 10px 0;
+  }
+  .el-checkbox {
+    margin-right: 10px;
+  }
+}
+</style>

package/src/components/workflow/components/SelectReturnActivityDialog.vue

@@ -1,104 +1,104 @@
-<!--创建人 xux-->
-<!--说明: 选择回退环节-->
-<!--创建时间: 2024/11/18 上午9:48-->
-<!--修改时间: 2024/11/18 上午9:48-->
-<template>
-  <el-dialog v-model="dialogVisible" title="请选择回退节点" append-to-body width="340">
-    <el-flex v-loading="loading" :vertical="true" justify="space-around">
-      <el-card
-        style="width: 100%"
-        :class="item.taskKey == selectActivity ? 'selected-card' : ''"
-        v-for="item in data"
-        :key="item.taskKey"
-        @click="selectActivity = item.taskKey!"
-      >
-        <span style="font-size: 16px; display: block">{{ item.taskName }}</span>
-        <span style="display: block; margin: 5px 0">完成于：{{ item.endTime }}</span>
-        <el-flex>
-          <user-tag
-            type="primary"
-            v-for="user in item.users"
-            :closable="false"
-            :key="user.id"
-            :user-id="user.id!"
-            :username="user.userName!"
-          />
-        </el-flex>
-      </el-card>
-    </el-flex>
-    <template #footer>
-      <div class="dialog-footer">
-        <el-button type="primary" @click="save" :loading="loading">确定</el-button>
-        <el-button @click="dialogVisible = false">取消</el-button>
-      </div>
-    </template>
-  </el-dialog>
-</template>
-<script setup lang="ts">
-import { ref } from 'vue'
-import workflowInstApi from '../../../api/workflow/workflowInstApi'
-import { ElMessage } from 'element-plus'
-import type { IWfReturnNodeVo } from '../../../interface/workflow/IWfReturnNodeVo'
-import UserTag from '../../../components/bpmntree/components/UserSelector/UserTag.vue'
-import { userInfoStore } from '../../../stores/userInfoStore'
-import frameworkUtils from '../../../utils/FrameworkUtils.ts'
-const emit = defineEmits(['success'])
-const data = ref<IWfReturnNodeVo[]>([])
-const dialogVisible = ref(false)
-const loading = ref(false)
-const selectActivity = ref<string>('')
-const taskId = ref<string>('')
-const comment = ref<string>('')
-const open = async (tId: string, c: string) => {
-  try {
-    selectActivity.value = ''
-    taskId.value = tId ?? ''
-    comment.value = c ?? ''
-    dialogVisible.value = true
-    loading.value = true
-    data.value = await workflowInstApi.findReturnTaskList(tId)
-  } catch (err: any) {
-    data.value = []
-    frameworkUtils.messageError(err)
-  } finally {
-    loading.value = false
-  }
-}
-const save = async () => {
-  if (!selectActivity.value) {
-    ElMessage.warning('请指定回退节点！')
-    return
-  }
-  try {
-    loading.value = true
-    await workflowInstApi.taskReturn({
-      taskId: taskId.value,
-      userId: userInfoStore().getUserInfo.id,
-      comment: comment.value,
-      targetKey: selectActivity.value,
-    })
-    ElMessage.success('回退成功')
-    emit('success')
-    dialogVisible.value = false
-  } catch (err: any) {
-    frameworkUtils.messageError(err)
-  } finally {
-    loading.value = false
-  }
-}
-
-defineExpose({
-  open,
-})
-</script>
-<style scoped lang="scss">
-:deep {
-  .el-card__body {
-    padding: 5px;
-  }
-}
-
-.selected-card {
-  border: 1px solid #1a67f8;
-}
-</style>
+<!--创建人 xux-->
+<!--说明: 选择回退环节-->
+<!--创建时间: 2024/11/18 上午9:48-->
+<!--修改时间: 2024/11/18 上午9:48-->
+<template>
+  <el-dialog v-model="dialogVisible" title="请选择回退节点" append-to-body width="340">
+    <el-flex v-loading="loading" :vertical="true" justify="space-around">
+      <el-card
+        style="width: 100%"
+        :class="item.taskKey == selectActivity ? 'selected-card' : ''"
+        v-for="item in data"
+        :key="item.taskKey"
+        @click="selectActivity = item.taskKey!"
+      >
+        <span style="font-size: 16px; display: block">{{ item.taskName }}</span>
+        <span style="display: block; margin: 5px 0">完成于：{{ item.endTime }}</span>
+        <el-flex>
+          <user-tag
+            type="primary"
+            v-for="user in item.users"
+            :closable="false"
+            :key="user.id"
+            :user-id="user.id!"
+            :username="user.userName!"
+          />
+        </el-flex>
+      </el-card>
+    </el-flex>
+    <template #footer>
+      <div class="dialog-footer">
+        <el-button type="primary" @click="save" :loading="loading">确定</el-button>
+        <el-button @click="dialogVisible = false">取消</el-button>
+      </div>
+    </template>
+  </el-dialog>
+</template>
+<script setup lang="ts">
+import { ref } from 'vue'
+import workflowInstApi from '../../../api/workflow/workflowInstApi'
+import { ElMessage } from 'element-plus'
+import type { IWfReturnNodeVo } from '../../../interface/workflow/IWfReturnNodeVo'
+import UserTag from '../../../components/bpmntree/components/UserSelector/UserTag.vue'
+import { userInfoStore } from '../../../stores/userInfoStore'
+import frameworkUtils from '../../../utils/FrameworkUtils.ts'
+const emit = defineEmits(['success'])
+const data = ref<IWfReturnNodeVo[]>([])
+const dialogVisible = ref(false)
+const loading = ref(false)
+const selectActivity = ref<string>('')
+const taskId = ref<string>('')
+const comment = ref<string>('')
+const open = async (tId: string, c: string) => {
+  try {
+    selectActivity.value = ''
+    taskId.value = tId ?? ''
+    comment.value = c ?? ''
+    dialogVisible.value = true
+    loading.value = true
+    data.value = await workflowInstApi.findReturnTaskList(tId)
+  } catch (err: any) {
+    data.value = []
+    frameworkUtils.messageError(err)
+  } finally {
+    loading.value = false
+  }
+}
+const save = async () => {
+  if (!selectActivity.value) {
+    ElMessage.warning('请指定回退节点！')
+    return
+  }
+  try {
+    loading.value = true
+    await workflowInstApi.taskReturn({
+      taskId: taskId.value,
+      userId: userInfoStore().getUserInfo.id,
+      comment: comment.value,
+      targetKey: selectActivity.value,
+    })
+    ElMessage.success('回退成功')
+    emit('success')
+    dialogVisible.value = false
+  } catch (err: any) {
+    frameworkUtils.messageError(err)
+  } finally {
+    loading.value = false
+  }
+}
+
+defineExpose({
+  open,
+})
+</script>
+<style scoped lang="scss">
+:deep {
+  .el-card__body {
+    padding: 5px;
+  }
+}
+
+.selected-card {
+  border: 1px solid #1a67f8;
+}
+</style>

package/src/config/ElementPlusConfig.ts

@@ -1,95 +1,95 @@
-/**
- * Create by丁盼
- * 说明: config
- * 创建时间: 2025/1/14 15:15
- * 修改时间: 2025/1/14 15:15
- */
-/**
- * Create by丁盼
- * 说明: config
- * 创建时间: 2025/1/14 15:16
- * 修改时间: 2025/1/14 15:16
- */
-import elementPlus, {
-  ElPagination,
-  ElForm,
-  ElDialog,
-  ElDrawer,
-  ElSelect,
-  ElTreeSelect,
-  ElTable,
-  ElTooltip,
-} from 'element-plus'
-ElPagination.props.background = {
-  type: Boolean,
-  default: true,
-}
-ElPagination.props.layout = {
-  type: String,
-  default: 'prev, pager, next,total',
-}
-ElForm.props.requireAsteriskPosition = {
-  type: String,
-  default: 'right',
-}
-ElForm.props.labelPosition = {
-  type: String,
-  default: 'top',
-}
-ElDialog.props.closeOnClickModal = {
-  type: Boolean,
-  default: false,
-}
-ElDialog.props.appendToBody = {
-  type: Boolean,
-  default: true,
-}
-ElDialog.props.closeOnPressEscape = {
-  type: Boolean,
-  default: false,
-}
-ElDialog.props.destroyOnClose = {
-  type: Boolean,
-  default: true,
-}
-ElDialog.props.draggable = {
-  type: Boolean,
-  default: true,
-}
-ElDrawer.props.closeOnClickModal = {
-  type: Boolean,
-  default: true,
-}
-ElDialog.props.appendToBody = {
-  type: Boolean,
-  default: true,
-}
-ElDrawer.props.closeOnPressEscape = {
-  type: Boolean,
-  default: false,
-}
-ElSelect.props.fitInputWidth = {
-  type: Boolean,
-  default: false,
-}
-ElTreeSelect.props.fitInputWidth = {
-  type: Boolean,
-  default: false,
-}
-ElTable.props.showOverflowTooltip = {
-  type: Boolean,
-  default: true,
-}
-ElTable.props.highlightCurrentRow = {
-  type: Boolean,
-  default: true,
-}
-ElTable.props.tooltipEffect = {
-  type: String,
-  default: 'light',
-}
-ElTooltip.props.effect = {
-  type: String,
-  default: 'light',
-}
-export default elementPlus
+/**
+ * Create by丁盼
+ * 说明: config
+ * 创建时间: 2025/1/14 15:15
+ * 修改时间: 2025/1/14 15:15
+ */
+/**
+ * Create by丁盼
+ * 说明: config
+ * 创建时间: 2025/1/14 15:16
+ * 修改时间: 2025/1/14 15:16
+ */
+import elementPlus, {
+  ElPagination,
+  ElForm,
+  ElDialog,
+  ElDrawer,
+  ElSelect,
+  ElTreeSelect,
+  ElTable,
+  ElTooltip,
+} from 'element-plus'
+ElPagination.props.background = {
+  type: Boolean,
+  default: true,
+}
+ElPagination.props.layout = {
+  type: String,
+  default: 'prev, pager, next,total',
+}
+ElForm.props.requireAsteriskPosition = {
+  type: String,
+  default: 'right',
+}
+ElForm.props.labelPosition = {
+  type: String,
+  default: 'top',
+}
+ElDialog.props.closeOnClickModal = {
+  type: Boolean,
+  default: false,
+}
+ElDialog.props.appendToBody = {
+  type: Boolean,
+  default: true,
+}
+ElDialog.props.closeOnPressEscape = {
+  type: Boolean,
+  default: false,
+}
+ElDialog.props.destroyOnClose = {
+  type: Boolean,
+  default: true,
+}
+ElDialog.props.draggable = {
+  type: Boolean,
+  default: true,
+}
+ElDrawer.props.closeOnClickModal = {
+  type: Boolean,
+  default: true,
+}
+ElDialog.props.appendToBody = {
+  type: Boolean,
+  default: true,
+}
+ElDrawer.props.closeOnPressEscape = {
+  type: Boolean,
+  default: false,
+}
+ElSelect.props.fitInputWidth = {
+  type: Boolean,
+  default: false,
+}
+ElTreeSelect.props.fitInputWidth = {
+  type: Boolean,
+  default: false,
+}
+ElTable.props.showOverflowTooltip = {
+  type: Boolean,
+  default: true,
+}
+ElTable.props.highlightCurrentRow = {
+  type: Boolean,
+  default: true,
+}
+ElTable.props.tooltipEffect = {
+  type: String,
+  default: 'light',
+}
+ElTooltip.props.effect = {
+  type: String,
+  default: 'light',
+}
+export default elementPlus