@utogether/udp-core 1.0.1-beta.3 → 1.0.1-beta.30

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

@@ -2,7 +2,7 @@
  * @Author: wei.li
  * @Date: 2022-07-15 17:02:56
  * @LastEditors: levi7754 levi7754@163.com
- * @LastEditTime: 2025-04-08 15:29:30
+ * @LastEditTime: 2025-11-19 18:36:06
  * @Description: file contentu
 -->
 <template>
@@ -15,55 +15,17 @@
       destroy-on-close
       size="76%"
     >
-      <div style="margin: 10px">
-        <vxe-toolbar>
-          <template #buttons>
-            <vxe-button status="primary" icon="vxe-icon-add" @click="onAdd">
-              {{ $t('message.btn.add') }}
-            </vxe-button>
-          </template>
-          <template #tools>
-            <vxe-button icon="vxe-icon-refresh" @click="getDict" />
-          </template>
-        </vxe-toolbar>
-        <vxe-table
-          border
-          row-id="id"
-          :data="tableData"
-          :loading="loading"
-          :tree-config="{ childrenField: 'children', expandAll: true }"
-        >
-          <vxe-table-column type="seq" width="130" :title="$t('message.seqNo')" tree-node />
-          <vxe-table-column field="dictCode" :title="$t('message.udp.dictCode')" />
-          <vxe-table-column field="dictName" :title="$t('message.udp.dictName')" />
-          <vxe-table-column field="dictDesc" :title="$t('message.remark')" />
-          <vxe-table-column field="enabled" :title="$t('message.enabled')" width="100">
-            <template #default="{ row }">
-              <span>{{ row.enabled === '1' ? $t('message.enabled') : $t('message.disabled') }}</span>
-            </template>
-          </vxe-table-column>
-          <vxe-table-column field="" :title="$t('message.operate')" width="200">
-            <template #default="{ row }">
-              <ut-button status="primary" content="edit" @tap="onEdit(row)" />
-              <ut-button status="warning" content="delete" @tap="onDel(row)" />
-              <ut-button
-                status="success"
-                content="add"
-                :disabled="row.enabled !== '1'"
-                @tap="onChildren(row)"
-              />
-            </template>
-          </vxe-table-column>
-        </vxe-table>
-      </div>
-      <!-- <ut-grid
-        ref="gridRef"
+      <ut-grid
+        ref="xgrid"
         :columns="columns"
-        url="/upfm/v1/lov"
+        :height="height"
         :default-params="{ parentId: record.id }"
-        :default-value="{ parentId: record.id }"
-        :events="onEvents"
-      /> -->
+        :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"
@@ -80,14 +42,15 @@
   </div>
 </template>
 
-<script setup lang="ts">
-import { ref, onMounted } from 'vue';
+<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;
@@ -104,12 +67,44 @@ const renderHook = useRender();
 const { t } = useI18n();
 
 const URL = '/upfm/v1/lov';
-const tableData = ref([]);
-const loading = ref(false);
 const showModal = ref(false);
+const xgrid = ref(null);
+const xmodal = ref(null);
 const subRecord = ref<IRecord>({});
-const temp = 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: '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 },
@@ -117,47 +112,31 @@ const subItems = [
   {
     field: 'enabled',
     itemRender: renderHook.renderSwitch({ openValue: '1', closeValue: '0', defaultValue: '1' })
-    // itemRender: renderHook.renderDict({ code: 'SU.ENABLE', defaultValue: '1' })
-    // formatter: ['formatDict', 'SU.ENABLE']
   }
 ];
 
-const onAdd = () => {
+const handleAdd = () => {
   showModal.value = true;
   modalType.value = 'add';
-  subRecord.value = {
-    dictCode: '',
-    dictName: '',
-    dictDesc: '',
-    enabled: '1'
-  };
-  temp.value = props.record;
+  subRecord.value = { enabled: '1', parentId: props.record.id };
 };
-const onChildren = row => {
+const handleAddChild = row => {
   showModal.value = true;
-  modalType.value = 'child';
-  subRecord.value = {
-    dictCode: '',
-    dictName: '',
-    dictDesc: '',
-    enabled: '1'
-  };
-  temp.value = JSON.parse(JSON.stringify(row));
+  modalType.value = 'add';
+  subRecord.value = { enabled: '1', parentId: row.id };
 };
-const onDel = async row => {
-  const type = await VxeUI.modal.confirm(t('message.deleteRecord'));
+const handleDel = async row => {
+  const type = await VxeUI.modal.confirm(t('message.delRecord'));
   if (type === 'confirm') {
     await getServiceApi().delete(URL, [row]);
     successMessage();
-    getDict();
+    xgrid.value.refreshData();
   }
 };
-const onEdit = async row => {
-  // const type = await VXETable.modal.confirm('此删除操作不可逆,确定继续?');
+const handleEdit = async row => {
   showModal.value = true;
   modalType.value = 'edit';
-  temp.value = props.record;
-  subRecord.value = JSON.parse(JSON.stringify(row));
+  subRecord.value = clone(row, true);
   console.log({ subRecord });
 };
 
@@ -165,38 +144,23 @@ const onConfirm = async () => {
   const query = {
     ...subRecord.value,
     orgId: useSystemStoreHook().getOrgId,
-    organizationId: useSystemStoreHook().getOrganizationId,
-    parentId: subRecord.value.parentId || temp.value.id
+    organizationId: useSystemStoreHook().getOrganizationId
   };
-  let type = 'post';
-  if (['add', 'child'].includes(modalType.value)) {
-    type = 'post';
-  } else {
-    type = 'put';
-  }
-  loading.value = true;
-  const [err, res]: [Error, any] = await to(getServiceApi()[type](URL, [query]));
-  loading.value = false;
-  if (!err) {
-    console.log({ res });
-    showModal.value = false;
-    successMessage();
-    getDict();
+  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') {
+    subRecord.value = { enabled: '1' };
   }
+  successMessage();
+  xgrid.value.refreshData();
 };
 
-const getDict = async () => {
-  const query = {
-    parentId: props.record.id
-  };
-  loading.value = true;
-  const [err, res]: [Error, any] = await to(getServiceApi().get(URL + '/children', query));
-  loading.value = false;
-  if (!err) {
-    tableData.value = res.list;
-    // status.value = 'update';
-    // successMessage();
-  }
+const onButtonClick = code => {
+  code === 'add' && handleAdd();
 };
 
 const emit = defineEmits<{
@@ -207,10 +171,6 @@ const emit = defineEmits<{
 function handleClose() {
   emit('onClose');
 }
-
-onMounted(() => {
-  getDict();
-});
 </script>
 
 <style lang="scss">

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

@@ -7,13 +7,7 @@
 -->
 <template>
   <div class="ut-loview-wrapper">
-    <el-drawer
-      :model-value="show"
-      :with-header="false"
-      :show-close="false"
-      :close-on-click-modal="false"
-      size="90%"
-    >
+    <el-drawer :model-value="show" :with-header="false" :show-close="false" :close-on-click-modal="false" size="90%">
       <div v-spinning="loading">
         <ut-content :title="$t('message.title.lovView')" @close="handleClose">
           <template v-slot:header>

package/src/views/udev/lov/lov-view.vue

@@ -1,91 +1,91 @@
-<!--
- * @Author: wei.li
- * @Date: 2022-08-10 09:10:39
- * @LastEditors: levi7754 levi7754@163.com
- * @LastEditTime: 2025-04-08 15:31:20
- * @Description: 值集视图
--->
-<template>
-  <div>
-    <ut-grid ref="xgrid" :items="formItems" :columns="columns" :url="url" :events="onEvents" />
-    <child-view v-if="shouDrawer" :show="shouDrawer" :record="record" @onClose="handleClose" />
-  </div>
-</template>
-
-<script setup lang="tsx">
-import { ref, nextTick } from 'vue';
-// import { VxeGridInstance } from 'vxe-table';
-import to from 'await-to-js';
-import { getServiceApi } from '../../../api';
-import childView from './childView.vue';
-import { useRender } from '@utogether/utils';
-
-defineOptions({ name: 'LovView' });
-
-const xgrid = ref(null);
-
-const formItems = [{ field: 'lovCode' }, { field: 'lovName' }];
-
-const renderHook = useRender();
-
-const url = '/upfm/v1/lovViewHeader';
-
-// 列字段
-const columns = [
-  { type: 'checkbox', width: 50, align: 'center' },
-  {
-    field: 'lovCode',
-    required: true,
-    editRender: renderHook.renderInput()
-  },
-  { field: 'lovName', required: true, editRender: renderHook.renderInput() },
-  { field: 'valueField', required: true, editRender: renderHook.renderInput() },
-  { field: 'lovTitle', editRender: renderHook.renderInput() },
-  {
-    field: 'lovType',
-    editRender: renderHook.renderDict('SU.LOV.TYPE'),
-    required: true,
-    formatter: ['formatDict', 'SU.LOV.TYPE']
-  },
-  { field: 'remarks', title: 'message.remark', editRender: renderHook.renderInput() },
-  { field: 'enabled', width: 80, cellRender: renderHook.renderEnabled(handleClick) },
-  {
-    field: 'operate',
-    width: 100,
-    fixed: 'right',
-    slots: {
-      default: ({ row }) => {
-        if (!row.id) return null;
-        return [<ut-button content="config" icon="ri-edit-box-line" onTap={() => 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;
-};
-
-// 启用/禁用
-async function handleClick(row) {
-  const [err] = await to(getServiceApi().put(url, [row]));
-  !err && xgrid.value.refreshData();
-}
-
-const onEvents = {
-  editActived({ row }) {
-    columns[1].editRender.props.disabled = !!row.id;
-    xgrid.value.refreshColumn();
-  }
-};
-</script>
+<!--
+ * @Author: wei.li
+ * @Date: 2022-08-10 09:10:39
+ * @LastEditors: levi7754 levi7754@163.com
+ * @LastEditTime: 2025-04-08 15:31:20
+ * @Description: 值集视图
+-->
+<template>
+  <div>
+    <ut-grid ref="xgrid" :items="formItems" :columns="columns" :url="url" :events="onEvents" />
+    <child-view v-if="shouDrawer" :show="shouDrawer" :record="record" @onClose="handleClose" />
+  </div>
+</template>
+
+<script setup lang="tsx">
+import { ref, nextTick } from 'vue';
+// import { VxeGridInstance } from 'vxe-table';
+import to from 'await-to-js';
+import { getServiceApi } from '../../../api';
+import childView from './childView.vue';
+import { useRender } from '@utogether/utils';
+
+defineOptions({ name: 'LovView' });
+
+const xgrid = ref(null);
+
+const formItems = [{ field: 'lovCode' }, { field: 'lovName' }];
+
+const renderHook = useRender();
+
+const url = '/upfm/v1/lovViewHeader';
+
+// 列字段
+const columns = [
+  { type: 'checkbox', width: 50, align: 'center' },
+  {
+    field: 'lovCode',
+    required: true,
+    editRender: renderHook.renderInput()
+  },
+  { field: 'lovName', required: true, editRender: renderHook.renderInput() },
+  { field: 'valueField', required: true, editRender: renderHook.renderInput() },
+  { field: 'lovTitle', editRender: renderHook.renderInput() },
+  {
+    field: 'lovType',
+    editRender: renderHook.renderDict('SU.LOV.TYPE'),
+    required: true,
+    formatter: ['formatDict', 'SU.LOV.TYPE']
+  },
+  { field: 'remarks', title: 'message.remark', editRender: renderHook.renderInput() },
+  { field: 'enabled', width: 80, cellRender: renderHook.renderEnabled(handleClick) },
+  {
+    field: 'operate',
+    width: 100,
+    fixed: 'right',
+    slots: {
+      default: ({ row }) => {
+        if (!row.id) return null;
+        return [<ut-button content="config" icon="ri-edit-box-line" onTap={() => 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;
+};
+
+// 启用/禁用
+async function handleClick(row) {
+  const [err] = await to(getServiceApi().put(url, [row]));
+  !err && xgrid.value.refreshData();
+}
+
+const onEvents = {
+  editActived({ row }) {
+    columns[1].editRender.props.disabled = !!row.id;
+    xgrid.value.refreshColumn();
+  }
+};
+</script>

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

@@ -24,17 +24,17 @@ const xgrid = ref(null);
 const url = '/ufil/v1/attachment';
 
 const formItems = [
-  { field: 'fileName', title: 'message.file.fileName' },
+  { field: 'fileName', title: 'message.urpt.fileName' },
   { field: 'creationDate', itemRender: { name: '#SuDateRange', props: { type: 'daterange' } } },
   { field: 'createdByName' }
 ];
 
 // 列字段
 const columns = [
-  { field: 'fileName', title: 'message.file.fileName', width: 240 },
-  { field: 'fileSize', title: 'message.file.fileSize', width: 110 },
-  { field: 'fileExtend', title: 'message.file.fileExtend', width: 100 },
-  { field: 'realpath', title: 'message.file.filePath' },
+  { field: 'fileName', title: 'message.urpt.fileName', width: 240 },
+  { field: 'fileSize', title: 'message.urpt.fileSize', width: 110 },
+  { field: 'fileExtend', title: 'message.urpt.fileExtend', width: 100 },
+  { field: 'realpath', title: 'message.urpt.filePath' },
   { field: 'createdByName', width: 120 },
   { field: 'creationDate', width: 160 },
   {

package/src/views/ufile/file/water-mark.vue

@@ -25,15 +25,15 @@ const renderHook = useRender();
 const url = '/ufil/v1/watermark';
 
 const formItems = [
-  { field: 'watermarkCode', title: 'message.file.watermarkContent' },
+  { field: 'watermarkCode', title: 'message.urpt.watermarkContent' },
   {
     field: 'watermarkType',
-    title: 'message.file.watermarkType',
+    title: 'message.urpt.watermarkType',
     itemRender: renderHook.renderDict('SU.WATERMARK.TYPE')
   },
   {
     field: 'textAlign',
-    title: 'message.file.textAlign',
+    title: 'message.urpt.textAlign',
     itemRender: renderHook.renderDict('SU.ALIGN.TYPE')
   }
 ];
@@ -43,14 +43,14 @@ const columns = [
   { type: 'checkbox', width: 40, align: 'center' },
   {
     field: 'watermarkCode',
-    title: 'message.file.watermarkContent',
+    title: 'message.urpt.watermarkContent',
     required: true,
     minWidth: 110,
     editRender: renderHook.renderInput()
   },
   {
     field: 'watermarkType',
-    title: 'message.file.watermarkType',
+    title: 'message.urpt.watermarkType',
     width: 120,
     required: true,
     editRender: renderHook.renderDict({ code: 'SU.WATERMARK.TYPE', defaultValue: 'text' }),
@@ -58,13 +58,13 @@ const columns = [
   },
   {
     field: 'content',
-    title: 'message.file.watermarkContent',
+    title: 'message.urpt.watermarkContent',
     width: 110,
     editRender: renderHook.renderInput()
   },
   {
     field: 'textAlign',
-    title: 'message.file.textAlign',
+    title: 'message.urpt.textAlign',
     width: 120,
     required: true,
     editRender: renderHook.renderDict('SU.ALIGN.TYPE'),
@@ -72,32 +72,32 @@ const columns = [
   },
   {
     field: 'watermarkTrigger',
-    title: 'message.file.watermarkTrigger',
+    title: 'message.urpt.watermarkTrigger',
     width: 120,
     required: true,
     editRender: renderHook.renderDict('SU.WATERMARK.TRIGGER'),
     formatter: ['formatDict', 'SU.WATERMARK.TRIGGER']
   },
-  { field: 'color', title: 'message.file.color', width: 90, editRender: renderHook.renderInput() },
+  { field: 'color', title: 'message.urpt.color', width: 90, editRender: renderHook.renderInput() },
   {
     field: 'fillOpacity',
-    title: 'message.file.fillOpacity',
+    title: 'message.urpt.fillOpacity',
     width: 100,
     editRender: renderHook.renderNumber()
   },
   {
     field: 'fontSize',
-    title: 'message.file.fontSize',
+    title: 'message.urpt.fontSize',
     width: 110,
     editRender: renderHook.renderNumber()
   },
   {
     field: 'rotation',
-    title: 'message.file.rotation',
+    title: 'message.urpt.rotation',
     width: 110,
     editRender: renderHook.renderNumber()
   },
-  { field: 'xAxis', title: 'message.file.xAxis', width: 100, editRender: renderHook.renderNumber() },
-  { field: 'yAxis', title: 'message.file.yAxis', width: 100, editRender: renderHook.renderNumber() }
+  { field: 'xAxis', title: 'message.urpt.xAxis', width: 100, editRender: renderHook.renderNumber() },
+  { field: 'yAxis', title: 'message.urpt.yAxis', width: 100, editRender: renderHook.renderNumber() }
 ];
 </script>