@utogether/udp-core 1.0.0 → 1.0.1-beta.2

package/src/views/system/menu/SystemMenu.vue

@@ -1,191 +1,197 @@
-<template>
-  <div class="page-content">
-    <ut-grid
-      ref="xgrid"
-      :tree-config="{
-        childrenField: 'children',
-        lazy: true,
-        hasChild: 'hasChildren',
-        loadMethod: loadChildrenMethod,
-        iconOpen: 'ri-checkbox-indeterminate-line ri-lg',
-        iconClose: 'ri-add-box-line ri-lg'
-      }"
-      :columns="columns"
-      :url="url"
-      :stripe="false"
-      mode="form"
-      @toolbarButtonClick="handleToolClick"
-    />
-    <MenuInfo
-      :show="data.showDrawer"
-      :record="data.record"
-      :data-status="data.dataStatus"
-      @onClose="onClose"
-    />
-    <AuthorityPanel :show="data.showAuthority" :record="data.record" @onClose="onClose" />
-  </div>
-</template>
-
-<script lang="tsx">
-export default { name: 'SystemMenu' };
-</script>
-<script setup lang="tsx">
-import { useI18n } from 'vue-i18n';
-import { ref, reactive } from 'vue';
-import MenuInfo from './menuInfo.vue';
-import AuthorityPanel from './AuthorityPanel.vue';
-import { clone } from 'xe-utils';
-import to from 'await-to-js';
-import { VxeUI } from 'vxe-pc-ui';
-import { useRender } from '@utogether/utils';
-import { getServiceApi } from '../../../api';
-
-const data = reactive<IRecord>({
-  record: {},
-  dataList: [],
-  submitLoading: false,
-  showDrawer: false,
-  dataStatus: '',
-  total: 0,
-  listQuery: {
-    pageSize: 10,
-    pageNum: 1
-  }
-});
-
-const { t } = useI18n();
-
-const renderHook = useRender();
-
-const serviceApi = getServiceApi();
-
-const xgrid = ref(null);
-
-const url = '/uums/menu';
-
-// const buttons = [{ code: 'add', status: 'u-cyan', icon: 'plus', auth: 'add' }];
-
-const columns = [
-  { type: 'checkbox', width: 50, align: 'center' },
-  { field: 'menuName', width: 180, treeNode: true },
-  { field: 'menuNameEn', width: 140 },
-  { field: 'sort', width: 70 },
-  { field: 'menuCode', width: 140 },
-  { field: 'permissionCode', minWidth: 180 },
-  {
-    field: 'menuCategory',
-    title: 'message.menuType',
-    formatter: ['formatDict', 'SU.MENU.TYPE'],
-    width: 100
-  },
-  { field: 'enabled', width: 80, cellRender: renderHook.renderEnabled(handleUpdate) },
-  {
-    field: 'operate',
-    width: 140,
-    fixed: 'right',
-    slots: {
-      default: ({ row }) => {
-        const type = row.menuType;
-        const addCmp = (
-          <ut-button status="u-cyan" icon="ri-add-fill" content="add" onTap={() => handleAdd(row)} />
-        );
-        const authCmp = (
-          <ut-button icon="ri-lock-fill" content="auth" onTap={() => handleAuthorityPanel(row)} />
-        );
-        return [
-          <>
-            {!type ? (
-              <>
-                <ut-button
-                  status="success"
-                  icon="ri-edit-box-line"
-                  content="edit"
-                  onTap={() => handleEdit(row)}
-                />
-                {['0', '5'].includes(row.menuCategory) ? addCmp : authCmp}
-              </>
-            ) : null}
-          </>
-        ];
-      }
-    }
-  }
-];
-
-// const resetListQuery = () => {
-//   data.listQuery.pageSize = 99;
-//   data.listQuery.pageNum = 1;
-//   getDataList();
-// };
-
-// const getDataList = async () => {
-//   const res = (await serviceApi('sys/listMenus', data.listQuery)) as IResponseData;
-//   data.dataList = res.list;
-//   data.total = res.total;
-// };
-
-const handleToolClick = ({ code }) => {
-  code === 'add' && handleAdd();
-  code === 'del' && handleDel();
-};
-
-// 异步加载子节点
-const loadChildrenMethod = async ({ row }: any) => {
-  const data = (await serviceApi.get(url, { parentId: row.id })) as IResponseData;
-  return new Promise(resolve => {
-    resolve(data.list);
-  });
-};
-
-// 新增子类型
-// menuType:保持原有不懂， 0:菜单 1，数据权限
-// 新增menuCategory: 0、根目录 1、菜单 2、内部链接3、外部链接
-const handleAdd = (record?: IRecord) => {
-  data.showDrawer = true;
-  data.dataStatus = 'add';
-  data.record.dispalyCode = record?.permissionCode; // 前缀
-  data.record.permissionCode = record?.permissionCode;
-  // data.record.menuType = !record || !record.parentId ? '0' : '1';
-  data.record.menuType = '0';
-  data.record.menuCategory = !record ? '0' : '';
-  data.record.parentId = record?.id;
-  data.record.hasChildren = record?.hasChildren;
-};
-
-// 编辑
-const handleEdit = (record: IRecord) => {
-  data.showDrawer = true;
-  data.dataStatus = 'update';
-  data.record = clone(record, true);
-  data.record.menuType = data.record.menuType.toString();
-  data.record.dispalyCode = record.permissionCode;
-};
-
-// 启用/禁用
-async function handleUpdate({ row }) {
-  await serviceApi.put(url, [row]);
-  xgrid.value.refreshData();
-}
-// 删除
-const handleDel = async () => {
-  const type = await VxeUI.modal.confirm(t('message.delRecord'));
-  const records = xgrid.value.getInstance().getCheckboxRecords();
-  if (type === 'confirm') {
-    const [err] = await to(serviceApi.delete(url, records));
-  }
-};
-
-const handleAuthorityPanel = record => {
-  data.showAuthority = true;
-  data.dataStatus = 'update';
-  data.record = clone(record, true);
-  data.record.menuType = data.record.menuType.toString();
-  data.record.dispalyCode = record.permissionCode;
-};
-
-const onClose = () => {
-  data.record = {};
-  data.showDrawer = false;
-  data.showAuthority = false;
-};
-</script>
+<template>
+  <div class="page-content">
+    <ut-grid
+      ref="xgrid"
+      :tree-config="{
+        childrenField: 'children',
+        lazy: true,
+        hasChild: 'hasChildren',
+        loadMethod: loadChildrenMethod,
+        iconOpen: 'ri-checkbox-indeterminate-line ri-lg',
+        iconClose: 'ri-add-box-line ri-lg'
+      }"
+      :columns="columns"
+      :url="url"
+      :stripe="false"
+      mode="form"
+      @toolbarButtonClick="handleToolClick"
+    />
+    <MenuInfo
+      :show="data.showDrawer"
+      :record="data.record"
+      :data-status="data.dataStatus"
+      @close="onClose"
+    />
+    <AuthorityPanel :show="data.showAuthority" :record="data.record" @close="onClose" />
+  </div>
+</template>
+
+<script lang="tsx">
+export default { name: 'SystemMenu' };
+</script>
+<script setup lang="tsx">
+import { useI18n } from 'vue-i18n';
+import { ref, reactive } from 'vue';
+import MenuInfo from './menuInfo.vue';
+import AuthorityPanel from './AuthorityPanel.vue';
+import { clone } from 'xe-utils';
+import to from 'await-to-js';
+import { VxeUI } from 'vxe-pc-ui';
+import { useRender } from '@utogether/utils';
+import { getServiceApi } from '../../../api';
+
+const data = reactive<IRecord>({
+  record: {},
+  dataList: [],
+  submitLoading: false,
+  showDrawer: false,
+  dataStatus: '',
+  total: 0,
+  listQuery: {
+    pageSize: 10,
+    pageNum: 1
+  }
+});
+
+const { t } = useI18n();
+
+const renderHook = useRender();
+
+const serviceApi = getServiceApi();
+
+const xgrid = ref(null);
+
+const url = '/uums/menu';
+
+let row;
+
+// const buttons = [{ code: 'add', status: 'u-cyan', icon: 'plus', auth: 'add' }];
+
+const columns = [
+  { type: 'checkbox', width: 50, align: 'center' },
+  { field: 'menuName', width: 180, treeNode: true },
+  { field: 'menuNameEn', width: 140 },
+  { field: 'sort', width: 70 },
+  { field: 'menuCode', width: 140 },
+  { field: 'permissionCode', minWidth: 180 },
+  {
+    field: 'menuCategory',
+    title: 'message.menuType',
+    formatter: ['formatDict', 'SU.MENU.TYPE'],
+    width: 100
+  },
+  { field: 'enabled', width: 80, cellRender: renderHook.renderEnabled(handleUpdate) },
+  {
+    field: 'operate',
+    width: 140,
+    fixed: 'right',
+    slots: {
+      default: ({ row }) => {
+        const type = row.menuType;
+        const addCmp = (
+          <ut-button status="u-cyan" icon="ri-add-fill" content="add" onTap={() => handleAdd(row)} />
+        );
+        const authCmp = (
+          <ut-button icon="ri-lock-fill" content="auth" onTap={() => handleAuthorityPanel(row)} />
+        );
+        return [
+          <>
+            {!type ? (
+              <>
+                <ut-button
+                  status="success"
+                  icon="ri-edit-box-line"
+                  content="edit"
+                  onTap={() => handleEdit(row)}
+                />
+                {['0', '5'].includes(row.menuCategory) ? addCmp : authCmp}
+              </>
+            ) : null}
+          </>
+        ];
+      }
+    }
+  }
+];
+
+// const resetListQuery = () => {
+//   data.listQuery.pageSize = 99;
+//   data.listQuery.pageNum = 1;
+//   getDataList();
+// };
+
+// const getDataList = async () => {
+//   const res = (await serviceApi('sys/listMenus', data.listQuery)) as IResponseData;
+//   data.dataList = res.list;
+//   data.total = res.total;
+// };
+
+const handleToolClick = ({ code }) => {
+  code === 'add' && handleAdd();
+  code === 'del' && handleDel();
+};
+
+// 异步加载子节点
+const loadChildrenMethod = async ({ row }: any) => {
+  const data = (await serviceApi.get(url, { parentId: row.id })) as IResponseData;
+  return new Promise(resolve => {
+    resolve(data.list);
+  });
+};
+
+// 新增子类型
+// menuType:保持原有不懂， 0:菜单 1，数据权限
+// 新增menuCategory: 0、根目录 1、菜单 2、内部链接3、外部链接
+const handleAdd = (record?: IRecord) => {
+  data.showDrawer = true;
+  data.dataStatus = 'add';
+  data.record.dispalyCode = record?.permissionCode; // 前缀
+  data.record.permissionCode = record?.permissionCode;
+  // data.record.menuType = !record || !record.parentId ? '0' : '1';
+  data.record.menuType = '0';
+  data.record.menuCategory = !record ? '0' : '';
+  data.record.parentId = record?.id;
+  data.record.hasChildren = record?.hasChildren;
+  data.record.children = data.record.children || [];
+  console.log(data.record);
+  row = record;
+};
+
+// 编辑
+const handleEdit = (record: IRecord) => {
+  data.showDrawer = true;
+  data.dataStatus = 'update';
+  data.record = clone(record, true);
+  data.record.menuType = data.record.menuType.toString();
+  data.record.dispalyCode = record.permissionCode;
+};
+
+// 启用/禁用
+async function handleUpdate({ row }) {
+  await serviceApi.put(url, [row]);
+  xgrid.value.refreshData();
+}
+// 删除
+const handleDel = async () => {
+  const type = await VxeUI.modal.confirm(t('message.delRecord'));
+  const records = xgrid.value.getInstance().getCheckboxRecords();
+  if (type === 'confirm') {
+    const [err] = await to(serviceApi.delete(url, records));
+  }
+};
+
+const handleAuthorityPanel = record => {
+  data.showAuthority = true;
+  data.dataStatus = 'update';
+  data.record = clone(record, true);
+  data.record.menuType = data.record.menuType.toString();
+  data.record.dispalyCode = record.permissionCode;
+};
+
+const onClose = (type?, record?) => {
+  type === 'submit' && row && xgrid.value.getInstance().reloadTreeExpand(row || record);
+  data.record = {};
+  data.showDrawer = false;
+  data.showAuthority = false;
+};
+</script>

package/src/views/system/menu/menuInfo.vue

@@ -2,7 +2,7 @@
  * @Author: wei.li
  * @Date: 2021-11-17 16:44:08
  * @LastEditors: levi7754 levi7754@163.com
- * @LastEditTime: 2025-04-08 15:43:16
+ * @LastEditTime: 2025-07-17 18:47:22
  * @Description: file content
 -->
 
@@ -242,7 +242,7 @@ const authority = ref(['fetch']);
 const url = '/uums/menu';
 
 const emit = defineEmits<{
-  (e: 'onClose', type): void;
+  (e: 'close', type, data?): void;
 }>();
 
 const getPrefixCode = () => {
@@ -261,6 +261,7 @@ const onSubmit = () => {
   xForm.value.validate(async valid => {
     if (!valid) {
       loading.value = true;
+      let resData;
       const { record, dataStatus } = props;
       if (dataStatus === 'add') {
         record.permissionCode = `${prefixCode.value}.${record.dispalyCode}`;
@@ -276,14 +277,18 @@ const onSubmit = () => {
               sort: (idx + 1) * 10
             };
           });
-          await to(serviceApi.post(url, dataList));
+          const [err, res] = await to(serviceApi.post(url, dataList));
+          if (!err) {
+            // props.record.children.push(...res);
+            resData = res[0];
+          }
         }
         loading.value = false;
       } else {
         await to(serviceApi.put(url, [record]));
         loading.value = false;
       }
-      handleClose('submit');
+      handleClose('submit', resData);
     }
   });
 };
@@ -304,8 +309,8 @@ const getLovList = code => {
   });
 };
 // 抽屉关闭
-function handleClose(type) {
-  emit('onClose', type);
+function handleClose(type, data) {
+  emit('close', type, data);
 }
 </script>
 

package/src/views/system/role/AuthorityInfo.vue

@@ -2,7 +2,7 @@
  * @Author: wei.li
  * @Date: 2021-11-22 19:50:48
  * @LastEditors: levi7754 levi7754@163.com
- * @LastEditTime: 2025-04-08 15:44:48
+ * @LastEditTime: 2025-07-14 14:58:13
  * @Description: file content
 -->
 
@@ -113,24 +113,6 @@ onBeforeMount(() => {
 </script>
 
 <style lang="scss">
-.u-menu-prefix.vxe-input {
-  height: 34px;
-}
-
-.u-menu-prefix.vxe-input .vxe-input--prefix {
-  top: 1px;
-  width: 150px;
-  height: 32px;
-  text-align: center;
-  background-color: #f5f7fa;
-  border-right: 1px solid #dcdfe6;
-}
-
-.u-menu-prefix.vxe-input .vxe-input--inner {
-  padding-left: 160px;
-  border: 1px solid #dcdfe6;
-}
-
 .my-dropdown2 {
   background-color: #fff;
   border: 1px solid #dcdfe6;

package/src/views/system/sysUser/SysUserPanel.vue

@@ -265,7 +265,7 @@ const getUnitList = () => {
   serviceApi
     .get('/uums/unit', { pageSize: 10 })
     .then(res => {
-      paramExt.value = { unitId: res[0].id, type: 'system', enabled: '1' };
+      paramExt.value = { unitId: res[0].id, enabled: '1' };
     })
     .catch(() => {
       errorMessage('获取租户失败,刷新后重试');

package/src/views/udev/dict/DictView.vue

@@ -2,7 +2,7 @@
  * @Author: wei.li
  * @Date: 2021-12-23 17:33:21
  * @LastEditors: levi7754 levi7754@163.com
- * @LastEditTime: 2025-04-08 15:22:57
+ * @LastEditTime: 2025-07-16 15:26:43
  * @Description: 数据字典
 -->
 <template>
@@ -47,7 +47,7 @@ const columns = [
   },
   {
     field: 'dictName',
-    title: 'message.udp.dictCode',
+    title: 'message.udp.dictName',
     required: true,
     editRender: renderHook.renderInput()
   },

package/src/views/uhome/components/menu-favorite.vue

@@ -160,7 +160,7 @@ const loading = ref(false);
 const checkboxModel = ref<IRecord>({});
 // const cacheCheckModel = {}; // 缓存最初选中的数据
 
-const url = '/upms/v1/menuFavority';
+const url = '/upfm/v1/menuFavority';
 
 const getCacheMenuList = async () => {
   menuList.value = await dbstorage.getItem(`U-${props.userName}-ROUTES`);

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

@@ -215,7 +215,7 @@ const getLunarDay = () => {
 
 /** 查询收藏菜单功能 */
 const getMenuList = () => {
-  const url = '/upms/v1/menuFavority';
+  const url = '/upfm/v1/menuFavority';
   loading.value = true;
   const query = { pageSize: 20, pageNum: 1, userName: cookies.get(kLOGINER) };
   getServiceApi()

package/src/views/ulogin/login.vue

@@ -94,7 +94,7 @@
             SHENZHEN U-TOGETHER CO. LTD
           </a>
         </span>
-        <span class="flex items-center text-white" style="width: 150px; font-size: 10px">技术支持</span>
+        <span class="flex items-center text-white" style="width: 75px; font-size: 10px">技术支持</span>
       </span>
     </div>
   </div>

package/types/global.d.ts

@@ -87,7 +87,6 @@ declare global {
     VITE_BASE_URL: string;
     VITE_ROUTER_HISTORY: string;
     VITE_TITLE: string;
-    VITE_COMPRESSION: ViteCompression;
   }
 
   /**

package/vite.config.ts

@@ -2,7 +2,7 @@
  * @Author: wei.li
  * @Date: 2021-12-23 17:33:21
  * @LastEditors: levi7754 levi7754@163.com
- * @LastEditTime: 2025-06-03 09:40:18
+ * @LastEditTime: 2025-07-16 17:59:59
  * @Description: file content
  */
 import { resolve } from 'path';
@@ -60,11 +60,18 @@ export default () => {
           '@logicflow/extension',
           'remixicon',
           'socket.io-client',
-          'crypto-js'
+          'crypto-js',
+          'version-rocket',
+          'vue-tippy',
+          'vue-router',
+          '@iconify/vue',
+          'qrcode',
+          'element-resize-detector'
         ]
       },
       lib: {
         entry: resolve(__dirname, 'index.ts'),
+        formats: ['es'],
         name: '@utogether/udp-core',
         fileName: format => `core.${format}.js`
       }

package/dist/InvOrganization-MuM2jtsG.js

@@ -1,66 +0,0 @@
-import { defineComponent as u, ref as s, reactive as m, resolveComponent as f, createBlock as p, openBlock as g } from "vue";
-import { t as _ } from "./await-to-js.es5-BtRbN2QH.js";
-import { useRender as h } from "@utogether/utils";
-import { w as z } from "./index-BKIw8tSn.js";
-const k = {
-  name: "InvOrganization"
-}, R = /* @__PURE__ */ u({
-  ...k,
-  setup(w) {
-    const r = "/uums/cusOrganization", n = s(null), e = h(), i = [{
-      field: "organizationCode"
-    }, {
-      field: "organizationName"
-    }], d = [{
-      type: "checkbox",
-      width: 40,
-      align: "center"
-    }, {
-      field: "organizationCode",
-      width: 120,
-      required: !0,
-      editRender: e.renderInput()
-    }, {
-      field: "organizationName",
-      minWidth: 120,
-      required: !0,
-      editRender: e.renderInput()
-    }, {
-      field: "orgName",
-      minWidth: 170,
-      required: !0,
-      editRender: e.renderBU()
-    }, {
-      field: "orgCode",
-      width: 110
-    }, {
-      field: "enabled",
-      width: 80,
-      cellRender: e.renderEnabled(a)
-    }];
-    async function a(t) {
-      const [o] = await _(z().put(r, [t]));
-      !o && n.value.refreshData();
-    }
-    const c = m({
-      columns: d
-    });
-    return (t, o) => {
-      const l = f("ut-grid");
-      return g(), p(l, {
-        ref_key: "xgrid",
-        ref: n,
-        items: i,
-        "default-params": {
-          organizationId: "",
-          orgId: ""
-        },
-        columns: c.columns,
-        url: r
-      }, null, 8, ["columns"]);
-    };
-  }
-});
-export {
-  R as default
-};

package/dist/StaffInfo-DJzvBuxy.js

@@ -1,4 +0,0 @@
-import { _ as f } from "./StaffInfo.vue_vue_type_style_index_0_lang-DMTL7KCh.js";
-export {
-  f as default
-};