@utogether/udp-core 1.0.4 → 2.0.0-beta.1

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

@@ -0,0 +1,199 @@
+<!--
+ * @Author: levi7754 levi7754@163.com
+ * @Date: 2025-12-23 11:00:51
+ * @LastEditors: levi7754 levi7754@163.com
+ * @LastEditTime: 2025-12-26 19:10:01
+ * @FilePath: \udp-crm\packages\udp-crm\src\views\udev\layout\home-layout.vue
+ * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
+-->
+<template>
+  <div>
+    <ut-grid ref="xgrid" :items="items" :columns="columns" :url="url" />
+    <!-- 角色分配 -->
+    <ut-modal-grid
+      v-if="showModal"
+      ref="ygrid"
+      :columns="subColumns"
+      mode="form"
+      :url="url + '/detail'"
+      :title="$t('message.title.layoutRole', { name: data.title })"
+      width="50%"
+      @buttonClick="onButtonClick"
+    />
+    <!-- 角色列表 -->
+    <ut-modal-grid
+      v-if="showRole"
+      ref="xmodal"
+      :items="subItems"
+      :columns="subColumns"
+      :show-footer="true"
+      :editable="false"
+      :title="$t('message.udp.roleList')"
+      url="/uums/role"
+      width="60%"
+      height="75%"
+      @close="showRole = false"
+      @confirm="onConfirm"
+    />
+  </div>
+</template>
+
+<script setup lang="tsx">
+import { ref } from 'vue';
+import { useRender, successMessage, warnMessage } from '@utogether/utils';
+import { to } from 'await-to-js';
+import { clone } from 'xe-utils';
+import { VxeUI } from 'vxe-pc-ui';
+import { useI18n } from 'vue-i18n';
+import { getServiceApi } from '../../../api';
+
+defineOptions({ name: 'HomeLayout' });
+
+const renderHook = useRender();
+const { t } = useI18n();
+
+const xgrid = ref(null);
+const ygrid = ref(null);
+const xmodal = ref(null);
+
+const showModal = ref(false);
+const showRole = ref(false);
+
+const data = ref<IRecord>({});
+
+const url = '/ucrm/sysHomeConfig';
+
+const items = [
+  { field: 'code', title: 'message.udp.componentCode' },
+  { field: 'title', title: 'message.udp.componentTitle' }
+];
+
+const subItems = [
+  { field: 'roleName', span: 9, title: 'message.udp.roleName' },
+  { field: 'roleCode', span: 9, title: 'message.udp.roleCode' }
+];
+
+const options = [
+  { label: 3, value: 3 },
+  { label: 4, value: 4 },
+  { label: 6, value: 6 },
+  { label: 8, value: 8 },
+  { label: 12, value: 12 },
+  { label: 24, value: 24 }
+];
+
+// 列字段
+const columns = [
+  { type: 'checkbox', width: 50, align: 'center' },
+  { field: 'seqNo', required: true, width: 100, editRender: renderHook.renderNumber({ min: 10, step: 10 }) },
+  {
+    field: 'code',
+    title: 'message.udp.componentCode',
+    width: 120,
+    required: true,
+    editRender: renderHook.renderInput()
+  },
+  {
+    field: 'title',
+    title: 'message.udp.componentTitle',
+    minWidth: 150,
+    required: true,
+    editRender: renderHook.renderInput()
+  },
+  {
+    field: 'span',
+    title: 'message.udp.componentSpan',
+    required: true,
+    width: 160,
+    editRender: renderHook.renderSelectLocal({ options })
+  },
+  {
+    field: 'height',
+    title: 'message.udp.componentHeight',
+    required: true,
+    editRender: renderHook.renderNumber({ min: 300 })
+  },
+  {
+    field: 'url',
+    title: 'message.udp.componentPath',
+    required: true,
+    minWidth: 150,
+    editRender: renderHook.renderInput()
+  },
+  { field: 'enabled', width: 90, formatter: ['formatDict', 'SU.ENABLE'] },
+  {
+    field: 'operate',
+    width: 140,
+    fixed: 'right',
+    slots: {
+      default: ({ row }) => {
+        if (!row.id) return;
+        const enabled = {
+          conent: row.enabled === '1' ? 'disabled' : 'enable',
+          status: row.enabled === '1' ? 'warning' : 'success',
+          icon: row.enabled === '1' ? 'ri-pause-circle-line' : 'ri-play-circle-line'
+        };
+        return [
+          <>
+            <ut-button content="role" auth="role" icon="ri-user-line" onTap={() => handleRole(row)} />
+            <ut-button content={enabled.conent} {...enabled} onTap={() => handleRowStatus(row)} />
+          </>
+        ];
+      }
+    }
+  }
+];
+
+const subColumns = [
+  { type: 'checkbox', width: 40 },
+  { field: 'roleName', title: 'message.udp.roleName' },
+  { field: 'roleCode', title: 'message.udp.roleCode' }
+];
+
+const handleRole = row => {
+  data.value = row;
+  showModal.value = true;
+};
+
+const handleAdd = () => {
+  showRole.value = true;
+};
+
+const handleRowStatus = async row => {
+  const message = row.enabled === '1' ? 'tip_disabledrecord' : 'tip_enabledrecord';
+  const type = await VxeUI.modal.confirm(t(`message.${message}`));
+  if (type === 'confirm') {
+    const body = clone(row, true);
+    body.enabled = body.enabled === '1' ? '0' : '1';
+    const [err] = await to(getServiceApi().put(url, [body]));
+    if (err) return;
+    successMessage();
+    xgrid.value.refreshData();
+  }
+};
+
+const handleDel = () => {
+  const selectRecords = ygrid.value.getSelectRecords();
+  if (!selectRecords.length) return;
+  ygrid.value.getInstance().commitProxy('delete');
+};
+
+const onConfirm = async records => {
+  if (records.length === 0) return warnMessage('message.tip.selectRole');
+  records.forEach(m => {
+    m.systemConfigId = data.value.id;
+  });
+  xmodal.value.showLoading();
+  const [err] = await to(getServiceApi().post(url + '/detail', records));
+  if (!err) {
+    successMessage();
+    ygrid.value.refreshData();
+    showRole.value = false;
+  }
+};
+
+const onButtonClick = code => {
+  code === 'add' && handleAdd();
+  code === 'del' && handleDel();
+};
+</script>

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

@@ -1,140 +1,141 @@
-<!--
- * @Author: wei.li
- * @Date: 2022-08-05 10:05:27
- * @LastEditors: wei.li
- * @LastEditTime: 2022-08-16 18:05:43
- * @Description: 菜单权限列表
--->
-<template>
-  <div class="u-dict-config_wrapper">
-    <el-drawer
-      :model-value="show"
-      :before-close="handleClose"
-      title="权限明细"
-      direction="rtl"
-      destroy-on-close
-      size="66%"
-    >
-      <ut-grid
-        ref="SuGridRef"
-        :columns="columns"
-        url="/uums/menu"
-        :default-params="{ parentId: record.id }"
-        :default-value="{ parentId: record.id, menuType: 1 }"
-      />
-    </el-drawer>
-  </div>
-</template>
-
-<script setup lang="tsx">
-import { ref, watch } from 'vue';
-import { useRender } from '@utogether/utils';
-
-interface IProps {
-  record: IRecord;
-  show: boolean;
-}
-
-const props = withDefaults(defineProps<IProps>(), {
-  record: (): IRecord => {
-    return {};
-  },
-  show: false
-});
-
-watch(
-  () => props.show,
-  () => {
-    prefixCode.value = props.show && getPrefixCode();
-  }
-);
-
-const prefixCode = ref('');
-
-const renderHook = useRender();
-
-// 列字段
-const columns = [
-  { type: 'checkbox', width: 50, align: 'center' },
-  {
-    field: 'menuName',
-    title: 'message.permissionName',
-    required: true,
-    editRender: renderHook.renderInput()
-  },
-  {
-    field: 'permissionCode',
-    required: true,
-    minWidth: 200,
-    editRender: renderHook.renderInput(),
-    slots: {
-      edit: ({ row }) => {
-        const slots = {
-          prefix: () => <span>{prefixCode.value}.</span>
-        };
-        row.dispalyCode = row.permissionCode?.replace(`${prefixCode.value}.`, '');
-        return [
-          <vxe-input
-            v-model={row.dispalyCode}
-            v-slots={slots}
-            className="ut-slot-input"
-            onInput={() => onInput(row)}
-          />
-        ];
-      }
-    }
-  },
-  {
-    field: 'enabled',
-    title: 'message.enabled',
-    width: 90,
-    editRender: renderHook.renderDict({ code: 'SU.ENABLE', defaultValue: '1' }),
-    formatter: ['formatDict', 'SU.ENABLE']
-  }
-];
-
-const getPrefixCode = () => {
-  const { record } = props;
-  const { id, parentId, hasChildren } = record;
-  if (!id && !parentId) return 'su';
-  if (hasChildren) {
-    record.dispalyCode = '';
-    return record.permissionCode;
-  }
-  return record.permissionCode;
-};
-
-const onInput = record => {
-  record.permissionCode = `${prefixCode.value}.${record.dispalyCode}`;
-};
-
-const emit = defineEmits<{ (e: 'close'): void }>();
-// 抽屉关闭
-function handleClose() {
-  emit('close');
-}
-</script>
-
-<style lang="scss">
-.u-dict-config_wrapper {
-  .el-drawer__header {
-    margin-bottom: 0;
-  }
-
-  .ut-slot-input {
-    .vxe-input--inner {
-      width: auto;
-      max-width: 66%;
-      padding-left: 0.5em;
-    }
-
-    .vxe-input--prefix {
-      display: contents;
-    }
-  }
-
-  .ut-disable-text {
-    background-color: #fefefe;
-  }
-}
-</style>
+<!--
+ * @Author: wei.li
+ * @Date: 2022-08-05 10:05:27
+ * @LastEditors: levi7754 levi7754@163.com
+ * @LastEditTime: 2025-12-20 08:03:07
+ * @Description: 菜单权限列表
+-->
+<template>
+  <div class="u-dict-config_wrapper">
+    <el-drawer
+      :model-value="show"
+      :before-close="handleClose"
+      title="权限明细"
+      direction="rtl"
+      destroy-on-close
+      size="66%"
+    >
+      <ut-grid
+        ref="SuGridRef"
+        :columns="columns"
+        url="/uums/menu"
+        :default-params="{ parentId: record.id }"
+        :default-value="{ parentId: record.id, menuType: 1 }"
+        :pager-config="{ layouts: [] }"
+      />
+    </el-drawer>
+  </div>
+</template>
+
+<script setup lang="tsx">
+import { ref, watch } from 'vue';
+import { useRender } from '@utogether/utils';
+
+interface IProps {
+  record: IRecord;
+  show: boolean;
+}
+
+const props = withDefaults(defineProps<IProps>(), {
+  record: (): IRecord => {
+    return {};
+  },
+  show: false
+});
+
+watch(
+  () => props.show,
+  () => {
+    prefixCode.value = props.show && getPrefixCode();
+  }
+);
+
+const prefixCode = ref('');
+
+const renderHook = useRender();
+
+// 列字段
+const columns = [
+  { type: 'checkbox', width: 50, align: 'center' },
+  {
+    field: 'menuName',
+    title: 'message.permissionName',
+    required: true,
+    editRender: renderHook.renderInput()
+  },
+  {
+    field: 'permissionCode',
+    required: true,
+    minWidth: 180,
+    editRender: renderHook.renderInput(),
+    slots: {
+      edit: ({ row }) => {
+        const slots = {
+          prefix: () => <span>{prefixCode.value}.</span>
+        };
+        row.dispalyCode = row.permissionCode?.replace(`${prefixCode.value}.`, '');
+        return [
+          <vxe-input v-model={row.dispalyCode} v-slots={slots} className="ut-slot-input" onInput={() => onInput(row)} />
+        ];
+      }
+    }
+  },
+  {
+    field: 'remark',
+    title: 'message.udp.description',
+    editRender: renderHook.renderInput()
+  },
+  {
+    field: 'enabled',
+    title: 'message.enabled',
+    width: 90,
+    editRender: renderHook.renderDict({ code: 'SU.ENABLE', defaultValue: '1' }),
+    formatter: ['formatDict', 'SU.ENABLE']
+  }
+];
+
+const getPrefixCode = () => {
+  const { record } = props;
+  const { id, parentId, hasChildren } = record;
+  if (!id && !parentId) return 'su';
+  if (hasChildren) {
+    record.dispalyCode = '';
+    return record.permissionCode;
+  }
+  return record.permissionCode;
+};
+
+const onInput = record => {
+  record.permissionCode = `${prefixCode.value}.${record.dispalyCode}`;
+};
+
+const emit = defineEmits<{ (e: 'close'): void }>();
+// 抽屉关闭
+function handleClose() {
+  emit('close');
+}
+</script>
+
+<style lang="scss">
+.u-dict-config_wrapper {
+  .el-drawer__header {
+    margin-bottom: 0;
+  }
+
+  .ut-slot-input {
+    .vxe-input--inner {
+      width: auto;
+      max-width: 66%;
+      padding-left: 0.5em;
+    }
+
+    .vxe-input--prefix {
+      display: contents;
+    }
+  }
+
+  .ut-disable-text {
+    background-color: #fefefe;
+  }
+}
+</style>

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

@@ -163,8 +163,17 @@ async function handleUpdate({ row }) {
 const handleDel = async () => {
   const type = await VxeUI.modal.confirm(t('message.delRecord'));
   const records = xgrid.value.getInstance().getCheckboxRecords();
+  console.log(records);
   if (type === 'confirm') {
-    const [err] = await to(serviceApi.delete(url, records));
+    const [err, res] = await to(serviceApi.delete(url, records));
+    console.log(res);
+    if (err) return;
+    const parent = xgrid.value.getInstance().getTreeParentRow(records[0]);
+    if (parent) {
+      xgrid.value.getInstance().reloadTreeExpand(parent);
+    } else {
+      xgrid.value.refreshData();
+    }
   }
 };