一单四制优化及加入工作流

unpackage/dist/dev/mp-weixin/components/flow/FlowAssigneePickerPopup.js

@@ -0,0 +1,144 @@
+"use strict";
+const common_vendor = require("../../common/vendor.js");
+const request_api = require("../../request/api.js");
+const components_flow_flowAssigneeUtils = require("./flowAssigneeUtils.js");
+if (!Array) {
+  const _easycom_u_popup2 = common_vendor.resolveComponent("u-popup");
+  _easycom_u_popup2();
+}
+const _easycom_u_popup = () => "../../uni_modules/uview-plus/components/u-popup/u-popup.js";
+if (!Math) {
+  (FlowAssigneeTree + _easycom_u_popup)();
+}
+const FlowAssigneeTree = () => "./FlowAssigneeTree.js";
+const _sfc_main = {
+  __name: "FlowAssigneePickerPopup",
+  props: {
+    show: {
+      type: Boolean,
+      default: false
+    },
+    taskId: {
+      type: String,
+      default: ""
+    },
+    pickerIdentityId: {
+      type: String,
+      default: ""
+    },
+    pickerName: {
+      type: String,
+      default: ""
+    }
+  },
+  emits: ["update:pickerIdentityId", "update:pickerName", "cancel", "confirm"],
+  setup(__props, { emit: __emit }) {
+    const props = __props;
+    const emit = __emit;
+    const loading = common_vendor.ref(false);
+    const deptTree = common_vendor.ref([]);
+    const localPickerIdentityId = common_vendor.ref("");
+    const localPickerName = common_vendor.ref("");
+    const pickerDisplayName = common_vendor.computed(() => {
+      const user = components_flow_flowAssigneeUtils.findAssigneeUserInDeptTree(deptTree.value, localPickerIdentityId.value);
+      return user ? components_flow_flowAssigneeUtils.formatAssigneeDisplayName(user) : localPickerName.value;
+    });
+    const syncLocalPicker = () => {
+      localPickerIdentityId.value = props.pickerIdentityId || "";
+      localPickerName.value = props.pickerName || "";
+    };
+    const fetchAssigneeTree = async () => {
+      if (!props.taskId) {
+        deptTree.value = [];
+        return;
+      }
+      loading.value = true;
+      try {
+        const res = await request_api.getFlowApproverCandidates(props.taskId);
+        if (res.code === 0) {
+          deptTree.value = components_flow_flowAssigneeUtils.normalizeApproverDeptTree(res.data);
+        } else {
+          deptTree.value = [];
+          common_vendor.index.showToast({ title: res.msg || "获取处理人失败", icon: "none" });
+        }
+      } catch (error) {
+        common_vendor.index.__f__("error", "at components/flow/FlowAssigneePickerPopup.vue:93", "获取处理人失败:", error);
+        deptTree.value = [];
+        common_vendor.index.showToast({ title: "获取处理人失败", icon: "none" });
+      } finally {
+        loading.value = false;
+      }
+    };
+    common_vendor.watch(
+      () => props.show,
+      async (visible) => {
+        if (!visible)
+          return;
+        syncLocalPicker();
+        await fetchAssigneeTree();
+      }
+    );
+    const handleUserSelect = (user) => {
+      const identityId = components_flow_flowAssigneeUtils.resolveAssigneeIdentityId(user);
+      if (!identityId)
+        return;
+      localPickerIdentityId.value = identityId;
+      localPickerName.value = components_flow_flowAssigneeUtils.formatAssigneeDisplayName(user);
+      emit("update:pickerIdentityId", identityId);
+      emit("update:pickerName", localPickerName.value);
+    };
+    const handleCancel = () => {
+      emit("cancel");
+    };
+    const handleConfirm = () => {
+      if (!localPickerIdentityId.value) {
+        common_vendor.index.showToast({ title: "请选择下一步处理人", icon: "none" });
+        return;
+      }
+      const user = components_flow_flowAssigneeUtils.findAssigneeUserInDeptTree(deptTree.value, localPickerIdentityId.value);
+      if (!user) {
+        common_vendor.index.showToast({ title: "所选身份无效，请重新选择", icon: "none" });
+        return;
+      }
+      const name = components_flow_flowAssigneeUtils.formatAssigneeDisplayName(user);
+      emit("update:pickerIdentityId", localPickerIdentityId.value);
+      emit("update:pickerName", name);
+      emit("confirm", {
+        identityId: localPickerIdentityId.value,
+        name,
+        user
+      });
+    };
+    return (_ctx, _cache) => {
+      return common_vendor.e({
+        a: common_vendor.o(handleCancel),
+        b: __props.pickerIdentityId
+      }, __props.pickerIdentityId ? {
+        c: common_vendor.t(pickerDisplayName.value)
+      } : {}, {
+        d: loading.value
+      }, loading.value ? {} : !__props.taskId ? {} : deptTree.value.length === 0 ? {} : {
+        g: common_vendor.o(handleUserSelect),
+        h: common_vendor.p({
+          depts: deptTree.value,
+          ["selected-identity-id"]: __props.pickerIdentityId
+        })
+      }, {
+        e: !__props.taskId,
+        f: deptTree.value.length === 0,
+        i: common_vendor.o(handleCancel),
+        j: common_vendor.o(handleConfirm),
+        k: common_vendor.o(handleCancel),
+        l: common_vendor.p({
+          show: __props.show,
+          mode: "bottom",
+          round: "20"
+        }),
+        m: common_vendor.gei(_ctx, "")
+      });
+    };
+  }
+};
+const Component = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["__scopeId", "data-v-2685d664"]]);
+wx.createComponent(Component);
+//# sourceMappingURL=../../../.sourcemap/mp-weixin/components/flow/FlowAssigneePickerPopup.js.map

unpackage/dist/dev/mp-weixin/components/flow/FlowAssigneePickerPopup.json

@@ -0,0 +1,7 @@
+{
+  "component": true,
+  "usingComponents": {
+    "u-popup": "../../uni_modules/uview-plus/components/u-popup/u-popup",
+    "flow-assignee-tree": "./FlowAssigneeTree"
+  }
+}

unpackage/dist/dev/mp-weixin/components/flow/FlowAssigneePickerPopup.wxml

@@ -0,0 +1 @@
+<u-popup wx:if="{{l}}" u-s="{{['d']}}" bindclose="{{k}}" u-i="2685d664-0" bind:__l="__l" u-p="{{l}}" class="{{['data-v-2685d664', virtualHostClass]}}" virtualHostClass="{{['data-v-2685d664', virtualHostClass]}}" style="{{virtualHostStyle}}" virtualHostStyle="{{virtualHostStyle}}" hidden="{{virtualHostHidden || false}}" virtualHostHidden="{{virtualHostHidden || false}}" id="{{m}}" virtualHostId="{{m}}"><view class="user-popup data-v-2685d664"><view class="popup-header data-v-2685d664"><view class="popup-title text-bold data-v-2685d664">选择下一步处理人</view><view class="popup-close data-v-2685d664" bindtap="{{a}}">×</view></view><view wx:if="{{b}}" class="selected-summary data-v-2685d664"><text class="summary-label data-v-2685d664">已选：</text><text class="summary-text data-v-2685d664">{{c}}</text></view><scroll-view class="user-list-scroll data-v-2685d664" scroll-y><view wx:if="{{d}}" class="empty-tip data-v-2685d664">加载中...</view><view wx:elif="{{e}}" class="empty-tip data-v-2685d664">缺少任务ID，无法加载处理人</view><view wx:elif="{{f}}" class="empty-tip data-v-2685d664">暂无人员数据</view><flow-assignee-tree wx:else class="data-v-2685d664" virtualHostClass="data-v-2685d664" bindselect="{{g}}" u-i="2685d664-1,2685d664-0" bind:__l="__l" u-p="{{h||''}}"/></scroll-view><view class="popup-footer data-v-2685d664"><button class="btn-cancel data-v-2685d664" bindtap="{{i}}">取消</button><button class="btn-confirm bg-blue data-v-2685d664" bindtap="{{j}}">确定</button></view></view></u-popup>

unpackage/dist/dev/mp-weixin/components/flow/FlowAssigneePickerPopup.wxss

@@ -0,0 +1,96 @@
+/**
+ * 这里是uni-app内置的常用样式变量
+ *
+ * uni-app 官方扩展插件及插件市场（https://ext.dcloud.net.cn）上很多三方插件均使用了这些样式变量
+ * 如果你是插件开发者，建议你使用scss预处理，并在插件代码中直接使用这些变量（无需 import 这个文件），方便用户通过搭积木的方式开发整体风格一致的App
+ *
+ */
+/**
+ * 如果你是App开发者（插件使用者），你可以通过修改这些变量来定制自己的插件主题，实现自定义主题功能
+ *
+ * 如果你的项目同样使用了scss预处理，你也可以直接在你的 scss 代码中使用如下变量，同时无需 import 这个文件
+ */
+/* uni.scss */
+/* 颜色变量 */
+/* 行为相关颜色 */
+/* 文字基本颜色 */
+/* 背景颜色 */
+/* 边框颜色 */
+/* 尺寸变量 */
+/* 文字尺寸 */
+/* 图片尺寸 */
+/* Border Radius */
+/* 水平间距 */
+/* 垂直间距 */
+/* 透明度 */
+/* 文章场景相关 */
+.user-popup.data-v-2685d664 {
+  background: #fff;
+}
+.user-popup .popup-header.data-v-2685d664 {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  padding: 30rpx;
+  border-bottom: 1rpx solid #eee;
+}
+.user-popup .popup-header .popup-title.data-v-2685d664 {
+  font-size: 32rpx;
+  color: #333;
+}
+.user-popup .popup-header .popup-close.data-v-2685d664 {
+  font-size: 40rpx;
+  color: #999;
+  line-height: 1;
+}
+.user-popup .selected-summary.data-v-2685d664 {
+  padding: 16rpx 30rpx;
+  background: #f5f7fa;
+  border-bottom: 1rpx solid #eee;
+  font-size: 24rpx;
+  line-height: 1.5;
+}
+.user-popup .selected-summary .summary-label.data-v-2685d664 {
+  color: #909399;
+}
+.user-popup .selected-summary .summary-text.data-v-2685d664 {
+  color: #333;
+}
+.user-popup .user-list-scroll.data-v-2685d664 {
+  max-height: 600rpx;
+  box-sizing: border-box;
+}
+.user-popup .empty-tip.data-v-2685d664 {
+  padding: 80rpx 20rpx;
+  text-align: center;
+  color: #909399;
+  font-size: 26rpx;
+}
+.user-popup .popup-footer.data-v-2685d664 {
+  display: flex;
+  gap: 24rpx;
+  padding: 24rpx 30rpx;
+  padding-bottom: calc(24rpx + env(safe-area-inset-bottom));
+  background: #fff;
+}
+.user-popup .popup-footer button.data-v-2685d664 {
+  flex: 1;
+  height: 80rpx;
+  line-height: 80rpx;
+  border-radius: 40rpx;
+  font-size: 30rpx;
+  margin: 0;
+  padding: 0;
+}
+.user-popup .popup-footer button.data-v-2685d664::after {
+  border: none;
+}
+.user-popup .popup-footer .btn-cancel.data-v-2685d664 {
+  background: #fff;
+  color: #2667E9;
+  border: 2rpx solid #2667E9;
+}
+.user-popup .popup-footer .btn-confirm.data-v-2685d664 {
+  color: #fff;
+  border: none;
+}

unpackage/dist/dev/mp-weixin/components/flow/FlowAssigneeTree.js

@@ -0,0 +1,50 @@
+"use strict";
+const common_vendor = require("../../common/vendor.js");
+const components_flow_flowAssigneeUtils = require("./flowAssigneeUtils.js");
+const _sfc_main = {
+  __name: "FlowAssigneeTree",
+  props: {
+    depts: {
+      type: Array,
+      default: () => []
+    },
+    selectedIdentityId: {
+      type: String,
+      default: ""
+    }
+  },
+  emits: ["select"],
+  setup(__props, { emit: __emit }) {
+    const props = __props;
+    const emit = __emit;
+    const flatRows = common_vendor.computed(() => components_flow_flowAssigneeUtils.flattenApproverDeptTree(props.depts));
+    const handleSelect = (user) => {
+      emit("select", user);
+    };
+    return (_ctx, _cache) => {
+      return {
+        a: common_vendor.f(flatRows.value, (row, k0, i0) => {
+          return common_vendor.e({
+            a: row.type === "dept"
+          }, row.type === "dept" ? {
+            b: common_vendor.t(row.deptName),
+            c: `${row.level * 24 + 20}rpx`
+          } : common_vendor.e({
+            d: common_vendor.t(common_vendor.unref(components_flow_flowAssigneeUtils.formatAssigneeDisplayName)(row.user)),
+            e: String(__props.selectedIdentityId) === String(common_vendor.unref(components_flow_flowAssigneeUtils.resolveAssigneeIdentityId)(row.user))
+          }, String(__props.selectedIdentityId) === String(common_vendor.unref(components_flow_flowAssigneeUtils.resolveAssigneeIdentityId)(row.user)) ? {} : {}, {
+            f: String(__props.selectedIdentityId) === String(common_vendor.unref(components_flow_flowAssigneeUtils.resolveAssigneeIdentityId)(row.user)) ? 1 : "",
+            g: `${row.level * 24 + 20}rpx`,
+            h: common_vendor.o(($event) => handleSelect(row.user), row.key)
+          }), {
+            i: row.key
+          });
+        }),
+        b: common_vendor.gei(_ctx, "")
+      };
+    };
+  }
+};
+const Component = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["__scopeId", "data-v-1fe646a4"]]);
+wx.createComponent(Component);
+//# sourceMappingURL=../../../.sourcemap/mp-weixin/components/flow/FlowAssigneeTree.js.map

unpackage/dist/dev/mp-weixin/components/flow/FlowAssigneeTree.json

@@ -0,0 +1,4 @@
+{
+  "component": true,
+  "usingComponents": {}
+}

unpackage/dist/dev/mp-weixin/components/flow/FlowAssigneeTree.wxml

@@ -0,0 +1 @@
+<view class="{{['assignee-tree', 'data-v-1fe646a4', virtualHostClass]}}" style="{{virtualHostStyle}}" hidden="{{virtualHostHidden || false}}" id="{{b}}"><block wx:for="{{a}}" wx:for-item="row" wx:key="i"><view wx:if="{{row.a}}" class="dept-node data-v-1fe646a4" style="{{'padding-left:' + row.c}}"><text class="dept-name data-v-1fe646a4">{{row.b}}</text></view><view wx:else class="{{['user-item', 'data-v-1fe646a4', row.f && 'active']}}" style="{{'padding-left:' + row.g}}" bindtap="{{row.h}}"><text class="user-item-text data-v-1fe646a4">{{row.d}}</text><text wx:if="{{row.e}}" class="cuIcon-check text-blue data-v-1fe646a4"></text></view></block></view>

unpackage/dist/dev/mp-weixin/components/flow/FlowAssigneeTree.wxss

@@ -0,0 +1,51 @@
+/**
+ * 这里是uni-app内置的常用样式变量
+ *
+ * uni-app 官方扩展插件及插件市场（https://ext.dcloud.net.cn）上很多三方插件均使用了这些样式变量
+ * 如果你是插件开发者，建议你使用scss预处理，并在插件代码中直接使用这些变量（无需 import 这个文件），方便用户通过搭积木的方式开发整体风格一致的App
+ *
+ */
+/**
+ * 如果你是App开发者（插件使用者），你可以通过修改这些变量来定制自己的插件主题，实现自定义主题功能
+ *
+ * 如果你的项目同样使用了scss预处理，你也可以直接在你的 scss 代码中使用如下变量，同时无需 import 这个文件
+ */
+/* uni.scss */
+/* 颜色变量 */
+/* 行为相关颜色 */
+/* 文字基本颜色 */
+/* 背景颜色 */
+/* 边框颜色 */
+/* 尺寸变量 */
+/* 文字尺寸 */
+/* 图片尺寸 */
+/* Border Radius */
+/* 水平间距 */
+/* 垂直间距 */
+/* 透明度 */
+/* 文章场景相关 */
+.dept-node.data-v-1fe646a4 {
+  padding: 20rpx 20rpx 12rpx;
+  font-size: 26rpx;
+  color: #909399;
+  line-height: 1.4;
+}
+.dept-name.data-v-1fe646a4 {
+  font-weight: 600;
+}
+.user-item.data-v-1fe646a4 {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  padding: 24rpx 20rpx;
+  border-bottom: 1rpx solid #f5f5f5;
+}
+.user-item.active .user-item-text.data-v-1fe646a4 {
+  color: #2667E9;
+  font-weight: 600;
+}
+.user-item .user-item-text.data-v-1fe646a4 {
+  flex: 1;
+  font-size: 28rpx;
+  color: #333;
+}

unpackage/dist/dev/mp-weixin/components/flow/flowAssigneeUtils.js

@@ -0,0 +1,85 @@
+"use strict";
+const resolveAssigneeIdentityId = (user) => {
+  if (!user)
+    return "";
+  const id = user.identityId ?? user.userIdentityId ?? user.userId ?? "";
+  return id === "" || id == null ? "" : String(id);
+};
+const getAssigneeItemKey = (user) => {
+  const identityId = resolveAssigneeIdentityId(user);
+  if (identityId)
+    return `identity-${identityId}`;
+  return `user-${user.userId || user.nickName || ""}`;
+};
+const formatAssigneeDisplayName = (user) => {
+  if (!user)
+    return "";
+  if (user.identityName) {
+    return `${user.nickName || user.userName || ""}_${user.identityName}`;
+  }
+  if (user.postName) {
+    return `${user.nickName || user.userName || ""}_${user.postName}`;
+  }
+  return user.nickName || user.userName || user.name || "未知人员";
+};
+const normalizeApproverDeptTree = (data) => {
+  if (!data)
+    return [];
+  if (Array.isArray(data))
+    return data;
+  if (Array.isArray(data.records))
+    return data.records;
+  if (Array.isArray(data.list))
+    return data.list;
+  return [];
+};
+const findAssigneeUserInDeptTree = (depts, identityId) => {
+  var _a;
+  if (!identityId || !Array.isArray(depts))
+    return null;
+  for (const dept of depts) {
+    const user = (dept.users || []).find(
+      (item) => String(resolveAssigneeIdentityId(item)) === String(identityId)
+    );
+    if (user)
+      return user;
+    if ((_a = dept.children) == null ? void 0 : _a.length) {
+      const found = findAssigneeUserInDeptTree(dept.children, identityId);
+      if (found)
+        return found;
+    }
+  }
+  return null;
+};
+const flattenApproverDeptTree = (depts, level = 0) => {
+  var _a;
+  const rows = [];
+  if (!Array.isArray(depts))
+    return rows;
+  for (const dept of depts) {
+    rows.push({
+      type: "dept",
+      key: `dept-${dept.deptId ?? dept.deptName ?? level}`,
+      deptName: dept.deptName || "",
+      level
+    });
+    for (const user of dept.users || []) {
+      rows.push({
+        type: "user",
+        key: getAssigneeItemKey(user),
+        user,
+        level: level + 1
+      });
+    }
+    if ((_a = dept.children) == null ? void 0 : _a.length) {
+      rows.push(...flattenApproverDeptTree(dept.children, level + 1));
+    }
+  }
+  return rows;
+};
+exports.findAssigneeUserInDeptTree = findAssigneeUserInDeptTree;
+exports.flattenApproverDeptTree = flattenApproverDeptTree;
+exports.formatAssigneeDisplayName = formatAssigneeDisplayName;
+exports.normalizeApproverDeptTree = normalizeApproverDeptTree;
+exports.resolveAssigneeIdentityId = resolveAssigneeIdentityId;
+//# sourceMappingURL=../../../.sourcemap/mp-weixin/components/flow/flowAssigneeUtils.js.map