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

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

@@ -1,118 +1,118 @@
-<!--
- * @Author: wei.li
- * @Date: 2021-12-23 17:33:21
- * @LastEditors: levi7754 levi7754@163.com
- * @LastEditTime: 2025-12-29 14:23:32
- * @Description: 数据字典
--->
-<template>
-  <div>
-    <ut-grid
-      ref="xgrid"
-      :items="formItems"
-      :columns="columns"
-      :check-method="checkMethod"
-      :events="onGridEvents"
-      url="/upfm/v1/lov"
-    />
-    <child-view v-if="shouDrawer" :show="shouDrawer" :record="record" @onClose="handleClose" />
-  </div>
-</template>
-
-<script lang="tsx">
-export default { name: 'DictView' };
-</script>
-<script setup lang="tsx">
-import { ref, nextTick } from 'vue';
-import childView from './childView.vue';
-import { useRender } from '@utogether/utils';
-// import { useRender } from '../../../utils/udp/useRender';
-
-const xgrid = ref(null);
-// const renderOption = useRenderOption();
-
-const formItems = [
-  { field: 'dictCode', title: 'message.udp.dictCode' },
-  { field: 'dictName', title: 'message.udp.dictName' },
-  { field: 'dictType', title: 'message.udp.dictType', code: 'SU.DICT.TYPE' }
-];
-
-const renderHook = useRender();
-// 列字段
-const columns = [
-  { type: 'checkbox', width: 40, align: 'center' },
-
-  {
-    field: 'dictCode',
-    title: 'message.udp.dictCode',
-    required: true,
-    editRender: renderHook.renderInput()
-  },
-  {
-    field: 'dictName',
-    title: 'message.udp.dictName',
-    required: true,
-    editRender: renderHook.renderInput()
-  },
-  // {
-  //   field: 'userName',
-  //   width: 300,
-  //   editRender: renderHook.renderUpload()
-  // },
-  {
-    field: 'dictType',
-    title: 'message.udp.dictType',
-    required: true,
-    editRender: renderHook.renderDict('SU.DICT.TYPE'),
-    formatter: ['formatDict', 'SU.DICT.TYPE']
-  },
-  { field: 'dictDesc', title: 'message.remark', editRender: renderHook.renderInput() },
-  {
-    field: 'enabled',
-    width: 90,
-    editRender: renderHook.renderDict({ code: 'SU.ENABLE', defaultValue: '1' }),
-    formatter: ['formatDict', 'SU.ENABLE']
-  },
-  {
-    field: 'operate',
-    width: 80,
-    slots: {
-      default: ({ row }) => {
-        if (!row.id) return null;
-        return [<ut-button content="lov" icon="ri-dice-6-line" onClick={() => hanldeDipose(row)} />];
-      }
-    }
-  }
-];
-
-const shouDrawer = ref(false);
-const record = ref(null);
-const hanldeDipose = row => {
-  nextTick(() => {
-    shouDrawer.value = true;
-    record.value = row;
-    record.value.total = row.children?.length;
-  });
-};
-const handleClose = () => {
-  xgrid.value.refreshData();
-  shouDrawer.value = false;
-};
-
-const onGridEvents = {
-  editActived({ row }) {
-    columns[1].editRender.props.disabled = !!row.id;
-  }
-};
-
-// function onChange(e) {
-//   console.log('onChange', e);
-// }
-// function onFocus(e) {
-//   console.log('onFocus', e);
-// }
-
-const checkMethod = row => {
-  return row.dictType !== '0';
-};
-</script>
+<!--
+ * @Author: wei.li
+ * @Date: 2021-12-23 17:33:21
+ * @LastEditors: levi7754 levi7754@163.com
+ * @LastEditTime: 2025-12-29 14:23:32
+ * @Description: 数据字典
+-->
+<template>
+  <div>
+    <ut-grid
+      ref="xgrid"
+      :items="formItems"
+      :columns="columns"
+      :check-method="checkMethod"
+      :events="onGridEvents"
+      url="/upfm/v1/lov"
+    />
+    <child-view v-if="shouDrawer" :show="shouDrawer" :record="record" @onClose="handleClose" />
+  </div>
+</template>
+
+<script lang="tsx">
+export default { name: 'DictView' };
+</script>
+<script setup lang="tsx">
+import { ref, nextTick } from 'vue';
+import childView from './childView.vue';
+import { useRender } from '@utogether/utils';
+// import { useRender } from '../../../utils/udp/useRender';
+
+const xgrid = ref(null);
+// const renderOption = useRenderOption();
+
+const formItems = [
+  { field: 'dictCode', title: 'message.udp.dictCode' },
+  { field: 'dictName', title: 'message.udp.dictName' },
+  { field: 'dictType', title: 'message.udp.dictType', code: 'SU.DICT.TYPE' }
+];
+
+const renderHook = useRender();
+// 列字段
+const columns = [
+  { type: 'checkbox', width: 40, align: 'center' },
+
+  {
+    field: 'dictCode',
+    title: 'message.udp.dictCode',
+    required: true,
+    editRender: renderHook.renderInput()
+  },
+  {
+    field: 'dictName',
+    title: 'message.udp.dictName',
+    required: true,
+    editRender: renderHook.renderInput()
+  },
+  // {
+  //   field: 'userName',
+  //   width: 300,
+  //   editRender: renderHook.renderUpload()
+  // },
+  {
+    field: 'dictType',
+    title: 'message.udp.dictType',
+    required: true,
+    editRender: renderHook.renderDict('SU.DICT.TYPE'),
+    formatter: ['formatDict', 'SU.DICT.TYPE']
+  },
+  { field: 'dictDesc', title: 'message.udp.dictDesc', editRender: renderHook.renderInput() },
+  {
+    field: 'enabled',
+    width: 90,
+    editRender: renderHook.renderDict({ code: 'SU.ENABLE', defaultValue: '1' }),
+    formatter: ['formatDict', 'SU.ENABLE']
+  },
+  {
+    field: 'operate',
+    width: 80,
+    slots: {
+      default: ({ row }) => {
+        if (!row.id) return null;
+        return [<ut-button content="lov" icon="ri-dice-6-line" onClick={() => hanldeDipose(row)} />];
+      }
+    }
+  }
+];
+
+const shouDrawer = ref(false);
+const record = ref(null);
+const hanldeDipose = row => {
+  nextTick(() => {
+    shouDrawer.value = true;
+    record.value = row;
+    record.value.total = row.children?.length;
+  });
+};
+const handleClose = () => {
+  xgrid.value.refreshData();
+  shouDrawer.value = false;
+};
+
+const onGridEvents = {
+  editActived({ row }) {
+    columns[1].editRender.props.disabled = !!row.id;
+  }
+};
+
+// function onChange(e) {
+//   console.log('onChange', e);
+// }
+// function onFocus(e) {
+//   console.log('onFocus', e);
+// }
+
+const checkMethod = row => {
+  return row.dictType !== '0';
+};
+</script>

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

@@ -1,184 +1,185 @@
-<!--
- * @Author: wei.li
- * @Date: 2022-07-15 17:02:56
- * @LastEditors: levi7754 levi7754@163.com
- * @LastEditTime: 2025-12-05 16:49:52
- * @Description: file contentu
--->
-<template>
-  <div class="u-dict-config_wrapper">
-    <vxe-drawer
-      :model-value="show"
-      :title="$t('message.title.dictList', { name: record.dictName })"
-      position="right"
-      destroy-on-close
-      width="67%"
-      @close="handleClose"
-    >
-      <ut-grid
-        ref="xgrid"
-        :columns="columns"
-        :height="height"
-        :default-params="{ parentId: record.id }"
-        :buttons="[{ code: 'del', auth: '/' }]"
-        :tree-config="{ childrenField: 'children', expandAll: true }"
-        url="/upfm/v1/lov/children"
-        mode="form"
-        @buttonClick="onButtonClick"
-      />
-      <ut-modal-form
-        v-if="showModal"
-        ref="xmodal"
-        :record="subRecord"
-        :items="subItems"
-        width="400"
-        height="280"
-        :data-status="modalType"
-        :title="$t('message.title.dictInfo', { name: record.dictName })"
-        @close="showModal = false"
-        @confirm="onConfirm"
-      />
-    </vxe-drawer>
-  </div>
-</template>
-
-<script setup lang="tsx">
-import { ref } from 'vue';
-import { useI18n } from 'vue-i18n';
-import to from 'await-to-js';
-import { VxeUI } from 'vxe-pc-ui';
-import { successMessage, useRender } from '@utogether/utils';
-import { getServiceApi } from '../../../api';
-import { useSystemStoreHook } from '../../../store/modules/system';
-import { clone } from 'xe-utils';
-
-interface IProps {
-  record: IRecord;
-  show: boolean;
-}
-
-const props = withDefaults(defineProps<IProps>(), {
-  record: (): IRecord => {
-    return {};
-  },
-  show: false
-});
-const renderHook = useRender();
-const { t } = useI18n();
-
-const URL = '/upfm/v1/lov';
-const showModal = ref(false);
-const xgrid = ref(null);
-const xmodal = ref(null);
-const subRecord = ref<IRecord>({});
-const modalType = ref('add');
-
-const height = window.innerHeight - 70;
-
-const columns = [
-  { field: 'dictCode', title: 'message.udp.dictCode', required: true, treeNode: true },
-  { field: 'dictName', title: 'message.udp.dictName', required: true },
-  { field: 'dictDesc', title: 'message.remark' },
-  { field: 'remarks', title: 'message.remark' },
-  { field: 'enabled', formatter: ['formatDict', 'SU.ENABLE'] },
-  {
-    field: 'operate',
-    title: 'message.operate',
-    width: 200,
-    fixed: 'right',
-    slots: {
-      default: ({ row }) => {
-        return [
-          <>
-            <ut-button
-              content="add"
-              status="warning"
-              auth="edit"
-              icon="ri-add-line"
-              onTap={() => handleAddChild(row)}
-            />
-            <ut-button content="edit" status="primary" auth="edit" onTap={() => handleEdit(row)} />
-            <ut-button content="del" status="danger" auth="del" onTap={() => handleDel(row)} />
-          </>
-        ];
-      }
-    }
-  }
-];
-
-const subItems = [
-  { field: 'dictCode', title: 'message.udp.dictCode', required: true },
-  { field: 'dictName', title: 'message.udp.dictName', required: true },
-  { field: 'dictDesc', title: 'message.remark' },
-  {
-    field: 'enabled',
-    itemRender: renderHook.renderSwitch({ openValue: '1', closeValue: '0', defaultValue: '1' })
-  }
-];
-
-const handleAdd = () => {
-  showModal.value = true;
-  modalType.value = 'add';
-  subRecord.value = { enabled: '1', parentId: props.record.id };
-};
-const handleAddChild = row => {
-  showModal.value = true;
-  modalType.value = 'add';
-  subRecord.value = { enabled: '1', parentId: row.id };
-};
-const handleDel = async row => {
-  const type = await VxeUI.modal.confirm(t('message.delRecord'));
-  if (type === 'confirm') {
-    await getServiceApi().delete(URL, [row]);
-    successMessage();
-    xgrid.value.refreshData();
-  }
-};
-const handleEdit = async row => {
-  showModal.value = true;
-  modalType.value = 'edit';
-  subRecord.value = clone(row, true);
-  console.log({ subRecord });
-};
-
-const onConfirm = async () => {
-  const query = {
-    ...subRecord.value,
-    orgId: useSystemStoreHook().getOrgId,
-    organizationId: useSystemStoreHook().getOrganizationId
-  };
-  xmodal.value.showLoading();
-  const method = modalType.value === 'add' ? 'post' : 'put';
-  const [err]: [Error, any] = await to(getServiceApi()[method](URL, [query]));
-  xmodal.value.hiddenLoading();
-  if (err) return;
-  showModal.value = modalType.value !== 'edit';
-  if (modalType.value === 'add') {
-    const parentId = subRecord.value.parentId;
-    subRecord.value = { enabled: '1', parentId };
-  }
-  successMessage();
-  xgrid.value.refreshData();
-};
-
-const onButtonClick = code => {
-  code === 'add' && handleAdd();
-};
-
-const emit = defineEmits<{
-  (e: 'onClose'): void;
-}>();
-
-// 抽屉关闭
-function handleClose() {
-  emit('onClose');
-}
-</script>
-
-<style lang="scss">
-.u-dict-config_wrapper {
-  .el-drawer__header {
-    margin-bottom: 0;
-  }
-}
-</style>
+<!--
+ * @Author: wei.li
+ * @Date: 2022-07-15 17:02:56
+ * @LastEditors: levi7754 levi7754@163.com
+ * @LastEditTime: 2026-01-14 10:21:33
+ * @Description: file contentu
+-->
+<template>
+  <div class="u-dict-config_wrapper">
+    <vxe-drawer
+      :model-value="show"
+      :title="$t('message.title.dictList', { name: record.dictName })"
+      position="right"
+      destroy-on-close
+      width="67%"
+      @close="handleClose"
+    >
+      <ut-grid
+        ref="xgrid"
+        :columns="columns"
+        :height="height"
+        :default-params="{ parentId: record.id }"
+        :buttons="[{ code: 'del', auth: '/' }]"
+        :tree-config="{ childrenField: 'children', expandAll: true }"
+        url="/upfm/v1/lov/children"
+        mode="form"
+        @buttonClick="onButtonClick"
+      />
+      <ut-modal-form
+        v-if="showModal"
+        ref="xmodal"
+        :record="subRecord"
+        :items="subItems"
+        width="400"
+        height="320"
+        :data-status="modalType"
+        :title="$t('message.title.dictInfo', { name: record.dictName })"
+        @close="showModal = false"
+        @confirm="onConfirm"
+      />
+    </vxe-drawer>
+  </div>
+</template>
+
+<script setup lang="tsx">
+import { ref } from 'vue';
+import { useI18n } from 'vue-i18n';
+import to from 'await-to-js';
+import { VxeUI } from 'vxe-pc-ui';
+import { successMessage, useRender } from '@utogether/utils';
+import { getServiceApi } from '../../../api';
+import { useSystemStoreHook } from '../../../store/modules/system';
+import { clone } from 'xe-utils';
+
+interface IProps {
+  record: IRecord;
+  show: boolean;
+}
+
+const props = withDefaults(defineProps<IProps>(), {
+  record: (): IRecord => {
+    return {};
+  },
+  show: false
+});
+const renderHook = useRender();
+const { t } = useI18n();
+
+const URL = '/upfm/v1/lov';
+const showModal = ref(false);
+const xgrid = ref(null);
+const xmodal = ref(null);
+const subRecord = ref<IRecord>({});
+const modalType = ref('add');
+
+const height = window.innerHeight - 70;
+
+const columns = [
+  { field: 'dictCode', title: 'message.udp.dictCode', required: true, treeNode: true },
+  { field: 'dictName', title: 'message.udp.dictName', required: true },
+  { field: 'dictDesc', title: 'message.udp.dictDesc' },
+  { field: 'remarks', title: 'message.remark' },
+  { field: 'enabled', formatter: ['formatDict', 'SU.ENABLE'] },
+  {
+    field: 'operate',
+    title: 'message.operate',
+    width: 200,
+    fixed: 'right',
+    slots: {
+      default: ({ row }) => {
+        return [
+          <>
+            <ut-button
+              content="add"
+              status="warning"
+              auth="edit"
+              icon="ri-add-line"
+              onTap={() => handleAddChild(row)}
+            />
+            <ut-button content="edit" status="primary" auth="edit" onTap={() => handleEdit(row)} />
+            <ut-button content="del" status="danger" auth="del" onTap={() => handleDel(row)} />
+          </>
+        ];
+      }
+    }
+  }
+];
+
+const subItems = [
+  { field: 'dictCode', title: 'message.udp.dictCode', required: true },
+  { field: 'dictName', title: 'message.udp.dictName', required: true },
+  { field: 'dictDesc', title: 'message.udp.dictDesc' },
+  { field: 'remarks', title: 'message.remark' },
+  {
+    field: 'enabled',
+    itemRender: renderHook.renderSwitch({ openValue: '1', closeValue: '0', defaultValue: '1' })
+  }
+];
+
+const handleAdd = () => {
+  showModal.value = true;
+  modalType.value = 'add';
+  subRecord.value = { enabled: '1', parentId: props.record.id };
+};
+const handleAddChild = row => {
+  showModal.value = true;
+  modalType.value = 'add';
+  subRecord.value = { enabled: '1', parentId: row.id };
+};
+const handleDel = async row => {
+  const type = await VxeUI.modal.confirm(t('message.delRecord'));
+  if (type === 'confirm') {
+    await getServiceApi().delete(URL, [row]);
+    successMessage();
+    xgrid.value.refreshData();
+  }
+};
+const handleEdit = async row => {
+  showModal.value = true;
+  modalType.value = 'edit';
+  subRecord.value = clone(row, true);
+  console.log({ subRecord });
+};
+
+const onConfirm = async () => {
+  const query = {
+    ...subRecord.value,
+    orgId: useSystemStoreHook().getOrgId,
+    organizationId: useSystemStoreHook().getOrganizationId
+  };
+  xmodal.value.showLoading();
+  const method = modalType.value === 'add' ? 'post' : 'put';
+  const [err]: [Error, any] = await to(getServiceApi()[method](URL, [query]));
+  xmodal.value.hiddenLoading();
+  if (err) return;
+  showModal.value = modalType.value !== 'edit';
+  if (modalType.value === 'add') {
+    const parentId = subRecord.value.parentId;
+    subRecord.value = { enabled: '1', parentId };
+  }
+  successMessage();
+  xgrid.value.refreshData();
+};
+
+const onButtonClick = code => {
+  code === 'add' && handleAdd();
+};
+
+const emit = defineEmits<{
+  (e: 'onClose'): void;
+}>();
+
+// 抽屉关闭
+function handleClose() {
+  emit('onClose');
+}
+</script>
+
+<style lang="scss">
+.u-dict-config_wrapper {
+  .el-drawer__header {
+    margin-bottom: 0;
+  }
+}
+</style>

package/src/views/uhome/components/home-todo.vue

@@ -2,7 +2,7 @@
  * @Author: levi7754 levi7754@163.com
  * @Date: 2025-11-05 18:11:29
  * @LastEditors: levi7754 levi7754@163.com
- * @LastEditTime: 2026-01-06 18:17:25
+ * @LastEditTime: 2026-01-08 14:30:52
  * @FilePath: \udp-crm\packages\udp-crm\src\views\uflow\todo\flow-todo.vue
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
 -->
@@ -20,10 +20,12 @@
         <ut-grid
           ref="xgrid"
           :columns="columns"
-          :editable="false"
           :data="data.todo"
           :events="events"
+          :editable="false"
+          :need-export="false"
           :proxy-config="{ enabled: false }"
+          :toolbar-config="{ enabled: false }"
           height="360"
         />
       </vxe-tab-pane>
@@ -38,10 +40,12 @@
         <ut-grid
           ref="ygrid"
           :columns="columns"
-          :editable="false"
           :data="data.finish"
           :events="events"
+          :editable="false"
+          :need-export="false"
           :proxy-config="{ enabled: false }"
+          :toolbar-config="{ enabled: false }"
           height="360"
         />
         />
@@ -57,10 +61,11 @@
 import { useRouter } from 'vue-router';
 import { ref, onMounted, nextTick } from 'vue';
 
-import { useSystemStoreHook } from '../../../store/modules/system';
+import { cookies } from '@utogether/utils';
 import { isEmpty } from 'xe-utils';
 import to from 'await-to-js';
 import { getServiceApi } from '../../../api';
+import { kLOGINER } from '../../../contant';
 const router = useRouter();
 
 const xgrid = ref(null);
@@ -132,7 +137,7 @@ const getDataList = async (type, searchField) => {
   const params = {
     ...data.value[`${activeName.value}Page`],
     searchField,
-    userName: useSystemStoreHook().getUserInfo.userName
+    userName: cookies.get(kLOGINER)
   };
   const [err, res]: any = await to(getServiceApi().post(url + uri, params));
   if (err) return;