@utogether/udp-core 2.0.0-beta.6 → 2.0.0-beta.7

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@utogether/udp-core",
   "private": false,
-  "version": "2.0.0-beta.6",
+  "version": "2.0.0-beta.7",
   "description": "",
   "type": "module",
   "main1": "index.ts",

package/src/components/SuScrollTree/ScrollPanel.vue

@@ -1,170 +1,176 @@
-<template>
-  <div class="u-scroll-panel" @click.prevent="handleClickPanel">
-    <div class="u-panel-header">
-      <h2>{{ title }}</h2>
-      <ut-button v-if="showAllButton" content="BtnExpand" @click="handleExpand(data, true)" />
-      <ut-button v-if="showAllButton" status="warning" content="BtnCollapse" @click="handleExpand(data, false)" />
-      <vxe-button icon="vxe-icon-refresh" @click="onRefresh" />
-    </div>
-    <div class="u-panel-content system-scrollbar">
-      <el-tree
-        ref="tree"
-        :data="data"
-        :props="treeOtions"
-        :expand-on-click-node="false"
-        style="background-color: #fff"
-        class="u-tree-panel"
-        node-key="id"
-        highlight-current
-        @node-click="handleNodeClick"
-      >
-        <template #default="{ node }">
-          <span class="prefix" :class="{ 'is-leaf': node.isLeaf }">
-            <i class="ri-folder-2-fill ri-lg mr-1" style="color: #fadb14" />
-          </span>
-          <span>{{ node.label }}</span>
-        </template>
-      </el-tree>
-    </div>
-  </div>
-</template>
-
-<script lang="ts" setup>
-import { getServiceApi } from '../../api';
-import type { Ref } from 'vue';
-import { ref, inject, watch, nextTick } from 'vue';
-
-interface IProps {
-  title: string;
-  url: string;
-  showAllButton?: boolean;
-  treeOtions: Object;
-  defaultParams?: Object;
-}
-const props = withDefaults(defineProps<IProps>(), {
-  treeOtions: () => {
-    return {
-      children: 'children',
-      label: 'label'
-    };
-  },
-  defaultParams: () => {
-    return {};
-  },
-  showAllButton: false
-});
-
-const data = ref<any>([]);
-const tree: Ref<any | null> = ref(null);
-// 当前激活item
-const active: IRecord = inject('active');
-// tree面板变更
-const scrollPanelChange: IRecord = inject('scrollPanelChange');
-// tree 列表
-const treeList: IRecord = inject('treeList');
-
-watch(
-  () => scrollPanelChange.value,
-  () => {
-    scrollPanelChange.value && getDataList();
-  }
-);
-
-const getDataList = async (params = {}) => {
-  const query = Object.assign(params, props.defaultParams);
-  const serverData = (await getServiceApi().get(props.url, query)) as IResponseData;
-  data.value = serverData.list || serverData;
-  treeList.value = serverData.list || serverData;
-  active.value = serverData.list ? serverData.list[0] : serverData[0];
-  nextTick(() => {
-    tree.value && tree?.value.setCurrentKey(active.value?.id || '');
-  });
-  scrollPanelChange.value = false;
-};
-const handleNodeClick = (row: any) => {
-  active.value = row;
-};
-
-const handleClickPanel = () => {
-  active.value = {};
-};
-
-const handleExpand = (array, expanded) => {
-  array.forEach(el => {
-    tree.value.store.nodesMap[el.id].expanded = expanded;
-    if (el.children?.length) {
-      handleExpand(el.children, expanded);
-    }
-  });
-  console.log('[ tree.value ] >', tree.value);
-};
-
-const onRefresh = () => {
-  getDataList();
-};
-defineExpose({
-  onRefresh
-});
-getDataList();
-</script>
-
-<style lang="scss">
-.u-scroll-panel {
-  display: flex;
-  flex-direction: column;
-  width: 100%;
-  height: 100%;
-  background: #fff;
-
-  .u-panel-header {
-    display: flex;
-    align-items: center;
-    padding: 10px;
-    border-bottom: 1px solid #eee;
-
-    h2 {
-      // display: box;
-      height: 30px;
-      padding: 0;
-      margin: 0;
-      margin-right: 20px;
-      overflow: hidden;
-      -webkit-line-clamp: 1;
-      font-size: 14px;
-      line-height: 30px;
-      -webkit-box-orient: vertical;
-    }
-
-    .el-input {
-      flex: 1;
-    }
-  }
-
-  .u-panel-content {
-    flex: 1;
-    overflow: auto;
-  }
-
-  .u-tree-panel {
-    height: 100%; // 0630
-    :deep(.el-tree-node__content) {
-      height: 36px;
-    }
-
-    :deep(.el-tree-node.is-current > .el-tree-node__content) {
-      background-color: rgb(64 158 255 / 40%);
-    }
-
-    :deep(.el-tree-node > .el-tree-node__content) {
-      transition: 0.2s;
-    }
-  }
-
-  .el-vl__window {
-    height: 360px !important;
-    // &:first-child {
-    //   height: 100% !important;
-    // }
-  }
-}
-</style>
+<template>
+  <div class="u-scroll-panel" @click.prevent="handleClickPanel">
+    <div class="u-panel-header">
+      <h2>{{ title }}</h2>
+      <ut-button v-if="showAllButton" content="BtnExpand" @click="handleExpand(data, true)" />
+      <ut-button v-if="showAllButton" status="warning" content="BtnCollapse" @click="handleExpand(data, false)" />
+      <vxe-button icon="vxe-icon-refresh" @click="onRefresh" />
+    </div>
+    <div class="u-panel-content system-scrollbar">
+      <el-tree
+        ref="tree"
+        :data="data"
+        :props="treeOtions"
+        :expand-on-click-node="false"
+        style="background-color: #fff"
+        class="u-tree-panel"
+        node-key="id"
+        highlight-current
+        @node-click="handleNodeClick"
+      >
+        <template #default="{ node }">
+          <span class="prefix" :class="{ 'is-leaf': node.isLeaf }">
+            <i class="ri-folder-2-fill ri-lg mr-1" style="color: #fadb14" />
+          </span>
+          <span>{{ node.label }}</span>
+        </template>
+      </el-tree>
+    </div>
+  </div>
+</template>
+
+<script lang="ts" setup>
+import { getServiceApi } from '../../api';
+import type { Ref } from 'vue';
+import { ref, inject, watch, nextTick } from 'vue';
+
+interface IProps {
+  title: string;
+  url: string;
+  showAllButton?: boolean;
+  initLoadAll?: boolean;
+  treeOtions: Object;
+  defaultParams?: Object;
+}
+const props = withDefaults(defineProps<IProps>(), {
+  treeOtions: () => {
+    return {
+      children: 'children',
+      label: 'label'
+    };
+  },
+  defaultParams: () => {
+    return {};
+  },
+  showAllButton: false,
+  initLoadAll: false
+});
+
+const data = ref<any>([]);
+const tree: Ref<any | null> = ref(null);
+// 当前激活item
+const active: IRecord = inject('active');
+// tree面板变更
+const scrollPanelChange: IRecord = inject('scrollPanelChange');
+// tree 列表
+const treeList: IRecord = inject('treeList');
+
+watch(
+  () => scrollPanelChange.value,
+  () => {
+    scrollPanelChange.value && getDataList();
+  }
+);
+
+const getDataList = async (params = {}) => {
+  const query = Object.assign(params, props.defaultParams);
+  const serverData = (await getServiceApi().get(props.url, query)) as IResponseData;
+  data.value = serverData.list || serverData;
+  treeList.value = serverData.list || serverData;
+  if (props.initLoadAll) {
+    active.value = {};
+  } else {
+    active.value = serverData.list ? serverData.list[0] : serverData[0];
+  }
+  nextTick(() => {
+    tree.value && tree?.value.setCurrentKey(active.value?.id || '');
+  });
+  scrollPanelChange.value = false;
+};
+const handleNodeClick = (row: any) => {
+  active.value = row;
+};
+
+const handleClickPanel = () => {
+  active.value = {};
+};
+
+const handleExpand = (array, expanded) => {
+  array.forEach(el => {
+    tree.value.store.nodesMap[el.id].expanded = expanded;
+    if (el.children?.length) {
+      handleExpand(el.children, expanded);
+    }
+  });
+  console.log('[ tree.value ] >', tree.value);
+};
+
+const onRefresh = () => {
+  getDataList();
+};
+defineExpose({
+  onRefresh
+});
+getDataList();
+</script>
+
+<style lang="scss">
+.u-scroll-panel {
+  display: flex;
+  flex-direction: column;
+  width: 100%;
+  height: 100%;
+  background: #fff;
+
+  .u-panel-header {
+    display: flex;
+    align-items: center;
+    padding: 10px;
+    border-bottom: 1px solid #eee;
+
+    h2 {
+      // display: box;
+      height: 30px;
+      padding: 0;
+      margin: 0;
+      margin-right: 20px;
+      overflow: hidden;
+      -webkit-line-clamp: 1;
+      font-size: 14px;
+      line-height: 30px;
+      -webkit-box-orient: vertical;
+    }
+
+    .el-input {
+      flex: 1;
+    }
+  }
+
+  .u-panel-content {
+    flex: 1;
+    overflow: auto;
+  }
+
+  .u-tree-panel {
+    height: 100%; // 0630
+    :deep(.el-tree-node__content) {
+      height: 36px;
+    }
+
+    :deep(.el-tree-node.is-current > .el-tree-node__content) {
+      background-color: rgb(64 158 255 / 40%);
+    }
+
+    :deep(.el-tree-node > .el-tree-node__content) {
+      transition: 0.2s;
+    }
+  }
+
+  .el-vl__window {
+    height: 360px !important;
+    // &:first-child {
+    //   height: 100% !important;
+    // }
+  }
+}
+</style>

package/src/plugins/i18n/zh.ts

@@ -188,6 +188,7 @@ export default {
     enable: '启用',
     flowDesign: '流程设计',
     resetPassword: '重置密码',
+    bindUser: '关联用户',
 
     bankinfo: '银行账号'
   },

package/src/views/organization/staff/Staff.vue

@@ -1,58 +1,59 @@
-<!--
- * @Author: wei.li
- * @Date: 2021-11-17 16:42:14
- * @LastEditors: wei.li
- * @LastEditTime: 2021-12-09 13:38:41
- * @Description: file content
--->
-<template>
-  <div class="u-content-panel">
-    <div class="u-left-panel">
-      <ScrollPane
-        :title="$t('department')"
-        url="/uums/department/treeDepartment"
-        :tree-otions="{ children: 'children', label: 'deptName' }"
-      />
-    </div>
-    <div class="content">
-      <StaffPanel />
-    </div>
-  </div>
-</template>
-<script lang="ts">
-export default { name: 'StaffPanel' };
-</script>
-<script lang="ts" setup>
-import { ref, provide } from 'vue';
-import ScrollPane from '../../../components/SuScrollTree/ScrollPanel.vue';
-import StaffPanel from './StaffPanel.vue';
-
-const scrollPanelChange: any = ref(false);
-const treeList: any = ref([]);
-const active: any = ref({});
-
-provide('scrollPanelChange', scrollPanelChange);
-provide('active', active);
-provide('treeList', treeList);
-</script>
-
-<style lang="scss" scoped>
-.u-content-panel {
-  box-sizing: border-box;
-  display: flex;
-  width: 100%;
-  height: 84vh;
-  padding: 2px;
-
-  .u-left-panel {
-    width: 250px;
-  }
-
-  .content {
-    flex: 1;
-    width: calc(100% - 250px);
-    height: 82vh;
-    margin-left: 10px;
-  }
-}
-</style>
+<!--
+ * @Author: wei.li
+ * @Date: 2021-11-17 16:42:14
+ * @LastEditors: wei.li
+ * @LastEditTime: 2021-12-09 13:38:41
+ * @Description: file content
+-->
+<template>
+  <div class="u-content-panel">
+    <div class="u-left-panel">
+      <ScrollPane
+        :title="$t('department')"
+        :init-load-all="true"
+        :tree-otions="{ children: 'children', label: 'deptName' }"
+        url="/uums/department/treeDepartment"
+      />
+    </div>
+    <div class="content">
+      <StaffPanel />
+    </div>
+  </div>
+</template>
+<script lang="ts">
+export default { name: 'StaffPanel' };
+</script>
+<script lang="ts" setup>
+import { ref, provide } from 'vue';
+import ScrollPane from '../../../components/SuScrollTree/ScrollPanel.vue';
+import StaffPanel from './StaffPanel.vue';
+
+const scrollPanelChange: any = ref(false);
+const treeList: any = ref([]);
+const active: any = ref({});
+
+provide('scrollPanelChange', scrollPanelChange);
+provide('active', active);
+provide('treeList', treeList);
+</script>
+
+<style lang="scss" scoped>
+.u-content-panel {
+  box-sizing: border-box;
+  display: flex;
+  width: 100%;
+  height: 84vh;
+  padding: 2px;
+
+  .u-left-panel {
+    width: 250px;
+  }
+
+  .content {
+    flex: 1;
+    width: calc(100% - 250px);
+    height: 82vh;
+    margin-left: 10px;
+  }
+}
+</style>

package/src/views/organization/staff/StaffPanel.vue

@@ -2,7 +2,7 @@
  * @Author: wei.li
  * @Date: 2021-11-17 16:42:14
  * @LastEditors: levi7754 levi7754@163.com
- * @LastEditTime: 2026-01-06 11:06:49
+ * @LastEditTime: 2026-01-16 15:37:47
  * @Description: 员工管理
 -->
 
@@ -48,8 +48,8 @@ const url = '/uums/employee';
 
 watch(
   () => active.value,
-  () => {
-    data.fetchExtParam = { departmentId: null };
+  newVal => {
+    data.fetchExtParam = { departmentId: newVal?.id };
     nextTick(() => {
       xgrid.value.refreshData();
     });
@@ -60,6 +60,7 @@ const buttons = [
   { code: 'sync', auth: 'wechat', status: 'success', icon: 'ri-refresh-line' },
   { code: 'sync', auth: 'dingding', status: 'success', icon: 'ri-refresh-line' },
   { code: 'sync', auth: 'OA', status: 'success', icon: 'ri-refresh-line' },
+  { code: 'bindUser', auth: 'bind', status: 'warning', icon: 'ri-bring-to-front' },
   { code: 'del', auth: '/' }
 ];
 
@@ -139,8 +140,21 @@ const handleSync = async () => {
   xgrid.value.refreshData();
 };
 
+const handleBind = async () => {
+  const selectRecords = xgrid.value.getInstance().getCheckboxRecords();
+  if (!selectRecords.length) {
+    return;
+  }
+  xgrid.value.showLoading();
+  const [err] = await to(getServiceApi().post('/uums/employee/bindUser', selectRecords));
+  xgrid.value.hiddenLoading();
+  if (err) return;
+  xgrid.value.refreshData();
+};
+
 const onButtonClick = code => {
   code === 'sync' && handleSync();
+  code === 'bindUser' && handleBind();
 };
 
 const callback = {

package/src/views/system/layout/layout-home.vue

@@ -23,7 +23,7 @@
       ref="ygrid"
       :columns="subColumns"
       mode="form"
-      url="/ucrm/sysHomeRole"
+      url="/upfm/sysHomeRole"
       :title="$t('message.title.layoutRole', { name: data.title })"
       width="50%"
       @buttonClick="onButtonClick"
@@ -70,7 +70,7 @@ const showRole = ref(false);
 
 const data = ref<IRecord>({});
 
-const url = '/ucrm/sysHomeConfig';
+const url = '/upfm/sysHomeConfig';
 
 const items = [
   { field: 'code', title: 'message.udp.componentCode' },
@@ -208,7 +208,7 @@ const onConfirm = async records => {
     return item;
   });
   xmodal.value.showLoading();
-  const [err] = await to(getServiceApi().post('/ucrm/sysHomeRole', body));
+  const [err] = await to(getServiceApi().post('/upfm/sysHomeRole', body));
   if (!err) {
     successMessage();
     ygrid.value.refreshData();

package/src/views/ufile/aggregation/File.vue

@@ -44,9 +44,7 @@ const columns = [
     slots: {
       default: ({ row }) => {
         if (['png', 'jpeg', 'jpg'].includes(row.fileExtend)) {
-          return [
-            <ut-button content="review" icon="ri-search-line-plus" onTap={() => handlePreview(row)} />
-          ];
+          return [<ut-button content="review" icon="ri-search-line-plus" onTap={() => handlePreview(row)} />];
         } else {
           return [
             <ut-button

package/src/views/uhome/su-welcome.vue

@@ -2,7 +2,7 @@
  * @Author: levi7754 levi7754@163.com
  * @Date: 2023-11-02 10:04:05
  * @LastEditors: levi7754 levi7754@163.com
- * @LastEditTime: 2026-01-07 10:56:02
+ * @LastEditTime: 2026-01-19 10:48:37
  * @FilePath: /front-web-mes/src/views/uhome/su-welcome.vue
  * @Description: 欢迎页面
 -->
@@ -177,7 +177,7 @@ const getUserLog = () => {
 const getLayoutList = async () => {
   const api = getServiceApi();
   const [err, res]: any = await to(
-    api.get('/ucrm/sysHomeConfig', { pageSize: 1000, pageNum: 1, enabled: '1', isRoleFilter: 'Y' })
+    api.get('/upfm/sysHomeConfig', { pageSize: 1000, pageNum: 1, enabled: '1', isRoleFilter: 'Y' })
   );
   if (err) return;
   systemLayout;

package/dist/Staff-CQqKHfmG.js

@@ -1,25 +0,0 @@
-import { defineComponent as l, ref as e, provide as t, createElementBlock as _, openBlock as i, createElementVNode as n, createVNode as a } from "vue";
-import { _ as m } from "./ScrollPanel.vue_vue_type_style_index_0_lang-BvNAonbh.js";
-import { _ as d } from "./StaffPanel.vue_vue_type_script_setup_true_lang-B3j8x4MN.js";
-import { _ as p } from "./index-CPKIQXdI.js";
-const f = { class: "u-content-panel" }, u = { class: "u-left-panel" }, h = { class: "content" }, v = { name: "StaffPanel" }, C = /* @__PURE__ */ l({
-  ...v,
-  setup(N) {
-    const o = e(!1), s = e([]), c = e({});
-    return t("scrollPanelChange", o), t("active", c), t("treeList", s), (r, P) => (i(), _("div", f, [
-      n("div", u, [
-        a(m, {
-          title: r.$t("department"),
-          url: "/uums/department/treeDepartment",
-          "tree-otions": { children: "children", label: "deptName" }
-        }, null, 8, ["title"])
-      ]),
-      n("div", h, [
-        a(d)
-      ])
-    ]));
-  }
-}), B = /* @__PURE__ */ p(C, [["__scopeId", "data-v-021a8a4e"]]);
-export {
-  B as default
-};