@utogether/udp-core 1.0.1-beta.9 → 1.0.2

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

@@ -1,222 +1,183 @@
-<!--
- * @Author: wei.li
- * @Date: 2022-07-15 17:02:56
- * @LastEditors: levi7754 levi7754@163.com
- * @LastEditTime: 2025-04-08 15:29:30
- * @Description: file contentu
--->
-<template>
-  <div class="u-dict-config_wrapper">
-    <el-drawer
-      :model-value="show"
-      :before-close="handleClose"
-      :title="$t('message.title.dictList', { name: record.dictName })"
-      direction="rtl"
-      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"
-        :columns="columns"
-        url="/upfm/v1/lov"
-        :default-params="{ parentId: record.id }"
-        :default-value="{ parentId: record.id }"
-        :events="onEvents"
-      /> -->
-      <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"
-      />
-    </el-drawer>
-  </div>
-</template>
-
-<script setup lang="ts">
-import { ref, onMounted } 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';
-
-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 tableData = ref([]);
-const loading = ref(false);
-const showModal = ref(false);
-const subRecord = ref<IRecord>({});
-const temp = ref<IRecord>({});
-const modalType = ref('add');
-
-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' })
-    // itemRender: renderHook.renderDict({ code: 'SU.ENABLE', defaultValue: '1' })
-    // formatter: ['formatDict', 'SU.ENABLE']
-  }
-];
-
-const onAdd = () => {
-  showModal.value = true;
-  modalType.value = 'add';
-  subRecord.value = {
-    dictCode: '',
-    dictName: '',
-    dictDesc: '',
-    enabled: '1'
-  };
-  temp.value = props.record;
-};
-const onChildren = row => {
-  showModal.value = true;
-  modalType.value = 'child';
-  subRecord.value = {
-    dictCode: '',
-    dictName: '',
-    dictDesc: '',
-    enabled: '1'
-  };
-  temp.value = JSON.parse(JSON.stringify(row));
-};
-const onDel = async row => {
-  const type = await VxeUI.modal.confirm(t('message.deleteRecord'));
-  if (type === 'confirm') {
-    await getServiceApi().delete(URL, [row]);
-    successMessage();
-    getDict();
-  }
-};
-const onEdit = async row => {
-  // const type = await VXETable.modal.confirm('此删除操作不可逆,确定继续?');
-  showModal.value = true;
-  modalType.value = 'edit';
-  temp.value = props.record;
-  subRecord.value = JSON.parse(JSON.stringify(row));
-  console.log({ subRecord });
-};
-
-const onConfirm = async () => {
-  const query = {
-    ...subRecord.value,
-    orgId: useSystemStoreHook().getOrgId,
-    organizationId: useSystemStoreHook().getOrganizationId,
-    parentId: subRecord.value.parentId || temp.value.id
-  };
-  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 });
-    if (modalType.value === 'edit') {
-      showModal.value = false;
-    } else {
-      subRecord.value = { enabled: '1' };
-    }
-    successMessage();
-    getDict();
-  }
-};
-
-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 emit = defineEmits<{
-  (e: 'onClose'): void;
-}>();
-
-// 抽屉关闭
-function handleClose() {
-  emit('onClose');
-}
-
-onMounted(() => {
-  getDict();
-});
-</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: 2025-11-24 13:44:45
+ * @Description: file contentu
+-->
+<template>
+  <div class="u-dict-config_wrapper">
+    <el-drawer
+      :model-value="show"
+      :before-close="handleClose"
+      :title="$t('message.title.dictList', { name: record.dictName })"
+      direction="rtl"
+      destroy-on-close
+      size="76%"
+    >
+      <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"
+      />
+    </el-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: '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>

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>