@utogether/udp-core 1.0.1-beta.14 → 1.0.1-beta.15

package/dist/{utogether-B_dUqXea.js → utogether-BRirriOz.js}

@@ -1,6 +1,6 @@
 import { computed as W, ref as L } from "vue";
 import { useGlobal as g, storageLocal as u, deviceDetection as H, cookies as C, storageSession as M } from "@utogether/utils";
-import { y as P, j as E, s as j, g as h, v as d, z as J, l as K, m as R, n as V, u as S, r as G, o as O, A as x, B as Z } from "./index-Ce51XQgg.js";
+import { y as P, j as E, s as j, g as h, v as d, z as J, l as K, m as R, n as V, u as S, r as G, o as O, A as x, B as Z } from "./index-C6ehxLLO.js";
 import { useI18n as f } from "vue-i18n";
 import { defineStore as v } from "pinia";
 function I() {

package/package.json

@@ -1,18 +1,18 @@
-{
-  "name": "@utogether/udp-core",
-  "private": false,
-  "version": "1.0.1-beta.14",
-  "description": "",
-  "type": "module",
-  "main1": "index.ts",
-  "main": "dist/core.es.js",
-  "scripts": {
-    "dev": "vite",
-    "build": "vite build",
-    "preview:build": "pnpm build && vite preview",
-    "report": "rimraf dist && vite build"
-  },
-  "keywords": [],
-  "author": "",
-  "license": "ISC"
-}
+{
+  "name": "@utogether/udp-core",
+  "private": false,
+  "version": "1.0.1-beta.15",
+  "description": "",
+  "type": "module",
+  "main1": "index.ts",
+  "main": "dist/core.es.js",
+  "scripts": {
+    "dev": "vite",
+    "build": "vite build",
+    "preview:build": "pnpm build && vite preview",
+    "report": "rimraf dist && vite build"
+  },
+  "keywords": [],
+  "author": "",
+  "license": "ISC"
+}

package/src/components/udp/form.vue

@@ -2,7 +2,7 @@
  * @Author: wei.li
  * @Date: 2022-03-02 17:07:59
  * @LastEditors: levi7754 levi7754@163.com
- * @LastEditTime: 2025-08-19 10:19:16
+ * @LastEditTime: 2025-09-10 15:35:12
  * @Description: SuForm
 -->
 
@@ -84,7 +84,7 @@ const rules = computed(() => {
 
 const formItems = computed(() => {
   if (!props.items.length) return props.items;
-  return formatItems(clone(props.items, true), 'edit', 6);
+  return formatItems(clone(props.items, true), 'edit', t, 6);
 });
 
 const onChange = () => {

package/src/components/udp/utils.ts

@@ -2,7 +2,7 @@
  * @Author: levi7754 levi7754@163.com
  * @Date: 2025-07-14 17:38:38
  * @LastEditors: levi7754 levi7754@163.com
- * @LastEditTime: 2025-08-21 10:57:00
+ * @LastEditTime: 2025-09-10 15:38:34
  * @FilePath: \udp-front\packages\udp-core\src\components\udp\utils.ts
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  */
@@ -261,7 +261,7 @@ export const getToolBarConfig = (data, props, attrs, hasAuthority) => {
   // reverse的原因是: 保持现有按钮顺序， 新增，保存，删除
   toolButtons.reverse().forEach(btn => {
     !buttons.some(s => s.code === btn.code) && buttons.unshift(btn);
-    if (attrs.authPrefix && !['print', 'export'].includes(btn.auth)) {
+    if (attrs.authPrefix && !['printer', 'export'].includes(btn.auth)) {
       btn.auth = attrs.authPrefix + btn.auth.slice(0, 1).toLocaleUpperCase() + btn.auth.slice(1).toLocaleLowerCase();
     }
   });
@@ -381,11 +381,11 @@ export const getAttrs = attrs => {
   return data;
 };
 
-export const formatItems = (items, status, span = 24) => {
+export const formatItems = (items, status, t, span = 24) => {
   if (!items.length) return items;
   return items.map(item => {
     if (item.children?.length) {
-      item.children = formatItems(item.children, status, span);
+      item.children = formatItems(item.children, status, t, span);
       return item;
     } else {
       item.title = item.title || `message.${item.field}`;
@@ -396,23 +396,27 @@ export const formatItems = (items, status, span = 24) => {
         item.titleWidth = 0;
       }
       let disabled = false;
+      let placeholder = t(`message.udp.placeholder`) + t(item.title);
       if (status === 'detail') {
         disabled = true;
-        item.placeholder = null;
+        placeholder = '';
       } else {
         disabled = item.disabled === false ? item.disabled : item.disabled || item.itemRender?.props?.disabled;
       }
       let itemRender = {
         name: 'VxeInput',
-        props: { disabled, placeholder: disabled ? '' : item.placeholder }
+        props: { disabled, placeholder: disabled ? '' : placeholder }
       };
       if (item.code && !item.itemRender) {
         itemRender = renderHook.renderDict(item.code);
       }
       item.itemRender = item.itemRender || itemRender;
+
       item.itemRender['props'] = Object.assign(item.itemRender.props || {}, {
-        disabled
+        disabled,
+        placeholder: disabled ? '' : placeholder
       });
+      console.log('--------------', { item });
       return item;
     }
   });

package/src/plugins/i18n/zh.ts

@@ -43,6 +43,8 @@ export default {
     copyright: '版权信息',
     i18nEnabled: '国际化',
     orgTaggle: '启用组织切换',
+    baseColor: '基准色',
+    techSupport: '技术支持',
     defaultLanguage: '默认语言',
     roleName: '角色名称',
     roleCode: '角色编码',
@@ -89,6 +91,7 @@ export default {
     downloadUrl: 'APK文件',
     forceUpdate: '强制更新',
     freeUpdate: '自主更新',
+    placeholder: '请录入',
 
     userName: '用户姓名',
     userCode: '用户编码',
@@ -103,7 +106,9 @@ export default {
     orgDesc: '业务实体描述',
 
     organizationName: '组织名称',
-    organizationCode: '组织编码'
+    organizationCode: '组织编码',
+    appupper: '已上架',
+    applower: '已下架'
   },
   btn: {
     passwordReset: '密码重置',

package/src/store/modules/system.ts

@@ -166,9 +166,7 @@ export const useSystemStore = defineStore('udp-system', {
         organizationId: systemInfo.organizationId
       };
       cookies.set('kCookies_param', JSON.stringify(query));
-      this.isAdminRole = this.employee.sysRoles.some(
-        s => s.roleCode === 'admin' || ['管理员'].includes(s.roleName)
-      );
+      this.isAdminRole = this.employee.sysRoles.some(s => s.roleCode === 'admin' || ['管理员'].includes(s.roleName));
       // 缓存按钮数据权限
       usePermissionStoreHook().setAuthButton(systemInfo.dataMenus);
     }

package/src/style/vxetable.scss

@@ -33,31 +33,50 @@ html[data-vxe-ui-theme='light'] {
 
 /** 必填录入框颜色 */
 .vxe-form--item.is--required {
+  // 输入框必填
   .vxe-input > .vxe-input--wrapper > .vxe-input--inner:not(:disabled) {
     background-color: #fffbdf;
   }
 
+  // 数字框框必填
   .vxe-input:not(.is--disabled) > .vxe-input--wrapper {
     .vxe-input--control-icon {
       background-color: #fffbdf;
     }
   }
 
+  // 输入框必填
   .vxe-input--suffix {
     background-color: #fffbdf;
   }
 
+  // 下拉选择必填
   .el-select__wrapper:not(.is-disabled) {
     background-color: #fffbdf;
   }
 
+  // 输入框必填
   .el-input:not(.is-disabled) > .el-input__wrapper {
     background-color: #fffbdf;
   }
 
+  // 文本域必填
   .vxe-textarea:not(.is--disabled) > .vxe-textarea--inner {
     background-color: #fffbdf;
   }
+
+  // 日期必填
+  .vxe-date-picker {
+    .vxe-date-picker--inner,
+    .vxe-input--suffix {
+      background-color: #fffbdf;
+    }
+
+    .vxe-date-picker--prefix,
+    .vxe-date-picker--suffix {
+      background-color: #fffbdf;
+    }
+  }
 }
 
 /** 分页组件：当前页颜色 */

package/src/views/system/sys/sys-config.vue

@@ -23,6 +23,20 @@
         <el-form-item :label="$t('message.udp.orgTaggle')" prop="orgTaggle">
           <el-switch v-model="record.orgTaggle" active-value="Y" inactive-value="N" />
         </el-form-item>
+        <el-form-item
+          v-if="['liwei', 'yanhuaijun', 'phr', 'zhonglijun', 'ccl'].includes(cookies.get(kLOGINER))"
+          :label="$t('message.udp.techSupport')"
+          prop="techSupport"
+        >
+          <el-switch v-model="record.techSupport" active-value="Y" inactive-value="N" />
+        </el-form-item>
+        <el-form-item
+          v-if="['liwei', 'yanhuaijun', 'phr', 'zhonglijun', 'ccl'].includes(cookies.get(kLOGINER))"
+          :label="$t('message.udp.baseColor')"
+          prop="baseColor"
+        >
+          <vxe-color-picker v-model="record.baseColor" :colors="colorList" type="hex" clearable transfer />
+        </el-form-item>
         <el-form-item :label="$t('message.udp.systemLogo')">
           <el-upload
             v-model:file-list="record.logo"
@@ -105,7 +119,7 @@ import { useI18n } from 'vue-i18n';
 import to from 'await-to-js';
 import { successMessage, cookies, warnMessage } from '@utogether/utils';
 import { isArray } from 'xe-utils';
-import { kTOKEN } from '../../../contant';
+import { kTOKEN, kLOGINER } from '../../../contant';
 import { getServiceApi, getBaseURL } from '../../../api';
 
 const xfrom = ref<FormInstance>();
@@ -114,8 +128,10 @@ const record = reactive({
   defaultLanguage: 'zh',
   title: 'U-DP',
   ispTitle: 'U-DP',
+  baseColor: '#FFF',
   i18nEnabled: 'N',
   orgTaggle: 'Y',
+  techSupport: 'Y',
   copyright: '深圳友聚信息技术有限公司',
   logo: [],
   backgroundImg: [],
@@ -130,6 +146,39 @@ const baseUrl = ref(getBaseURL());
 const url = '/upfm/v1/sysConfig';
 let dataList = [];
 
+const colorList = [
+  '#DC143C',
+  '#FF1493',
+  '#FF00FF',
+  '#9932CC',
+  '#6A5ACD',
+  '#0000FF',
+  '#00008B',
+  '#778899',
+  '#1E90FF',
+  '#00BFFF',
+  '#5F9EA0',
+  '#00FFFF',
+  '#008080',
+  '#7FFFAA',
+  '#3CB371',
+  '#8FBC8F',
+  '#008000',
+  '#7CFC00',
+  '#556B2F',
+  '#FFFFE0',
+  '#FFFF00',
+  '#808000',
+  '#EEE8AA',
+  '#FFD700',
+  '#FFA500',
+  '#FF4500',
+  '#FA8072',
+  '#FF0000',
+  '#800000',
+  '#C0C0C0'
+];
+
 const rules = reactive<FormRules>({
   defaultLanguage: [
     {

package/src/views/uapp/pda/pda-app.vue

@@ -71,7 +71,7 @@ const columns = [
     field: 'enabled',
     title: 'message.status',
     width: 90,
-    formatter: ({ row }) => (row.enabled === '1' ? t('message.appupper') : t('message.applower'))
+    formatter: ({ row }) => (row.enabled === '1' ? t('message.udp.appupper') : t('message.udp.applower'))
   },
   { field: 'creationDate', width: 140 },
   {

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-07-24 10:16:17
+ * @LastEditTime: 2025-09-08 10:27:39
  * @Description: 数据字典
 -->
 <template>

package/src/views/ulogin/login.vue

@@ -69,7 +69,7 @@
         </button>
       </div>
     </div>
-    <div class="absolute flex justify-center w-full font-bold bottom-1">
+    <div v-if="sysConfig.techSupport === 'Y'" class="absolute flex justify-center w-full font-bold bottom-1">
       <img :src="utogether" class="!h-10" style="height: 40px" />
       <span class="flex flex-row justify-center" style="width: 300px">
         <span style="font-size: 0; text-align: center">
@@ -78,6 +78,7 @@
             target="_blank"
             class="!inline-block"
             style="margin-bottom: -5px; font-size: 17px; color: #fff; mix-blend-mode: difference"
+            :style="{ color: sysConfig.baseColor || '#FFF' }"
           >
             深圳友聚信息技术有限公司
           </a>
@@ -86,6 +87,7 @@
             target="_blank"
             class="!inline-block"
             style="font-size: 12px; color: #fff; mix-blend-mode: difference"
+            :style="{ color: sysConfig.baseColor || '#FFF' }"
           >
             SHENZHEN U-TOGETHER CO. LTD
           </a>
@@ -159,7 +161,7 @@ const bgStyle = ref({
 });
 const refreshKey = ref(0);
 
-const sysConfig = ref({});
+const sysConfig = ref<IRecord>({});
 const router = useRouter();
 const { t } = useI18n();
 const serviceApi = getServiceApi();

package/src/views/upms/interface/log-out.vue

@@ -1,107 +1,101 @@
-<!--
- * @Author: wei.li
- * @Date: 2021-12-23 11:22:51
- * @LastEditors: levi7754 levi7754@163.com
- * @LastEditTime: 2025-04-08 15:36:36
- * @Description: 出站接口日志
--->
-
-<template>
-  <div>
-    <ut-grid
-      ref="SuGridRef"
-      :items="formItems"
-      :columns="columns"
-      url="/upms/v1/invokeOutbound"
-      :editable="false"
-    />
-
-    <ut-modal-form
-      v-if="data.showModal"
-      ref="suModalRef"
-      :record="data.record"
-      :items="items"
-      :width="640"
-      :height="480"
-      :title="data.title"
-      @close="data.showModal = false"
-    />
-  </div>
-</template>
-<script lang="tsx">
-export default {
-  name: 'LogoutLog'
-};
-</script>
-<script setup lang="tsx">
-import { ref, reactive } from 'vue';
-// import { useRouter } from 'vue-router';
-// import to from 'await-to-js';
-// import { clone } from 'xe-utils';
-import { useRender } from '@utogether/utils';
-
-const renderHook = useRender();
-// const renderOption = renderOptions();
-
-// const router = useRouter();
-
-const data = reactive({
-  showModal: false,
-  record: {},
-  title: ''
-});
-
-const formItems = [
-  { field: 'interfaceName' },
-  { field: 'interfaceUrl' },
-  { field: 'requestParameter' },
-  { field: 'responseContent' },
-  { field: 'ip' },
-  { field: 'requestDate', itemRender: { name: '#SuDateRange', props: { type: 'daterange' } } },
-  { field: 'requestStatus', itemRender: renderHook.renderDict('SU.REQUEST.STATUS') }
-];
-
-const items = [
-  { field: 'requestParameter', itemRender: { name: '$textarea', props: { rows: 5 } } },
-  {
-    field: 'responseContent',
-    itemRender: { name: '$textarea', props: { rows: 10 } }
-  },
-  { field: 'stacktrace', itemRender: { name: '$textarea', props: { rows: 3 } } }
-];
-
-const SuGridRef = ref(null);
-// 列字段
-const columns = [
-  { field: 'interfaceName', minWidth: 120 },
-  { field: 'interfaceUrl', minWidth: 150 },
-  // { field: 'ip', width: 120 },
-  { field: 'requestDate', width: 160 },
-  { field: 'responseTimeConsume', width: 120 },
-  { field: 'requestStatus', width: 90, formatter: ['formatDict', 'SU.REQUEST.STATUS'] },
-  {
-    field: 'operate',
-    width: 70,
-    slots: {
-      default: ({ row }) => {
-        if (!row.id) return null;
-        return [
-          <>
-            <ut-button content="detail" icon="ri-eye-line ri-1x" onTap={() => handleShowDetail(row)} />
-          </>
-        ];
-      }
-    }
-  }
-];
-// 详情
-const handleShowDetail = record => {
-  // const resContent = JSON.parse(record.responseContent);
-  // console.log(resContent);
-  // record.resContent = resContent?.data?.list || resContent?.data;
-  // record.resContent = record.resContent ? JSON.stringify(record.resContent) : '';
-  data.record = record;
-  data.showModal = true;
-  data.title = `【${record.interfaceName}】接口明细`;
-};
-</script>
+<!--
+ * @Author: wei.li
+ * @Date: 2021-12-23 11:22:51
+ * @LastEditors: levi7754 levi7754@163.com
+ * @LastEditTime: 2025-04-08 15:36:36
+ * @Description: 出站接口日志
+-->
+
+<template>
+  <div>
+    <ut-grid ref="SuGridRef" :items="formItems" :columns="columns" url="/upms/v1/invokeOutbound" :editable="false" />
+
+    <ut-modal-form
+      v-if="data.showModal"
+      ref="suModalRef"
+      :record="data.record"
+      :items="items"
+      :width="640"
+      :height="480"
+      :title="data.title"
+      @close="data.showModal = false"
+    />
+  </div>
+</template>
+<script lang="tsx">
+export default {
+  name: 'LogoutLog'
+};
+</script>
+<script setup lang="tsx">
+import { ref, reactive } from 'vue';
+// import { useRouter } from 'vue-router';
+// import to from 'await-to-js';
+// import { clone } from 'xe-utils';
+import { useRender } from '@utogether/utils';
+
+const renderHook = useRender();
+// const renderOption = renderOptions();
+
+// const router = useRouter();
+
+const data = reactive({
+  showModal: false,
+  record: {},
+  title: ''
+});
+
+const formItems = [
+  { field: 'interfaceName' },
+  { field: 'interfaceUrl' },
+  { field: 'requestParameter' },
+  { field: 'responseContent' },
+  // { field: 'ip',  },
+  { field: 'requestDate', itemRender: { name: '#SuDateRange', props: { type: 'daterange' } } },
+  { field: 'requestStatus', itemRender: renderHook.renderDict('SU.REQUEST.STATUS') }
+];
+
+const items = [
+  { field: 'requestParameter', itemRender: { name: '$textarea', props: { rows: 5 } } },
+  {
+    field: 'responseContent',
+    itemRender: { name: '$textarea', props: { rows: 10 } }
+  },
+  { field: 'stacktrace', itemRender: { name: '$textarea', props: { rows: 3 } } }
+];
+
+const SuGridRef = ref(null);
+// 列字段
+const columns = [
+  { field: 'interfaceName', minWidth: 120 },
+  { field: 'interfaceUrl', minWidth: 150 },
+  // { field: 'ip', width: 120 },
+  { field: 'requestDate', width: 160 },
+  { field: 'responseTimeConsume', width: 120 },
+  { field: 'requestStatus', width: 90, formatter: ['formatDict', 'SU.REQUEST.STATUS'] },
+  {
+    field: 'operate',
+    width: 70,
+    slots: {
+      default: ({ row }) => {
+        if (!row.id) return null;
+        return [
+          <>
+            <ut-button content="detail" icon="ri-eye-line ri-1x" onTap={() => handleShowDetail(row)} />
+          </>
+        ];
+      }
+    }
+  }
+];
+// 详情
+const handleShowDetail = record => {
+  // const resContent = JSON.parse(record.responseContent);
+  // console.log(resContent);
+  // record.resContent = resContent?.data?.list || resContent?.data;
+  // record.resContent = record.resContent ? JSON.stringify(record.resContent) : '';
+  data.record = record;
+  data.showModal = true;
+  data.title = `【${record.interfaceName}】接口明细`;
+};
+</script>

package/src/views/urpt/design/Preview.vue

@@ -38,6 +38,7 @@ const hanldePreview = (template, data) => {
   loading.value = true;
   printerTemplate.value = template;
   printerData.value = data;
+  console.log(template);
   nextTick(() => {
     $('#preview_content').html(template.getHtml(data));
     loading.value = false;

package/src/views/urpt/design/ReportDesign.vue

@@ -226,10 +226,8 @@ const handleDesign = row => {
 };
 const onGridEvents = {
   editActived({ row }) {
-    if (row.id) {
-      columns[1].editRender.props.disabled = true;
-      xgrid.value.getInstance().refreshColumn();
-    }
+    columns[1].editRender.props.disabled = !!row.id;
+    xgrid.value.getInstance().refreshColumn();
   }
 };