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

package/src/plugins/vxe-table/index.ts

@@ -1,46 +1,53 @@
-/*
- * @Author: levi7754 levi7754@163.com
- * @Date: 2024-06-05 14:32:03
- * @LastEditors: levi7754 levi7754@163.com
- * @LastEditTime: 2025-07-16 15:36:56
- * @FilePath: /udp-front/packages/udp-core/src/plugins/vxe-table/index.ts
- * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
- */
-import 'xe-utils';
-import { merge } from 'xe-utils';
-import { geti18n, transformI18n } from '../i18n/index';
-// import { storageLocal } from '@utogether/utils';
-// import { VxetableRender } from '@utogether/utils';
-import { VxetableRender } from './render';
-import { getServiceApi } from '../../api';
-
-import VXETable, { VxeUI } from 'vxe-table';
-// import './render.tsx';
-
-// const dict = storageLocal.getItem('kLov');
-VxetableRender(VXETable, { serviceApi: getServiceApi(), i18n: transformI18n });
-
-// 全局默认参数
-const defaultConfig = {
-  // 对组件内置的提示语进行国际化翻译
-  // @ts-ignore
-  i18n: (key, args) => geti18n().global.t(key, args),
-  // 可选，对参数中的列头、校验提示..等进行自动翻译（只对支持国际化的有效）
-  translate(key) {
-    // 例如，只翻译 "message." 开头的键值
-    const NAMESPACED = ['message.', 'el.'];
-    if (key && NAMESPACED.findIndex(v => key.includes(v)) !== -1) {
-      return geti18n().global.t.call(geti18n().global.locale, key);
-    }
-    return key;
-  }
-};
-
-export function setTableConfig(config = {}) {
-  VXETable.setConfig(merge(defaultConfig, config));
-}
-
-export function setTheme(theme) {
-  // 切换为暗黑主题
-  VxeUI.setTheme(theme);
-}
+/*
+ * @Author: levi7754 levi7754@163.com
+ * @Date: 2024-06-05 14:32:03
+ * @LastEditors: levi7754 levi7754@163.com
+ * @LastEditTime: 2025-07-21 11:37:34
+ * @FilePath: /udp-front/packages/udp-core/src/plugins/vxe-table/index.ts
+ * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
+ */
+import 'xe-utils';
+import { merge } from 'xe-utils';
+import { geti18n, transformI18n } from '../i18n/index';
+// import { storageLocal } from '@utogether/utils';
+// import { VxetableRender } from '@utogether/utils';
+import { VxetableRender } from './render';
+import { getServiceApi } from '../../api';
+
+import VXETable, { VxeUI } from 'vxe-table';
+// import './render.tsx';
+
+// const dict = storageLocal.getItem('kLov');
+VxetableRender(VXETable, { serviceApi: getServiceApi(), i18n: transformI18n });
+
+// 全局默认参数
+const defaultConfig = {
+  // 对组件内置的提示语进行国际化翻译
+  // @ts-ignore
+  i18n: (key, args) => geti18n().global.t(key, args),
+  // 可选，对参数中的列头、校验提示..等进行自动翻译（只对支持国际化的有效）
+  translate(key) {
+    // 例如，只翻译 "message." 开头的键值
+    const NAMESPACED = ['message.', 'el.'];
+    if (key && NAMESPACED.findIndex(v => key.includes(v)) !== -1) {
+      return geti18n().global.t.call(geti18n().global.locale, key);
+    }
+    return key;
+  }
+};
+
+export function setTableConfig(config = {}) {
+  VXETable.setConfig(merge(defaultConfig, config));
+
+  VxeUI.interceptor.add('event.clearEdit', {
+    tableInterceptorMethod(params) {
+      const { $event } = params;
+      if ($event.target.className.indexOf('vxe-table--ignore-clear') > -1) return false;
+    }
+  });
+}
+
+export function setTheme(theme) {
+  // 切换为暗黑主题
+  VxeUI.setTheme(theme);
+}

package/src/plugins/vxe-table/render.tsx

@@ -2,7 +2,7 @@
  * @Author: wei.li
  * @Date: 2021-12-01 09:18:50
  * @LastEditors: levi7754 levi7754@163.com
- * @LastEditTime: 2025-07-14 18:17:16
+ * @LastEditTime: 2025-07-23 09:41:24
  * @Description: file content
  */
 
@@ -59,7 +59,7 @@ export const VxetableRender = (VXETable, { serviceApi, i18n }) => {
        * @param {*} val 目前的选中值
        */
       function onChange(val) {
-        componentHook.selectChange(val, data, column.field, renderOpts, {
+        componentHook.selectChange(val, row, column.field, renderOpts, {
           column,
           datasource: 'row'
         });
@@ -471,6 +471,7 @@ export const VxetableRender = (VXETable, { serviceApi, i18n }) => {
       const { row, column } = params;
       const { props, events } = renderOpts;
       const componentHook = useComponent();
+      console.log('lov====');
       function onChange(record, displayField) {
         const { mapField, field, displayName, multiple } = props;
         if (!multiple) {
@@ -493,6 +494,7 @@ export const VxetableRender = (VXETable, { serviceApi, i18n }) => {
         <ut-lov
           record={row}
           mode="vxe"
+          transfer
           {...props}
           onChange={(v, f) => onChange(v, f)}
           onClear={() => onClear()}

package/src/style/button.scss

@@ -1,78 +1,85 @@
-.vxe-button.size--mini.type--button {
-  height: 25px;
-}
-
-.vxe-button.size--small.type--button {
-  height: 25px;
-}
-
-.vxe-button.type--button.theme--u-cyan,
-.vxe-button.type--button.theme--u-cyan:hover {
-  color: #fff;
-}
-
-.vxe-button.type--button.theme--u-cyan {
-  background-color: #1cbbb4;
-}
-
-.vxe-button.type--button.theme--u-cyan:active {
-  background-color: #39b54a;
-}
-
-// 禁用状态
-.vxe-button.type--button.theme--u-cyan.is--disabled {
-  background-color: #69e4de;
-  border-color: #69e4de;
-}
-
-.vxe-button.type--button.theme--u-color-shallow,
-.vxe-button.type--button.theme--u-color-shallow:hover {
-  color: #fff;
-}
-
-.vxe-button.type--button.theme--u-color-shallow {
-  background-color: #fbbd08;
-}
-
-.vxe-button.type--button.theme--u-color-shallow:active {
-  background-color: #fff;
-}
-
-.layout-theme-default .vxe-button.type--button.theme--u-cyan:not(.is--disabled):hover {
-  background-color: #40e0d0;
-  border-color: #40e0d0;
-}
-
-.vxe-button.type--button:not(.is--disabled):hover {
-  color: #fff !important;
-
-  .vxe-button--icon {
-    color: #4169e1;
-  }
-}
-
-.u-color-royalBlue {
-  color: #4169e1;
-}
-
-.u-color-turquoise {
-  color: #40e0d0;
-}
-
-.el-dropdown {
-  .el-dropdown__caret-button {
-    margin-left: 0;
-    border-top-left-radius: 0;
-    border-bottom-left-radius: 0;
-  }
-
-  .el-button-group + .el-button {
-    border-top-right-radius: 0 !important;
-    border-bottom-right-radius: 0 !important;
-  }
-
-  .el-button:first-child {
-    border-top-right-radius: 0 !important;
-    border-bottom-right-radius: 0 !important;
-  }
-}
+.vxe-button.size--mini.type--button {
+  height: 25px;
+}
+
+.vxe-button.size--small.type--button {
+  height: 25px;
+}
+
+.vxe-button.type--button.theme--u-cyan,
+.vxe-button.type--button.theme--u-cyan:hover {
+  color: #fff;
+}
+
+.vxe-button.type--button.theme--u-cyan {
+  background-color: #1cbbb4;
+}
+
+.vxe-button.type--button.theme--u-cyan:active {
+  background-color: #39b54a;
+}
+
+// 禁用状态
+.vxe-button.type--button.theme--u-cyan.is--disabled {
+  background-color: #69e4de;
+  border-color: #69e4de;
+}
+
+.vxe-button.type--button.theme--u-color-shallow,
+.vxe-button.type--button.theme--u-color-shallow:hover {
+  color: #fff;
+}
+
+.vxe-button.type--button.theme--u-color-shallow {
+  background-color: #fbbd08;
+}
+
+.vxe-button.type--button.theme--u-color-shallow:active {
+  background-color: #fff;
+}
+
+.layout-theme-default .vxe-button.type--button.theme--u-cyan:not(.is--disabled):hover {
+  background-color: #40e0d0;
+  border-color: #40e0d0;
+}
+
+.vxe-button.type--button:not(.is--disabled):hover {
+  color: #fff;
+
+  .vxe-button--icon,
+  .vxe-button--item {
+    color: inherit;
+  }
+}
+
+.vxe-button[name='favorite'].type--button:not(.is--disabled):hover {
+  .vxe-button--item {
+    color: var(--udp-theme-vxeColor);
+  }
+}
+
+.u-color-royalBlue {
+  color: #4169e1;
+}
+
+.u-color-turquoise {
+  color: #40e0d0;
+}
+
+.el-dropdown {
+  .el-dropdown__caret-button {
+    margin-left: 0;
+    border-top-left-radius: 0;
+    border-bottom-left-radius: 0;
+  }
+
+  .el-button-group + .el-button {
+    border-top-right-radius: 0 !important;
+    border-bottom-right-radius: 0 !important;
+  }
+
+  .el-button:first-child {
+    border-top-right-radius: 0 !important;
+    border-bottom-right-radius: 0 !important;
+  }
+}

package/src/style/tailwind.css

@@ -1,68 +1 @@
-/* @tailwind base;
-@tailwind components;
-@tailwind utilities;
-
-@layer components {
-  .flex-c {
-    @apply flex justify-center items-center;
-  }
-
-  .flex-ac {
-    @apply flex justify-around items-center;
-  }
-
-  .flex-bc {
-    @apply flex justify-between items-center;
-  }
-
-  .navbar-bg-hover {
-    @apply dark:text-white dark:hover:!bg-[#242424];
-  }
-} */
-
-@layer theme, base, components, utilities;
-@import 'tailwindcss/theme.css' layer(theme);
-@import 'tailwindcss/utilities.css' layer(utilities);
-
-@custom-variant dark (&:is(.dark *));
-
-@theme {
-  --color-bg_color: var(--el-bg-color);
-  --color-primary: var(--el-color-primary);
-  --color-text_color_primary: var(--el-text-color-primary);
-  --color-text_color_regular: var(--el-text-color-regular);
-}
-
-/*
-  The default border color has changed to `currentColor` in Tailwind CSS v4,
-  so we've added these compatibility styles to make sure everything still
-  looks the same as it did with Tailwind CSS v3.
-
-  If we ever want to remove these styles, we need to add an explicit border
-  color utility to any element that depends on these defaults.
-*/
-@layer base {
-  *,
-  ::after,
-  ::before,
-  ::backdrop,
-  ::file-selector-button {
-    border-color: var(--color-gray-200, currentColor);
-  }
-}
-
-@utility flex-c {
-  @apply flex justify-center items-center;
-}
-
-@utility flex-ac {
-  @apply flex justify-around items-center;
-}
-
-@utility flex-bc {
-  @apply flex justify-between items-center;
-}
-
-@utility navbar-bg-hover {
-  @apply dark:text-white dark:hover:bg-[#242424]!;
-}
+@import 'tailwindcss';