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

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

@@ -2,7 +2,7 @@
  * @Author: wei.li
  * @Date: 2021-12-23 17:33:21
  * @LastEditors: levi7754 levi7754@163.com
- * @LastEditTime: 2025-11-25 10:16:48
+ * @LastEditTime: 2025-12-05 16:58:27
  * @Description: 数据字典
 -->
 <template>
@@ -79,7 +79,7 @@ const columns = [
     slots: {
       default: ({ row }) => {
         if (!row.id) return null;
-        return [<ut-button content="lov" onClick={() => hanldeDipose(row)} />];
+        return [<ut-button content="lov" icon="ri-dice-6-line" onClick={() => hanldeDipose(row)} />];
       }
     }
   }

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

@@ -2,18 +2,18 @@
  * @Author: wei.li
  * @Date: 2022-07-15 17:02:56
  * @LastEditors: levi7754 levi7754@163.com
- * @LastEditTime: 2025-11-24 13:44:45
+ * @LastEditTime: 2025-12-05 16:49:52
  * @Description: file contentu
 -->
 <template>
   <div class="u-dict-config_wrapper">
-    <el-drawer
+    <vxe-drawer
       :model-value="show"
-      :before-close="handleClose"
       :title="$t('message.title.dictList', { name: record.dictName })"
-      direction="rtl"
+      position="right"
       destroy-on-close
-      size="76%"
+      width="67%"
+      @close="handleClose"
     >
       <ut-grid
         ref="xgrid"
@@ -38,7 +38,7 @@
         @close="showModal = false"
         @confirm="onConfirm"
       />
-    </el-drawer>
+    </vxe-drawer>
   </div>
 </template>
 

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

@@ -1,174 +1,174 @@
-<!--
- * @Author: wei.li
- * @Date: 2022-07-15 17:02:56
- * @LastEditors: levi7754 levi7754@163.com
- * @LastEditTime: 2025-04-29 11:22:03
- * @Description: file contentu
--->
-<template>
-  <div class="ut-loview-wrapper">
-    <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>
-            <ut-button icon="ri-save-3-fill" content="save" @tap="handleSave()" />
-          </template>
-          <template v-slot:body>
-            <ut-form ref="formRef" :record="record" :items="items" data-status="update" />
-            <ut-divider :title="$t('message.title.lovColConfig')" />
-            <ut-grid
-              ref="xgrid"
-              :columns="columns"
-              :url="subUrl"
-              :default-value="{ headerId: record.id }"
-              :default-params="{ headerId: record.id }"
-              :height="height"
-              :events="onEvents"
-            />
-          </template>
-        </ut-content>
-      </div>
-    </el-drawer>
-  </div>
-</template>
-
-<script setup lang="ts">
-import { ref } from 'vue';
-import to from 'await-to-js';
-import { useRender } from '@utogether/utils';
-import { useSystemStoreHook } from '../../../store/modules/system';
-import { getServiceApi } from '../../../api';
-
-interface IProps {
-  record: IRecord;
-  show: boolean;
-}
-
-const props = withDefaults(defineProps<IProps>(), {
-  record: (): IRecord => {
-    return {};
-  },
-  show: false
-});
-
-const renderHook = useRender();
-const dictData = useSystemStoreHook().dicts;
-const loading = ref(false);
-const optionProps = { value: 'dictCode', label: 'dictName' };
-
-const formRef = ref(null);
-
-const url = '/upfm/v1/lovViewHeader';
-const subUrl = '/upfm/v1/lovViewLine';
-
-const items = [
-  { field: 'lovCode', disabled: true },
-  { field: 'lovName', required: true },
-  { field: 'valueField', required: true },
-  // { field: 'displayField', required: true },
-  { field: 'lovTitle' },
-  { field: 'lovType', code: 'SU.LOV.TYPE', required: true },
-  { field: 'lovUrl', required: true, visible: props.record.lovType === 'url' },
-  {
-    field: 'sqlStatement',
-    span: 24,
-    visible: props.record.lovType === 'sql',
-    itemRender: { name: '$textarea', props: { rows: 5 } },
-    required: true
-  }
-];
-
-// 列字段
-const columns: ITableColProps[] = [
-  { type: 'checkbox', width: 50, align: 'center' },
-  { field: 'seqNo', required: true, width: 100, editRender: renderHook.renderNumber() },
-  { field: 'colField', required: true, editRender: renderHook.renderInput() },
-  { field: 'colTitle', required: true, editRender: renderHook.renderInput() },
-  { field: 'colWidth', required: true, width: 120, editRender: renderHook.renderNumber() },
-  {
-    field: 'fieldType',
-    width: 120,
-    editRender: renderHook.renderDict('SU.FIELD.TYPE', onChange),
-    formatter: ['formatDict', 'SU.FIELD.TYPE']
-  },
-  {
-    field: 'dictCode',
-    title: 'message.dictName',
-    width: 120,
-    editRender: renderHook.renderSelectLocal({ options: dictData, optionProps }),
-    formatter: ['formatSelectLocal', [dictData, 'dictCode', 'dictName']]
-  },
-  {
-    field: 'isSearch',
-    width: 120,
-    required: true,
-    editRender: renderHook.renderDict('SU.WHETHER'),
-    formatter: ['formatDict', 'SU.WHETHER']
-  },
-  {
-    field: 'isCol',
-    width: 120,
-    required: true,
-    editRender: renderHook.renderDict('SU.WHETHER'),
-    formatter: ['formatDict', 'SU.WHETHER']
-  }
-];
-
-const xgrid = ref(null);
-const height = window.innerHeight - 300;
-
-//激活事件
-const onEvents = {
-  editActived({ row }) {
-    columns[6].editRender.props.disabled = row.fieldType !== 'dictCode';
-  }
-};
-
-// change事件
-function onChange(item) {
-  item.row.dictName = '';
-  columns[6].editRender.props.disabled = item.row.fieldType !== 'dictCode';
-  columns[6].required = item.row.fieldType !== 'dictCode';
-}
-
-/**
- * @description: 保存值集视图
- * @return {*}
- */
-const handleSave = () => {
-  formRef.value.validateForm(async valid => {
-    if (!valid) {
-      loading.value = true;
-      const [err] = await to(getServiceApi().put(url, [props.record]));
-      if (!err) {
-        const data = xgrid.value.getInstance().getRecordset();
-        data.insertRecords.length && (await to(getServiceApi().post(subUrl, data.insertRecords)));
-        data.updateRecords.length && (await to(getServiceApi().put(subUrl, data.updateRecords)));
-      }
-      loading.value = false;
-    }
-  });
-};
-
-const emit = defineEmits<{ (e: 'onClose'): void }>();
-// 抽屉关闭
-function handleClose() {
-  emit('onClose');
-}
-</script>
-
-<style lang="scss">
-.ut-loview-wrapper {
-  .el-drawer__header {
-    margin-bottom: 0;
-  }
-
-  .el-drawer__body {
-    padding: 5px 0;
-  }
-
-  .ut-content-body {
-    height: 90%;
-  }
-}
-</style>
+<!--
+ * @Author: wei.li
+ * @Date: 2022-07-15 17:02:56
+ * @LastEditors: levi7754 levi7754@163.com
+ * @LastEditTime: 2025-12-05 17:00:29
+ * @Description: file contentu
+-->
+<template>
+  <div class="ut-loview-wrapper">
+    <vxe-drawer :model-value="show" position="right" :show-header="false" width="90%">
+      <div v-spinning="loading">
+        <ut-content :title="$t('message.title.lovView')" @close="handleClose">
+          <template v-slot:header>
+            <ut-button icon="ri-save-3-fill" content="save" @tap="handleSave()" />
+          </template>
+          <template v-slot:body>
+            <ut-form ref="formRef" :record="record" :items="items" data-status="update" />
+            <ut-divider :title="$t('message.title.lovColConfig')" />
+            <ut-grid
+              ref="xgrid"
+              :columns="columns"
+              :url="subUrl"
+              :default-value="{ headerId: record.id }"
+              :default-params="{ headerId: record.id }"
+              :height="height"
+              :events="onEvents"
+            />
+          </template>
+        </ut-content>
+      </div>
+    </vxe-drawer>
+  </div>
+</template>
+
+<script setup lang="ts">
+import { ref } from 'vue';
+import to from 'await-to-js';
+import { useRender } from '@utogether/utils';
+import { useSystemStoreHook } from '../../../store/modules/system';
+import { getServiceApi } from '../../../api';
+
+interface IProps {
+  record: IRecord;
+  show: boolean;
+}
+
+const props = withDefaults(defineProps<IProps>(), {
+  record: (): IRecord => {
+    return {};
+  },
+  show: false
+});
+
+const renderHook = useRender();
+const dictData = useSystemStoreHook().dicts;
+const loading = ref(false);
+const optionProps = { value: 'dictCode', label: 'dictName' };
+
+const formRef = ref(null);
+
+const url = '/upfm/v1/lovViewHeader';
+const subUrl = '/upfm/v1/lovViewLine';
+
+const items = [
+  { field: 'lovCode', disabled: true },
+  { field: 'lovName', required: true },
+  { field: 'valueField', required: true },
+  // { field: 'displayField', required: true },
+  { field: 'lovTitle' },
+  { field: 'lovType', code: 'SU.LOV.TYPE', required: true },
+  { field: 'lovUrl', required: true, visible: props.record.lovType === 'url' },
+  {
+    field: 'sqlStatement',
+    span: 24,
+    visible: props.record.lovType === 'sql',
+    itemRender: { name: '$textarea', props: { rows: 5 } },
+    required: true
+  }
+];
+
+// 列字段
+const columns: ITableColProps[] = [
+  { type: 'checkbox', width: 50, align: 'center' },
+  { field: 'seqNo', required: true, width: 100, editRender: renderHook.renderNumber() },
+  { field: 'colField', required: true, editRender: renderHook.renderInput() },
+  { field: 'colTitle', required: true, editRender: renderHook.renderInput() },
+  { field: 'colWidth', required: true, width: 120, editRender: renderHook.renderNumber() },
+  {
+    field: 'fieldType',
+    width: 120,
+    editRender: renderHook.renderDict('SU.FIELD.TYPE', onChange),
+    formatter: ['formatDict', 'SU.FIELD.TYPE']
+  },
+  {
+    field: 'dictCode',
+    title: 'message.dictName',
+    width: 120,
+    editRender: renderHook.renderSelectLocal({ options: dictData, optionProps }),
+    formatter: ['formatSelectLocal', [dictData, 'dictCode', 'dictName']]
+  },
+  {
+    field: 'isSearch',
+    width: 120,
+    required: true,
+    editRender: renderHook.renderDict('SU.WHETHER'),
+    formatter: ['formatDict', 'SU.WHETHER']
+  },
+  {
+    field: 'isCol',
+    width: 120,
+    required: true,
+    editRender: renderHook.renderDict('SU.WHETHER'),
+    formatter: ['formatDict', 'SU.WHETHER']
+  }
+];
+
+const xgrid = ref(null);
+const height = window.innerHeight - 195;
+
+//激活事件
+const onEvents = {
+  editActived({ row }) {
+    columns[6].editRender.props.disabled = row.fieldType !== 'dictCode';
+  }
+};
+
+// change事件
+function onChange(item) {
+  item.row.dictName = '';
+  columns[6].editRender.props.disabled = item.row.fieldType !== 'dictCode';
+  columns[6].required = item.row.fieldType !== 'dictCode';
+}
+
+/**
+ * @description: 保存值集视图
+ * @return {*}
+ */
+const handleSave = () => {
+  formRef.value.validateForm(async valid => {
+    if (!valid) {
+      loading.value = true;
+      const [err] = await to(getServiceApi().put(url, [props.record]));
+      if (!err) {
+        const data = xgrid.value.getInstance().getRecordset();
+        data.insertRecords.length && (await to(getServiceApi().post(subUrl, data.insertRecords)));
+        data.updateRecords.length && (await to(getServiceApi().put(subUrl, data.updateRecords)));
+      }
+      loading.value = false;
+    }
+  });
+};
+
+const emit = defineEmits<{ (e: 'onClose'): void }>();
+// 抽屉关闭
+function handleClose() {
+  emit('onClose');
+}
+</script>
+
+<style lang="scss">
+.ut-loview-wrapper {
+  .el-drawer__header {
+    margin-bottom: 0;
+  }
+
+  .el-drawer__body {
+    padding: 5px 0;
+  }
+
+  .ut-content-body {
+    height: 90%;
+  }
+}
+</style>

package/src/views/uhome/components/menu-favorite.vue

@@ -226,6 +226,7 @@ const onChange = (menu, event) => {
 const onMoveEnd = () => {
   favoriteMenus.value.forEach((item, idx) => {
     item.seqNo = (idx + 1) * 10;
+    console.log('seqNo=', item.seqNo);
   });
 };
 /** 获取排序最大值 */
@@ -234,11 +235,11 @@ const getMax = () => {
 };
 const onConfirm = () => {
   console.log(favoriteMenus);
-  const body = favoriteMenus.value.map(m => {
+  const body = favoriteMenus.value.map((m, idx) => {
     return {
       userName: props.userName,
       menuId: m.menuId,
-      seqNo: m.seqNo
+      seqNo: 10 * (idx + 1)
     };
   });
   console.log(body);

package/src/views/ulogin/login.vue

@@ -287,29 +287,40 @@ const insertLoginInfo = username => {
 };
 
 const getSysConfig = async () => {
-  const [err, data]: [Error, any] = await to(serviceApi.get('/upfm/v1/sysConfig', {}));
-  if (!err) {
-    const config: any = {};
-    data.list?.forEach(item => {
-      config[item.configCode] = item.configValue;
-      if (item.fileName) {
-        config[item.configCode] = getBaseURL() + '/ufil' + item.configValue;
-      }
-    });
-    const title = data.list?.find(f => f.configCode === 'title')?.configValue;
-    config['title'] = title || 'U-DP';
-    sysConfig.value = config;
-    bgStyle.value = {
-      backgroundImage: config['backgroundImg'] ? `url(${config['backgroundImg']})` : ``,
-      // backgroundImage: config['backgroundImg'] ? `url(${config['backgroundImg']})` : `url1(${welcome})`,
-      backgroundRepeat: 'no-repeat',
-      backgroundPosition: 'center'
-    };
-    console.log('bgStyle=', bgStyle);
-    const favicon = useFavicon();
-    favicon.value = config.favicon || utogether;
-    storageLocal.setItem(kSYSCONFIG, config);
-  }
+  // const [err, data]: [Error, any] = await to(serviceApi.get('/upfm/v1/sysConfig', {}));
+  // if (!err) {
+  //   const config: any = {};
+  //   data.list?.forEach(item => {
+  //     config[item.configCode] = item.configValue;
+  //     if (item.fileName) {
+  //       config[item.configCode] = getBaseURL() + '/ufil' + item.configValue;
+  //     }
+  //   });
+  //   const title = data.list?.find(f => f.configCode === 'title')?.configValue;
+  //   config['title'] = title || 'U-DP';
+  //   sysConfig.value = config;
+  //   bgStyle.value = {
+  //     backgroundImage: config['backgroundImg'] ? `url(${config['backgroundImg']})` : ``,
+  //     // backgroundImage: config['backgroundImg'] ? `url(${config['backgroundImg']})` : `url1(${welcome})`,
+  //     backgroundRepeat: 'no-repeat',
+  //     backgroundPosition: 'center'
+  //   };
+  //   console.log('bgStyle=', bgStyle);
+  //   const favicon = useFavicon();
+  //   favicon.value = config.favicon || utogether;
+  //   storageLocal.setItem(kSYSCONFIG, config);
+  // }
+
+  sysConfig.value = storageLocal.getItem(kSYSCONFIG);
+
+  bgStyle.value = {
+    backgroundImage: sysConfig.value['backgroundImg'] ? `url(${sysConfig.value['backgroundImg']})` : ``,
+    backgroundRepeat: 'no-repeat',
+    backgroundPosition: 'center'
+  };
+
+  const favicon = useFavicon();
+  favicon.value = sysConfig.value.favicon || utogether;
 };
 
 dataThemeChange(overallStyle.value);

package/src/views/upms/user/login-log.vue

@@ -2,7 +2,7 @@
  * @Author: wei.li
  * @Date: 2021-12-23 11:22:51
  * @LastEditors: levi7754 levi7754@163.com
- * @LastEditTime: 2025-11-21 18:35:50
+ * @LastEditTime: 2025-12-08 08:22:23
  * @Description: 用户登录日志
 -->
 
@@ -44,11 +44,11 @@ const formItems = [
 const xgrid = ref(null);
 const columns = [
   { field: 'employeeName', minWidth: 120 },
-  { field: 'userName', title: 'message.udp.userName', width: 150 },
+  { field: 'userName', title: 'message.udp.userName', width: 220 },
   { field: 'loginTime', title: 'message.udp.loginTime', width: 160 },
   { field: 'operatingSystem', title: 'message.udp.operatingSystem', width: 120 },
-  { field: 'browser', title: 'message.udp.browser', width: 110 },
-  { field: 'browserVersion', title: 'message.udp.browserVersion', width: 110 },
-  { field: 'ip', title: 'message.udp.ip', width: 150 }
+  { field: 'browser', title: 'message.udp.browser', width: 130 },
+  { field: 'browserVersion', title: 'message.udp.browserVersion', width: 150 },
+  { field: 'ip', title: 'message.udp.ip', width: 200 }
 ];
 </script>