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

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

@@ -1,127 +1,127 @@
-<!--
- * @Author: wei.li
- * @Date: 2021-11-17 16:42:14
- * @LastEditors: levi7754 levi7754@163.com
- * @LastEditTime: 2025-04-08 15:50:29
- * @Description: file content
--->
-<template>
-  <div class="config">
-    <el-drawer
-      :model-value="show"
-      :before-close="handleClose"
-      direction="rtl"
-      :title="$t('message.title.employeeInfo')"
-      destroy-on-close
-      size="66%"
-    >
-      <ut-form ref="suFormRef" :record="data" :loading="loading" :items="items" :data-status="dataStatus" />
-      <el-divider />
-      <el-row type="flex" justify="end" style="padding-right: 22px">
-        <ut-button content="cancel" icon="ri-close-fill" @tap="handleClose" />
-        <ut-button content="confirm" icon="ri-save-3-fill" status="u-cyan" @tap="onSubmit" />
-      </el-row>
-    </el-drawer>
-  </div>
-</template>
-<script setup lang="ts">
-import { onMounted, ref } from 'vue';
-import { useRender } from '@utogether/utils';
-import { getServiceApi } from '../../../api';
-
-interface IProps {
-  show?: boolean;
-  record: IRecord;
-  dataStatus?: string;
-}
-
-const props = withDefaults(defineProps<IProps>(), {
-  show: true,
-  record: (): IRecord => {
-    return {};
-  },
-  dataStatus: 'detail'
-});
-
-const renderHook = useRender();
-const data = ref<IRecord>({});
-const suFormRef = ref(null);
-
-const loading = ref(false);
-
-const mapField = { userName: 'userName', userId: 'id' };
-const disabledProps = { disabled: props.dataStatus !== 'add' };
-
-const items = [
-  {
-    field: 'employeeCode',
-    required: true,
-    span: 8,
-    itemRender: renderHook.renderInput({ props: disabledProps })
-  },
-  { field: 'employeeName', required: true, span: 8, itemRender: renderHook.renderInput() },
-  { field: 'gender', span: 8, itemRender: renderHook.renderDict('SU.GENDER') },
-  {
-    field: 'deptName',
-    required: true,
-    span: 8,
-    itemRender: renderHook.renderLov({ code: 'SU.DEPARTMENT', field: 'deptName' }, onChange)
-  },
-  { field: 'email', span: 8, itemRender: renderHook.renderInput() },
-  { field: 'identity', span: 8, itemRender: renderHook.renderInput() },
-
-  { field: 'employeeDate', span: 8, itemRender: renderHook.renderDate() },
-  { field: 'solarDay', span: 8, itemRender: renderHook.renderDate() },
-  { field: 'phone', span: 8, itemRender: renderHook.renderInput() },
-  { field: 'mobile', span: 8, itemRender: renderHook.renderInput() },
-  {
-    field: 'attribute5',
-    title: 'message.releateUser',
-    span: 8,
-    itemRender: renderHook.renderSysUser({ mapField })
-  }
-];
-// function onSelectChange(e, item, record, field) {
-//   if (field === 'attribute5') {
-//     data.value.userName = item.userName;
-//     data.value.userId = item.id;
-//     data.value.attribute5 = item.name;
-//   }
-// }
-
-function onChange(e) {
-  e.row.deptName = e.item?.deptName || e.row.deptName;
-  e.row.deptCode = e.item?.deptCode || e.row.deptCode;
-  e.row.departmentId = e.item?.id || e.row.departmentId;
-}
-
-const emit = defineEmits<{
-  (e: 'onClose'): void;
-}>();
-
-const onSubmit = () => {
-  suFormRef.value.validateForm(async valid => {
-    if (!valid) {
-      const { dataStatus } = props;
-      loading.value = true;
-      console.log(data);
-      if (dataStatus === 'add') {
-        await getServiceApi().post('/uums/employee', data.value);
-      } else {
-        await getServiceApi().put('/uums/employee', data.value);
-      }
-      loading.value = false;
-      handleClose();
-    }
-  });
-};
-
-// 抽屉关闭
-function handleClose() {
-  emit('onClose');
-}
-
-onMounted(() => {
-  data.value = props.record;
-});
-</script>
+<!--
+ * @Author: wei.li
+ * @Date: 2021-11-17 16:42:14
+ * @LastEditors: levi7754 levi7754@163.com
+ * @LastEditTime: 2025-04-08 15:50:29
+ * @Description: file content
+-->
+<template>
+  <div class="config">
+    <el-drawer
+      :model-value="show"
+      :before-close="handleClose"
+      direction="rtl"
+      :title="$t('message.title.employeeInfo')"
+      destroy-on-close
+      size="66%"
+    >
+      <ut-form ref="suFormRef" :record="data" :loading="loading" :items="items" :data-status="dataStatus" />
+      <el-divider />
+      <el-row type="flex" justify="end" style="padding-right: 22px">
+        <ut-button content="cancel" icon="ri-close-fill" @tap="handleClose" />
+        <ut-button content="confirm" icon="ri-save-3-fill" status="u-cyan" @tap="onSubmit" />
+      </el-row>
+    </el-drawer>
+  </div>
+</template>
+<script setup lang="ts">
+import { onMounted, ref } from 'vue';
+import { useRender } from '@utogether/utils';
+import { getServiceApi } from '../../../api';
+
+interface IProps {
+  show?: boolean;
+  record: IRecord;
+  dataStatus?: string;
+}
+
+const props = withDefaults(defineProps<IProps>(), {
+  show: true,
+  record: (): IRecord => {
+    return {};
+  },
+  dataStatus: 'detail'
+});
+
+const renderHook = useRender();
+const data = ref<IRecord>({});
+const suFormRef = ref(null);
+
+const loading = ref(false);
+
+const mapField = { userName: 'userName', userId: 'id' };
+const disabledProps = { disabled: props.dataStatus !== 'add' };
+
+const items = [
+  {
+    field: 'employeeCode',
+    required: true,
+    span: 8,
+    itemRender: renderHook.renderInput({ props: disabledProps })
+  },
+  { field: 'employeeName', required: true, span: 8, itemRender: renderHook.renderInput() },
+  { field: 'gender', span: 8, itemRender: renderHook.renderDict('SU.GENDER') },
+  {
+    field: 'deptName',
+    required: true,
+    span: 8,
+    itemRender: renderHook.renderLov({ code: 'SU.DEPARTMENT', field: 'deptName' }, onChange)
+  },
+  { field: 'email', span: 8, itemRender: renderHook.renderInput() },
+  { field: 'identity', span: 8, itemRender: renderHook.renderInput() },
+
+  { field: 'employeeDate', span: 8, itemRender: renderHook.renderDate() },
+  { field: 'solarDay', span: 8, itemRender: renderHook.renderDate() },
+  { field: 'phone', span: 8, itemRender: renderHook.renderInput() },
+  { field: 'mobile', span: 8, itemRender: renderHook.renderInput() },
+  {
+    field: 'attribute5',
+    title: 'message.releateUser',
+    span: 8,
+    itemRender: renderHook.renderSysUser({ mapField })
+  }
+];
+// function onSelectChange(e, item, record, field) {
+//   if (field === 'attribute5') {
+//     data.value.userName = item.userName;
+//     data.value.userId = item.id;
+//     data.value.attribute5 = item.name;
+//   }
+// }
+
+function onChange(e) {
+  e.row.deptName = e.item?.deptName || e.row.deptName;
+  e.row.deptCode = e.item?.deptCode || e.row.deptCode;
+  e.row.departmentId = e.item?.id || e.row.departmentId;
+}
+
+const emit = defineEmits<{
+  (e: 'onClose'): void;
+}>();
+
+const onSubmit = () => {
+  suFormRef.value.validateForm(async valid => {
+    if (!valid) {
+      const { dataStatus } = props;
+      loading.value = true;
+      console.log(data);
+      if (dataStatus === 'add') {
+        await getServiceApi().post('/uums/employee', data.value);
+      } else {
+        await getServiceApi().put('/uums/employee', data.value);
+      }
+      loading.value = false;
+      handleClose();
+    }
+  });
+};
+
+// 抽屉关闭
+function handleClose() {
+  emit('onClose');
+}
+
+onMounted(() => {
+  data.value = props.record;
+});
+</script>

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: 2025-12-08 08:27:39
+ * @LastEditTime: 2026-01-06 11:06:49
  * @Description: 员工管理
 -->
 
@@ -48,8 +48,8 @@ const url = '/uums/employee';
 
 watch(
   () => active.value,
-  newVal => {
-    data.fetchExtParam = { departmentId: newVal?.id };
+  () => {
+    data.fetchExtParam = { departmentId: null };
     nextTick(() => {
       xgrid.value.refreshData();
     });

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

@@ -0,0 +1,237 @@
+<!--
+ * @Author: levi7754 levi7754@163.com
+ * @Date: 2025-12-23 11:00:51
+ * @LastEditors: levi7754 levi7754@163.com
+ * @LastEditTime: 2026-01-06 18:07:18
+ * @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"
+      :default-params="{ orgId: null, enabled: '1' }"
+      :check-method="onCheckMethod"
+      @editActivated="onEditActivated"
+    />
+    <!-- 角色分配 -->
+    <ut-modal-grid
+      v-if="showModal"
+      ref="ygrid"
+      :columns="subColumns"
+      mode="form"
+      url="/ucrm/sysHomeRole"
+      :title="$t('message.title.layoutRole', { name: data.title })"
+      width="50%"
+      @buttonClick="onButtonClick"
+      @close="showModal = false"
+    />
+    <!-- 角色列表 -->
+    <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: 60, step: 10 }) },
+  {
+    field: 'type',
+    title: 'message.udp.componentType',
+    width: 120,
+    editRender: renderHook.renderSelectLocal({
+      // disabled: true,
+      options: [
+        { label: '系统', value: 'system' },
+        { label: '自定义', value: 'custom' }
+      ],
+      defaultValue: 'custom'
+    })
+  },
+  {
+    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');
+  const body = records.map(m => {
+    const item = { configId: data.value.id, roleId: m.id };
+    return item;
+  });
+  xmodal.value.showLoading();
+  const [err] = await to(getServiceApi().post('/ucrm/sysHomeRole', body));
+  if (!err) {
+    successMessage();
+    ygrid.value.refreshData();
+    showRole.value = false;
+  }
+};
+
+const onCheckMethod = row => {
+  return row.type === 'custom';
+};
+
+const onEditActivated = ({ row }) => {
+  const activeColumns = clone(columns, true);
+  if (row.type === 'system') {
+    let idx = activeColumns.findIndex(m => m.field === 'type');
+    activeColumns[idx].editRender.props.disabled = true;
+    idx = activeColumns.findIndex(m => m.field === 'url');
+    activeColumns[idx].editRender.props.disabled = true;
+  }
+  xgrid.value.getInstance().reloadColumn(activeColumns);
+};
+
+const onButtonClick = code => {
+  code === 'add' && handleAdd();
+  code === 'del' && handleDel();
+};
+</script>

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

@@ -1,8 +1,8 @@
 <!--
  * @Author: wei.li
  * @Date: 2022-08-05 10:05:27
- * @LastEditors: wei.li
- * @LastEditTime: 2022-08-16 18:05:43
+ * @LastEditors: levi7754 levi7754@163.com
+ * @LastEditTime: 2025-12-20 08:03:07
  * @Description: 菜单权限列表
 -->
 <template>
@@ -21,6 +21,7 @@
         url="/uums/menu"
         :default-params="{ parentId: record.id }"
         :default-value="{ parentId: record.id, menuType: 1 }"
+        :pager-config="{ layouts: [] }"
       />
     </el-drawer>
   </div>
@@ -65,7 +66,7 @@ const columns = [
   {
     field: 'permissionCode',
     required: true,
-    minWidth: 200,
+    minWidth: 180,
     editRender: renderHook.renderInput(),
     slots: {
       edit: ({ row }) => {
@@ -74,16 +75,16 @@ const columns = [
         };
         row.dispalyCode = row.permissionCode?.replace(`${prefixCode.value}.`, '');
         return [
-          <vxe-input
-            v-model={row.dispalyCode}
-            v-slots={slots}
-            className="ut-slot-input"
-            onInput={() => onInput(row)}
-          />
+          <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',