update 新增角色选择组件

src/components/BpmnDesign/panel/TaskPanel.vue

@@ -48,9 +48,9 @@
               </el-badge>
             </el-form-item>
             <el-form-item v-if="formData.auditUserType === AuditUserTypeEnum.ROLE && showConfig.roles" style="">
-              <el-badge :value="formData.users.length" :max="99">
+              <el-badge :value="formData.roles.length" :max="99">
-                <el-button type="primary" disabled @click="openUserSelect">选择角色</el-button>
+                <el-button type="primary" @click="openUserSelect">选择角色</el-button>
-                <UserSelect ref="userSelectRef" v-model="formData.roles"></UserSelect>
+                <RoleSelect ref="userSelectRef" v-model="formData.roles"></RoleSelect>
               </el-badge>
             </el-form-item>
             <el-form-item v-if="formData.auditUserType === AuditUserTypeEnum.SPECIFY && showConfig.specifyDesc" style="">
@@ -74,6 +74,32 @@
           </div>
         </el-collapse-item>
 
+        <el-collapse-item v-if="showConfig.taskListener" name="3">
+          <template #title>
+            <div class="collapse__title">
+              <el-icon>
+                <BellFilled />
+              </el-icon>
+              任务监听器
+            </div>
+          </template>
+          <div>
+            <TaskListener v-if="showConfig.taskListener" :modeler="modeler" :element="element"></TaskListener>
+          </div>
+        </el-collapse-item>
+        <el-collapse-item v-if="showConfig.executionListener" name="4">
+          <template #title>
+            <div class="collapse__title">
+              <el-icon>
+                <BellFilled />
+              </el-icon>
+              执行监听器
+            </div>
+          </template>
+          <div>
+            <ExecutionListener v-if="showConfig.executionListener" :modeler="modeler" :element="element"></ExecutionListener>
+          </div>
+        </el-collapse-item>
         <el-form-item v-if="showConfig.isForCompensation" prop="isForCompensation" label="是否为补偿">
           <el-switch v-model="formData.isForCompensation" inline-prompt active-text="是" inactive-text="否" />
         </el-form-item>
@@ -92,11 +118,6 @@
         <el-form-item v-if="showConfig.class" prop="class" label="类">
           <el-input v-model="formData.class"> </el-input>
         </el-form-item>
-
-        <el-form-item v-if="showConfig.executionListener" label="执行监听器" style="margin-bottom: 0"> </el-form-item>
-        <ExecutionListener v-if="showConfig.executionListener" :modeler="modeler" :element="element"></ExecutionListener>
-        <el-form-item v-if="showConfig.taskListener" label="任务监听器" style="margin-bottom: 0"> </el-form-item>
-        <TaskListener v-if="showConfig.taskListener" :modeler="modeler" :element="element"></TaskListener>
       </el-collapse>
     </el-form>
   </div>
@@ -109,7 +130,7 @@ import DueDate from '@/components/BpmnDesign/panel/property/DueDate.vue';
 import { Element, Modeler } from 'bpmn';
 import { TaskPanel } from 'bpmnDesign';
 import { AuditUserTypeEnum, MultipleUserAuditTypeEnum, SpecifyDescEnum } from '@/enums/bpmn/IndexEnums';
-import { Checked, InfoFilled } from '@element-plus/icons-vue';
+import { BellFilled, Checked, InfoFilled } from '@element-plus/icons-vue';
 
 interface PropType {
   modeler: Modeler;

src/components/BpmnDesign/panel/property/DueDate.vue

@@ -82,7 +82,46 @@ const customMonthValue = ref(1);
 const hourValueConst = ['4', '8', '12', '24'];
 const dayAndWeekAndMonthValueConst = ['1', '2', '3', '4'];
 
-const initValue = () => {};
+const initValue = () => {
+  formValue.value = prop.modelValue;
+  if (prop.modelValue) {
+    const lastStr = prop.modelValue.substring(prop.modelValue.length - 1);
+    if (lastStr === 'H') {
+      const hourValueValue = prop.modelValue.substring(2, prop.modelValue.length - 1);
+      if (hourValueConst.includes(hourValueValue)) {
+        hourValue.value = hourValueValue;
+      } else {
+        hourValue.value = '自定义';
+        customHourValue.value = Number(hourValueValue);
+      }
+    }
+    const dayAndWeekAndMonthValue = prop.modelValue.substring(1, prop.modelValue.length - 1);
+    if (lastStr === 'D') {
+      if (dayAndWeekAndMonthValueConst.includes(dayAndWeekAndMonthValue)) {
+        dayValue.value = dayAndWeekAndMonthValue;
+      } else {
+        dayValue.value = '自定义';
+        customDayValue.value = Number(dayAndWeekAndMonthValue);
+      }
+    }
+    if (lastStr === 'W') {
+      if (dayAndWeekAndMonthValueConst.includes(dayAndWeekAndMonthValue)) {
+        weekValue.value = dayAndWeekAndMonthValue;
+      } else {
+        weekValue.value = '自定义';
+        customWeekValue.value = Number(dayAndWeekAndMonthValue);
+      }
+    }
+    if (lastStr === 'M') {
+      if (dayAndWeekAndMonthValueConst.includes(dayAndWeekAndMonthValue)) {
+        monthValue.value = dayAndWeekAndMonthValue;
+      } else {
+        monthValue.value = '自定义';
+        customMonthValue.value = Number(dayAndWeekAndMonthValue);
+      }
+    }
+  }
+};
 
 const confirm = () => {
   // 深拷贝赋值更新modelValue
@@ -91,7 +130,6 @@ const confirm = () => {
 };
 
 const customHourValueChange = (customHourValue) => {
-  valueType.value = 'H';
   formValue.value = `PT${customHourValue}H`;
 
   dayValue.value = '';
@@ -102,7 +140,6 @@ const customHourValueChange = (customHourValue) => {
   customMonthValue.value = 1;
 };
 const customDayValueChange = (customDayValue) => {
-  valueType.value = 'D';
   formValue.value = `P${customDayValue}D`;
   hourValue.value = '';
   weekValue.value = '';
@@ -114,7 +151,6 @@ const customDayValueChange = (customDayValue) => {
 };
 
 const customWeekValueChange = (customWeekValue) => {
-  valueType.value = 'W';
   formValue.value = `P${customWeekValue}W`;
   hourValue.value = '';
   dayValue.value = '';
@@ -126,7 +162,6 @@ const customWeekValueChange = (customWeekValue) => {
 };
 
 const customMonthValueChange = (customMonthValue) => {
-  valueType.value = 'M';
   formValue.value = `P${customMonthValue}M`;
   hourValue.value = '';
   dayValue.value = '';
@@ -138,7 +173,6 @@ const customMonthValueChange = (customMonthValue) => {
 };
 
 const hourChange = (hourValue) => {
-  valueType.value = 'H';
   if (hourValue === '自定义') {
     formValue.value = `PT${customHourValue.value}H`;
   } else {
@@ -153,7 +187,6 @@ const hourChange = (hourValue) => {
   customMonthValue.value = 1;
 };
 const dayChange = (dayValue) => {
-  valueType.value = 'D';
   if (dayValue === '自定义') {
     formValue.value = `P${customDayValue.value}D`;
   } else {
@@ -169,7 +202,6 @@ const dayChange = (dayValue) => {
   customMonthValue.value = 1;
 };
 const weekChange = (weekValue) => {
-  valueType.value = 'W';
   if (weekValue === '自定义') {
     formValue.value = `P${customWeekValue.value}W`;
   } else {
@@ -185,7 +217,6 @@ const weekChange = (weekValue) => {
   customMonthValue.value = 1;
 };
 const monthChange = (monthValue) => {
-  valueType.value = 'M';
   if (monthValue === '自定义') {
     formValue.value = `P${customMonthValue.value}M`;
   } else {

src/components/RoleSelect/index.vue

@@ -0,0 +1,197 @@
+<template>
+  <div>
+    <el-dialog v-model="roleDialog.visible.value" :title="roleDialog.title.value" width="80%" append-to-body>
+      <transition :enter-active-class="proxy?.animate.searchAnimate.enter" :leave-active-class="proxy?.animate.searchAnimate.leave">
+        <div v-show="showSearch" class="mb-[10px]">
+          <el-card shadow="hover">
+            <el-form ref="queryFormRef" :model="queryParams" :inline="true" label-width="68px">
+              <el-form-item label="角色名称" prop="roleName">
+                <el-input v-model="queryParams.roleName" placeholder="请输入角色名称" clearable style="width: 180px" @keyup.enter="handleQuery" />
+              </el-form-item>
+              <el-form-item label="权限字符" prop="roleKey">
+                <el-input v-model="queryParams.roleKey" placeholder="请输入权限字符" clearable style="width: 180px" @keyup.enter="handleQuery" />
+              </el-form-item>
+
+              <el-form-item>
+                <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
+                <el-button icon="Refresh" @click="resetQuery">重置</el-button>
+              </el-form-item>
+            </el-form>
+          </el-card>
+        </div>
+      </transition>
+
+      <el-card shadow="hover">
+        <template #header>
+          <el-tag v-for="role in selectRoleList" :key="role.roleId" closable style="margin: 2px" @close="handleCloseTag(role)">
+            {{ role.roleName }}
+          </el-tag>
+        </template>
+
+        <vxe-table
+          ref="tableRef"
+          height="400px"
+          border
+          show-overflow
+          :data="roleList"
+          :loading="loading"
+          :row-config="{ keyField: 'roleId' }"
+          :checkbox-config="{ reserve: true, checkRowKeys: roleIds }"
+          highlight-current-row
+          @checkbox-all="handleCheckboxAll"
+          @checkbox-change="handleCheckboxChange"
+        >
+          <vxe-column type="checkbox" width="50" align="center" />
+          <vxe-column v-if="false" key="roleId" label="角色编号" />
+          <vxe-column field="roleName" title="角色名称" />
+          <vxe-column field="roleKey" title="权限字符" />
+          <vxe-column field="roleSort" title="显示顺序" width="100" />
+          <vxe-column title="状态" align="center" width="100">
+            <template #default="scope">
+              <dict-tag :options="sys_normal_disable" :value="scope.row.status"></dict-tag>
+            </template>
+          </vxe-column>
+          <vxe-column field="createTime" title="创建时间" align="center">
+            <template #default="scope">
+              <span>{{ parseTime(scope.row.createTime) }}</span>
+            </template>
+          </vxe-column>
+        </vxe-table>
+
+        <pagination
+          v-if="total > 0"
+          v-model:total="total"
+          v-model:page="queryParams.pageNum"
+          v-model:limit="queryParams.pageSize"
+          @pagination="getList"
+        />
+      </el-card>
+      <template #footer>
+        <el-button @click="roleDialog.closeDialog">取消</el-button>
+        <el-button type="primary" @click="confirm">确定</el-button>
+      </template>
+    </el-dialog>
+  </div>
+</template>
+
+<script setup name="Role" lang="ts">
+import { listRole } from '@/api/system/role';
+import { RoleVO, RoleQuery } from '@/api/system/role/types';
+import { VxeTableInstance } from 'vxe-table';
+import useDialog from '@/hooks/useDialog';
+interface PropType {
+  modelValue: RoleVO[];
+}
+const prop = defineProps<PropType>();
+const emit = defineEmits(['update:modelValue']);
+
+const router = useRouter();
+const { proxy } = getCurrentInstance() as ComponentInternalInstance;
+const { sys_normal_disable } = toRefs<any>(proxy?.useDict('sys_normal_disable'));
+
+const roleIds = computed(() => prop.modelValue.map((item) => item.roleId as string));
+
+const roleList = ref<RoleVO[]>();
+const loading = ref(true);
+const showSearch = ref(true);
+const ids = ref<Array<string | number>>([]);
+const single = ref(true);
+const multiple = ref(true);
+const total = ref(0);
+const dateRange = ref<[DateModelType, DateModelType]>(['', '']);
+const selectRoleList = ref<RoleVO[]>([]);
+
+const roleDialog = useDialog({
+  title: '角色选择'
+});
+
+const queryFormRef = ref<ElFormInstance>();
+const tableRef = ref<VxeTableInstance<RoleVO>>();
+
+const queryParams = ref<RoleQuery>({
+  pageNum: 1,
+  pageSize: 10,
+  roleName: '',
+  roleKey: '',
+  status: ''
+});
+const confirm = () => {
+  emit('update:modelValue', [...selectRoleList.value]);
+  roleDialog.closeDialog();
+};
+/**
+ * 查询角色列表
+ */
+const getList = () => {
+  loading.value = true;
+  listRole(proxy?.addDateRange(queryParams.value, dateRange.value)).then((res) => {
+    roleList.value = res.rows;
+    total.value = res.total;
+    loading.value = false;
+  });
+};
+
+/**
+ * 搜索按钮操作
+ */
+const handleQuery = () => {
+  queryParams.value.pageNum = 1;
+  getList();
+};
+
+/** 重置 */
+const resetQuery = () => {
+  dateRange.value = ['', ''];
+  queryFormRef.value?.resetFields();
+  handleQuery();
+};
+
+const handleCheckboxChange = (checked) => {
+  const row = checked.row;
+  if (checked.checked) {
+    selectRoleList.value.push(row);
+  } else {
+    selectRoleList.value = selectRoleList.value.filter((item) => {
+      return item.roleId !== row.roleId;
+    });
+  }
+};
+const handleCheckboxAll = (checked) => {
+  const rows = roleList.value;
+  if (checked.checked) {
+    rows.forEach((row) => {
+      if (!selectRoleList.value.some((item) => item.roleId === row.roleId)) {
+        selectRoleList.value.push(row);
+      }
+    });
+  } else {
+    selectRoleList.value = selectRoleList.value.filter((item) => {
+      return !rows.some((row) => row.roleId === item.roleId);
+    });
+  }
+};
+
+const handleCloseTag = (user: RoleVO) => {
+  const roleId = user.roleId;
+  // 使用split删除用户
+  const index = selectRoleList.value.findIndex((item) => item.roleId === roleId);
+  const rows = selectRoleList.value[index];
+  tableRef.value?.setCheckboxRow(rows, false);
+  selectRoleList.value.splice(index, 1);
+};
+watch(
+  () => prop.modelValue,
+  (newVal, oldValue) => {
+    Object.assign(selectRoleList.value, newVal);
+  },
+  { deep: true }
+);
+defineExpose({
+  open: roleDialog.openDialog,
+  close: roleDialog.closeDialog
+});
+
+onMounted(() => {
+  getList();
+});
+</script>

src/components/UserSelect/index.vue

@@ -1,108 +1,100 @@
 <template>
   <div>
     <el-dialog v-model="userDialog.visible.value" :title="userDialog.title.value" width="80%" append-to-body>
-      <div class="p-2">
+      <el-row :gutter="20">
-        <el-row :gutter="20">
+        <!-- 部门树 -->
-          <!-- 部门树 -->
+        <el-col :lg="4" :xs="24" style="">
-          <el-col :lg="4" :xs="24" style="">
+          <el-card shadow="hover">
-            <el-card shadow="hover">
+            <el-input v-model="deptName" placeholder="请输入部门名称" prefix-icon="Search" clearable />
-              <el-input v-model="deptName" placeholder="请输入部门名称" prefix-icon="Search" clearable />
+            <el-tree
-              <el-tree
+              ref="deptTreeRef"
-                ref="deptTreeRef"
+              class="mt-2"
-                class="mt-2"
+              node-key="id"
-                node-key="id"
+              :data="deptOptions"
-                :data="deptOptions"
+              :props="{ label: 'label', children: 'children' }"
-                :props="{ label: 'label', children: 'children' }"
+              :expand-on-click-node="false"
-                :expand-on-click-node="false"
+              :filter-node-method="filterNode"
-                :filter-node-method="filterNode"
+              highlight-current
-                highlight-current
+              default-expand-all
-                default-expand-all
+              @node-click="handleNodeClick"
-                @node-click="handleNodeClick"
+            />
-              />
+          </el-card>
-            </el-card>
+        </el-col>
-          </el-col>
+        <el-col :lg="20" :xs="24">
-          <el-col :lg="20" :xs="24">
+          <transition :enter-active-class="proxy?.animate.searchAnimate.enter" :leave-active-class="proxy?.animate.searchAnimate.leave">
-            <transition :enter-active-class="proxy?.animate.searchAnimate.enter" :leave-active-class="proxy?.animate.searchAnimate.leave">
+            <div v-show="showSearch" class="mb-[10px]">
-              <div v-show="showSearch" class="mb-[10px]">
+              <el-card shadow="hover">
-                <el-card shadow="hover">
+                <el-form ref="queryFormRef" :model="queryParams" :inline="true" label-width="68px">
-                  <el-form ref="queryFormRef" :model="queryParams" :inline="true" label-width="68px">
+                  <el-form-item label="用户名称" prop="userName">
-                    <el-form-item label="用户名称" prop="userName">
+                    <el-input v-model="queryParams.userName" placeholder="请输入用户名称" clearable style="width: 200px" @keyup.enter="handleQuery" />
-                      <el-input
+                  </el-form-item>
-                        v-model="queryParams.userName"
+                  <el-form-item label="手机号码" prop="phonenumber">
-                        placeholder="请输入用户名称"
+                    <el-input
-                        clearable
+                      v-model="queryParams.phonenumber"
-                        style="width: 200px"
+                      placeholder="请输入手机号码"
-                        @keyup.enter="handleQuery"
+                      clearable
-                      />
+                      style="width: 200px"
-                    </el-form-item>
+                      @keyup.enter="handleQuery"
-                    <el-form-item label="手机号码" prop="phonenumber">
+                    />
-                      <el-input
+                  </el-form-item>
-                        v-model="queryParams.phonenumber"
+                  <el-form-item>
-                        placeholder="请输入手机号码"
+                    <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
-                        clearable
+                    <el-button icon="Refresh" @click="resetQuery">重置</el-button>
-                        style="width: 200px"
+                  </el-form-item>
-                        @keyup.enter="handleQuery"
+                </el-form>
-                      />
+              </el-card>
-                    </el-form-item>
+            </div>
-                    <el-form-item>
+          </transition>
-                      <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
-                      <el-button icon="Refresh" @click="resetQuery">重置</el-button>
-                    </el-form-item>
-                  </el-form>
-                </el-card>
-              </div>
-            </transition>
 
-            <el-card shadow="hover">
+          <el-card shadow="hover">
-              <template #header>
+            <template #header>
-                <el-tag v-for="user in selectUserList" :key="user.userId" closable style="margin: 2px" @close="handleCloseTag(user.userId)">{{
+              <el-tag v-for="user in selectUserList" :key="user.userId" closable style="margin: 2px" @close="handleCloseTag(user)">
-                  user.userName
+                {{ user.userName }}
-                }}</el-tag>
+              </el-tag>
-              </template>
+            </template>
 
-              <vxe-table
+            <vxe-table
-                ref="tableRef"
+              ref="tableRef"
-                height="400px"
+              height="400px"
-                border
+              border
-                show-overflow
+              show-overflow
-                :data="userList"
+              :data="userList"
-                :loading="loading"
+              :loading="loading"
-                :row-config="{ keyField: 'userId' }"
+              :row-config="{ keyField: 'userId' }"
-                :checkbox-config="{ reserve: true, checkRowKeys: userIds }"
+              :checkbox-config="{ reserve: true, checkRowKeys: userIds }"
-                highlight-current-row
+              highlight-current-row
-                @checkbox-all="handleCheckboxAll"
+              @checkbox-all="handleCheckboxAll"
-                @checkbox-change="handleCheckboxChange"
+              @checkbox-change="handleCheckboxChange"
-              >
+            >
-                <vxe-column type="checkbox" width="50" align="center" />
+              <vxe-column type="checkbox" width="50" align="center" />
-                <vxe-column key="userId" title="用户编号" align="center" field="userId" />
+              <vxe-column key="userId" title="用户编号" align="center" field="userId" />
-                <vxe-column key="userName" title="用户名称" align="center" field="userName" :show-overflow-tooltip="true" />
+              <vxe-column key="userName" title="用户名称" align="center" field="userName" />
-                <vxe-column key="nickName" title="用户昵称" align="center" field="nickName" :show-overflow-tooltip="true" />
+              <vxe-column key="nickName" title="用户昵称" align="center" field="nickName" />
-                <vxe-column key="deptName" title="部门" align="center" field="deptName" :show-overflow-tooltip="true" />
+              <vxe-column key="deptName" title="部门" align="center" field="deptName" />
-                <vxe-column key="phonenumber" title="手机号码" align="center" field="phonenumber" width="120" />
+              <vxe-column key="phonenumber" title="手机号码" align="center" field="phonenumber" width="120" />
-                <vxe-column key="status" title="状态" align="center">
+              <vxe-column key="status" title="状态" align="center">
-                  <template #default="scope">
+                <template #default="scope">
-                    <dict-tag :options="sys_normal_disable" :value="scope.row.status"></dict-tag>
+                  <dict-tag :options="sys_normal_disable" :value="scope.row.status"></dict-tag>
-                  </template>
+                </template>
-                </vxe-column>
+              </vxe-column>
 
-                <vxe-column title="创建时间" align="center" width="160">
+              <vxe-column title="创建时间" align="center" width="160">
-                  <template #default="scope">
+                <template #default="scope">
-                    <span>{{ scope.row.createTime }}</span>
+                  <span>{{ scope.row.createTime }}</span>
-                  </template>
+                </template>
-                </vxe-column>
+              </vxe-column>
-              </vxe-table>
+            </vxe-table>
 
-              <pagination
+            <pagination
-                v-show="total > 0"
+              v-show="total > 0"
-                v-model:page="queryParams.pageNum"
+              v-model:page="queryParams.pageNum"
-                v-model:limit="queryParams.pageSize"
+              v-model:limit="queryParams.pageSize"
-                :total="total"
+              :total="total"
-                @pagination="getList"
+              @pagination="getList"
-              />
+            />
-            </el-card>
+          </el-card>
-          </el-col>
+        </el-col>
-        </el-row>
+      </el-row>
-      </div>
 
       <template #footer>
         <el-button @click="userDialog.closeDialog">取消</el-button>
@@ -238,17 +230,25 @@ const handleCheckboxAll = (checked) => {
   }
 };
 
-const handleCloseTag = (userId: string | number) => {
+const handleCloseTag = (user: UserVO) => {
-  // 删除选中用户
+  const userId = user.userId;
-  selectUserList.value = selectUserList.value.filter((item) => {
+  // 使用split删除用户
-    return item.userId !== userId;
+  const index = selectUserList.value.findIndex((item) => item.userId === userId);
-  });
+  const rows = selectUserList.value[index];
+  tableRef.value?.setCheckboxRow(rows, false);
+  selectUserList.value.splice(index, 1);
 };
+watch(
+  () => prop.modelValue,
+  (newVal, oldValue) => {
+    Object.assign(selectUserList.value, newVal);
+  },
+  { deep: true }
+);
 
 onMounted(() => {
   getTreeSelect(); // 初始化部门数据
   getList(); // 初始化列表数据
-  Object.assign(selectUserList.value, prop.modelValue);
 });
 
 defineExpose({