@opendesign-plus-test/components 0.0.1-rc.66 → 0.0.1-rc.68

package/package.json

@@ -1,29 +1,30 @@
 {
   "name": "@opendesign-plus-test/components",
-  "version": "0.0.1-rc.66",
+  "version": "0.0.1-rc.68",
   "type": "module",
   "publishConfig": {
     "access": "public",
     "registry": "https://registry.npmjs.org/"
   },
-  "main": "./dist/cjs/index.js",
-  "module": "./dist/esm/index.mjs",
-  "types": "./dist/types/index.d.ts",
+  "main": "./dist/components.cjs.js",
+  "module": "./dist/components.es.js",
+  "types": "./dist/index.d.ts",
   "exports": {
     ".": {
-      "types": "./dist/types/index.d.ts",
-      "import": "./dist/esm/index.mjs",
-      "require": "./dist/cjs/index.js",
-      "default": "./dist/esm/index.mjs"
+      "types": "./dist/index.d.ts",
+      "import": "./dist/components.es.js",
+      "require": "./dist/components.cjs.js"
     },
-    "./*": "./*"
+    "./element-plus": {
+      "types": "./dist/components/element-plus/index.d.ts",
+      "import": "./dist/components.element.es.js",
+      "require": "./dist/components.element.cjs.js"
+    },
+    "./styles": {
+      "import": "./dist/components.css",
+      "require": "./dist/components.css"
+    }
   },
-  "sideEffects": [
-    "*.css",
-    "*.less",
-    "*.scss",
-    "*.sass"
-  ],
   "peerDependencies": {
     "@opensig/opendesign": "1.2.4",
     "@vueuse/core": "^14.0.0",

package/src/components/meeting/components/OMeetingCalendarList.vue

@@ -95,30 +95,32 @@ const computedList = computed<any[]>(() => {
     let end_date_time = '';
     if (type !== CalendarDataType.MEETING) {
       let activity_type = activityTypeMap.value.get(v.activity_type)?.label;
-      if (v.start && v.end) {
-        if (v.end_date === v.start_date) {
-          dateRange = `${ props.disableFormat ? v.start_date : formatDate(v.start_date) } ${ v.start } - ${ v.end }`;
-        } else {
-          dateRange = `${ props.disableFormat ? v.start_date : formatDate(v.start_date) } ${ v.start } - ${ props.disableFormat ? v.end_date : formatDate(v.end_date) } ${ v.end }`;
+      if (v.start_date) {
+        dateRange = props.disableFormat ? v.start_date : formatDate(v.start_date);
+      }
+      if (v.start) {
+        dateRange += `${ dateRange ? ' ' : '' }${ v.start }`;
+      }
+      if (v.end_date || v.end) {
+        dateRange += `${ dateRange ? ' -' : '' }`;
+        if (v.end_date && v.end_date !== v.start_date) {
+          dateRange += `${ dateRange ? ' ' : '' }${ props.disableFormat ? v.end_date : formatDate(v.end_date) }`;
         }
-      } else {
-        if (v.start_date === v.end_date) {
-          dateRange = props.disableFormat ? v.start_date : formatDate(v.start_date);
-        } else {
-          dateRange = `${ props.disableFormat ? v.start_date : formatDate(v.start_date) } - ${ props.disableFormat ? v.end_date : formatDate(v.end_date) }`;
+        if (v.end) {
+          dateRange += `${ dateRange ? ' ' : '' }${ v.end }`;
         }
       }
       if (v.start_date) {
         start_date_time = props.disableFormat ? v.start_date : formatDate(v.start_date);
-        if (v.start) {
-          start_date_time = `${ start_date_time } ${ v.start }`;
-        }
+      }
+      if (v.start) {
+        start_date_time += `${ start_date_time ? ' ' : '' }${ v.start }`;
       }
       if (v.end_date) {
         end_date_time = props.disableFormat ? v.end_date : formatDate(v.end_date);
-        if (v.end) {
-          end_date_time = `${ end_date_time } ${ v.end }`;
-        }
+      }
+      if (v.end) {
+        end_date_time += `${ start_date_time ? ' ' : '' }${ v.end }`;
       }
 
       return {
@@ -142,12 +144,27 @@ const computedList = computed<any[]>(() => {
       cycle_interval,
       cycle_point,
     } = v;
-    dateRange = `${ props.disableFormat ? date : formatDate(date) } ${ start } - ${ end }`;
+    dateRange = props.disableFormat ? date : formatDate(date);
+    if (start && end) {
+      dateRange += `${ dateRange ? ' ' : '' } ${ start } - ${ end }`;
+    } else if (start || end) {
+      dateRange += `${ dateRange ? ' ' : '' } ${ start || end }`;
+    }
     if (is_cycle) {
       dateRange = `${ props.disableFormat ? cycle_start_date : formatDate(cycle_start_date) } - ${ props.disableFormat ? cycle_end_date : formatDate(cycle_end_date) }`;
     }
 
-    let timeRange = `${ start } - ${ end }`;
+    let timeRange = '';
+    if (start && end) {
+      timeRange = `${ start } - ${ end }`;
+    } else {
+      if (start) {
+        timeRange = start;
+      }
+      if (end) {
+        timeRange = end;
+      }
+    }
     let replay_url = null;
     let hasObsData = false;
     const obsData = v.obs_data?.filter((v: ObsDataItemT) => v.text_video_url) || [];
@@ -218,7 +235,7 @@ const computedList = computed<any[]>(() => {
             <span class="start-time">
               <span>{{ item.dateRange }}</span>
             </span>
-              <ODivider direction="v" />
+              <ODivider v-if="item.group_name || item.activity_type" direction="v" />
               <div>
                 <template v-if="item.group_name">{{ i18n.SIG_GROUP }} {{ item.group_name }}</template>
                 <template v-if="item.activity_type">{{ item.activity_type }}</template>

package/src/components/meeting/components/OMeetingDetail.vue

@@ -69,7 +69,13 @@ interface ColumnItemT {
   extra?: string;
 }
 
-const getField = (key: string) => (props.data as Record<string, any>)[key];
+const getField = (key: string) => {
+  const val = (props.data as Record<string, any>)[key];
+  if (key === 'register_end_date' && val) {
+    return formatDate(val, 'YYYY/MM/DD HH:mm');
+  }
+  return val;
+};
 
 const columns = computed<ColumnItemT[]>(() => {
   if (props.data.type === CalendarDataType.EVENTS) {
@@ -204,10 +210,9 @@ defineExpose({ copyInfo });
       overflow: hidden;
     }
 
-    &.type_events {
-      .label {
-        width: 6em;
-      }
+    .more-text-wrapper {
+      position: relative;
+      top: -2px;
     }
 
     .o-link {

package/vite.config.ts

@@ -1,182 +1,123 @@
-import { dirname, relative, resolve } from 'node:path';
-import { fileURLToPath } from 'node:url';
-import { readdirSync, rmSync } from 'node:fs';
-import { readFile } from 'node:fs/promises';
-import { defineConfig, type Plugin } from 'vite';
+import { defineConfig } from 'vite';
 import vue from '@vitejs/plugin-vue';
 import Icons from 'unplugin-icons/vite';
+import path from 'path';
 import { FileSystemIconLoader } from 'unplugin-icons/loaders';
 import ElementPlus from 'unplugin-element-plus/vite';
 import dts from 'vite-plugin-dts';
 
-const __dirname = dirname(fileURLToPath(import.meta.url));
+export default defineConfig(({ mode }) => {
+  const isLibraryMode = mode === 'library';
 
-rmSync(resolve(__dirname, 'dist'), { recursive: true, force: true });
-
-const globalsMap: Record<string, string> = {
-  vue: 'Vue',
-  'element-plus': 'ElementPlus',
-  '@opensig/opendesign': 'OpenDesign',
-  '@vueuse/core': 'VueUse',
-  '@opendesign-plus/composables': 'OpenDesignPlusComposables',
-  '@opendesign-plus/styles': 'OpenDesignPlusStyles',
-  video: 'Videojs',
-  'video.js': 'Videojs',
-  dayjs: 'dayjs',
-  aos: 'AOS',
-  'vue-dompurify-html': 'VueDompurifyHTML',
-};
-
-function cleanPath(name: string): string {
-  return name
-    .replace(/^packages\/components\/src\//, '')
-    .replace(/node_modules\/\.pnpm\/[^/]+\/node_modules\//, 'external/')
-    .replace(/_virtual\//, '');
-}
-
-const iconCollections: Record<string, string> = {
-  components: resolve(__dirname, './src/assets/svg-icons'),
-  meeting: resolve(__dirname, './src/assets/meeting/svg-icons'),
-  events: resolve(__dirname, './src/assets/events/svg-icons'),
-};
-
-const iconNameCounts: Record<string, string[]> = {};
-for (const [col, dir] of Object.entries(iconCollections)) {
-  for (const f of readdirSync(dir)) {
-    const name = f.replace(/\.svg$/, '');
-    (iconNameCounts[name] ||= []).push(col);
-  }
-}
-const iconCollisions = new Set(
-  Object.entries(iconNameCounts)
-    .filter(([, cols]) => cols.length > 1)
-    .map(([name]) => name)
-);
-
-function resolveChunkName(chunkInfo: { name: string; facadeModuleId?: string | null }): string {
-  const moduleId = chunkInfo.facadeModuleId ?? '';
-  const iconMatch = moduleId.match(/^~icons\/([^/]+)\/(.+)$/);
-  if (iconMatch) {
-    const [, collection, iconName] = iconMatch;
-    const flatName = iconCollisions.has(iconName) ? `${collection}-${iconName}` : iconName;
-    return `icons/${flatName}`;
-  }
-  return cleanPath(chunkInfo.name);
-}
-
-function cssInjectPlugin() {
   return {
-    name: 'css-inject',
-    enforce: 'post',
-    generateBundle(_: any, bundle) {
-      for (const [fileName, chunk] of Object.entries(bundle)) {
-        if (chunk.type !== 'chunk') {
-          continue;
-        }
-
-        const cssFiles = chunk.viteMetadata?.importedCss as Set<string> | undefined;
-        if (!cssFiles || cssFiles.size === 0) {
-          continue;
-        }
-
-        const isEsm = fileName.endsWith('.mjs');
-        const chunkDir = dirname(fileName);
-        let code = chunk.code;
-
-        for (const cssFile of cssFiles) {
-          let relPath = relative(chunkDir, cssFile).replace(/\\/g, '/');
-          if (!relPath.startsWith('.')) {
-            relPath = './' + relPath;
+    build: {
+      outDir: path.resolve(__dirname, './dist'),
+      ...(isLibraryMode
+        ? {
+            lib: {
+              entry: {
+                lib: path.resolve(__dirname, 'src/index.ts'),
+                element: path.resolve(__dirname, 'src/components/element-plus/index.ts'),
+              },
+              name: 'OpenDesignPlusComponents',
+              fileName: (format, entry) => {
+                if (entry === 'lib') return `components.${format}.js`;
+                return `components.${entry}.${format}.js`;
+              },
+              formats: ['es', 'cjs'],
+              cssInjectedByJs: true,
+            },
+            rollupOptions: {
+              external: (id: string) => {
+                // element-plus 的 CSS 样式路径不外部化，打包进库中
+                if (
+                  id.startsWith('element-plus') &&
+                  (id.includes('/style') || id.includes('/theme-chalk'))
+                ) {
+                  return false;
+                }
+                // locale 子路径打包进库，避免消费方路径解析问题
+                if (id.startsWith('@opensig/opendesign/es/locale/')) {
+                  return false;
+                }
+                // element-plus JS 保持外部化
+                if (/^element-plus/.test(id)) return true;
+                // 其他外部依赖
+                return [
+                  'vue',
+                  '@opensig/opendesign',
+                  '@vueuse/core',
+                  'shiki',
+                  '@opendesign-plus/composables',
+                ].some((ext) => id === ext || id.startsWith(ext + '/'));
+              },
+              output: {
+                globals: {
+                  'element-plus': 'ElementPlus',
+                  vue: 'Vue',
+                  '@opensig/opendesign': 'OpenDesign',
+                  '@vueuse/core': 'VueUse',
+                  '@opendesign-plus/composables': 'OpenDesignPlusComposables',
+                },
+                // entryFileNames: 'components.[format].js',
+                chunkFileNames: 'chunk-[name].[format].js',
+              },
+            },
+            cssCodeSplit: false, // 禁用CSS分割，所有样式打包到一起
           }
-
-          const importStmt = isEsm ? `import '${relPath}';` : `require('${relPath}');`;
-
-          code = code.replace(/\/\* empty css \s*\*\//, importStmt);
-        }
-        chunk.code = code;
-      }
+        : {}),
     },
-  } as Plugin;
-}
-
-export default defineConfig({
-  build: {
-    lib: {
-      entry: resolve(__dirname, 'src/index.ts'),
-    },
-    cssCodeSplit: true,
-    cssMinify: false,
-    rollupOptions: {
-      external: (id: string) => {
-        return Object.keys(globalsMap).some((ext) => id === ext || id.startsWith(ext + '/'));
+    resolve: {
+      alias: {
+        vue: 'vue/dist/vue.esm-bundler.js',
+        '@': path.resolve(__dirname, 'src'),
+        '@opendesign-plus/styles': path.resolve(__dirname, '../styles/src'),
       },
-      output: [
-        {
-          format: 'esm',
-          dir: resolve(__dirname, 'dist/esm'),
-          preserveModules: true,
-          preserveModulesRoot: resolve(__dirname, 'src'),
-          entryFileNames: (chunkInfo) => `${resolveChunkName(chunkInfo)}.mjs`,
-          chunkFileNames: (chunkInfo) => `${resolveChunkName(chunkInfo)}.mjs`,
-          assetFileNames: (assetInfo) => cleanPath(assetInfo.name ?? ''),
-          globals: globalsMap,
-        },
-        {
-          format: 'cjs',
-          dir: resolve(__dirname, 'dist/cjs'),
-          preserveModules: true,
-          preserveModulesRoot: resolve(__dirname, 'src'),
-          entryFileNames: (chunkInfo) => `${resolveChunkName(chunkInfo)}.js`,
-          chunkFileNames: (chunkInfo) => `${resolveChunkName(chunkInfo)}.js`,
-          assetFileNames: (assetInfo) => cleanPath(assetInfo.name ?? ''),
-          globals: globalsMap,
-        },
-      ],
     },
-  },
-  resolve: {
-    alias: {
-      '@': resolve(__dirname, 'src'),
-    },
-  },
-  css: {
-    preprocessorOptions: {
-      scss: {
-        charset: false,
-        additionalData: async (source: string, filename: string) => {
-          let base = `
-            @use '@opensig/opendesign/es/_styles/mixin.scss' as *;
-            @use "@opendesign-plus/styles/mixin/font.scss" as *;
-            @use "@opendesign-plus/styles/mixin/common.scss" as *;
-            @use "@opendesign-plus/styles/mixin/gap.scss" as *;
-          `.trim();
-
-          const fileContent = await readFile(filename, 'utf-8');
-          if (fileContent.includes('element-plus')) {
-            base = `${base}\n@use "@/assets/styles/element-plus.scss" as *;`;
-          }
-
-          return `${base}\n${source}`;
+    css: {
+      preprocessorOptions: {
+        scss: {
+          charset: false,
+          additionalData: `
+          @use '@opensig/opendesign/es/_styles/mixin.scss' as *;
+          @use "@opendesign-plus/styles/mixin/font.scss" as *;
+          @use "@opendesign-plus/styles/mixin/common.scss" as *;
+          @use "@opendesign-plus/styles/mixin/gap.scss" as *;
+          @use "@/assets/styles/element-plus.scss" as *;
+        `,
         },
       },
     },
-  },
-  plugins: [
-    vue({ include: [/\.vue$/] }) as any,
-    dts({
-      outDir: resolve(__dirname, 'dist/types'),
-      include: ['./src/components/**/*', './src/index.ts', './src/*.d.ts'],
-      exclude: ['./src/components/common/**/*'],
-    }),
-    Icons({
-      compiler: 'vue3',
-      customCollections: {
-        components: FileSystemIconLoader(resolve(__dirname, './src/assets/svg-icons')),
-        meeting: FileSystemIconLoader(resolve(__dirname, './src/assets/meeting/svg-icons')),
-        events: FileSystemIconLoader(resolve(__dirname, './src/assets/events/svg-icons')),
-      },
-    }),
-    ElementPlus({ useSource: false }),
-    cssInjectPlugin(),
-  ],
+    plugins: [
+      // 关键：配置Vue插件正确处理样式
+      vue({
+        include: [/\.vue$/],
+        template: {
+          compilerOptions: {
+            // 确保模板编译正确
+          },
+        },
+      }) as any,
+      dts({
+        include: ['./src/components/**/*', './src/index.ts', './src/*.d.ts'],
+        exclude: ['./src/components/common/**/*']
+      }),
+      Icons({
+        compiler: 'vue3',
+        customCollections: {
+          components: FileSystemIconLoader(path.resolve(__dirname, './src/assets/svg-icons')),
+          meeting: FileSystemIconLoader(path.resolve(__dirname, './src/assets/meeting/svg-icons')),
+          events: FileSystemIconLoader(path.resolve(__dirname, './src/assets/events/svg-icons')),
+        },
+      }),
+      ...(isLibraryMode
+        ? [ElementPlus({ useSource: false })]
+        : [ElementPlus({ useSource: true })])
+    ],
+    assetsInclude: ['**/*.md'],
+    server: {
+      proxy: {},
+    },
+    base: '/',
+  };
 });

package/dist/cjs/_plugin-vue_export-helper.js

@@ -1 +0,0 @@
-"use strict";const e=(t,r)=>{const o=t.__vccOpts||t;for(const[s,c]of r)o[s]=c;return o};module.exports=e;

package/dist/cjs/assets/meeting/transparent.png.js

@@ -1 +0,0 @@
-"use strict";const r="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAB4AAAAQ4AQMAAADSHVMAAAAAAXNSR0IB2cksfwAAAAlwSFlzAAALEwAACxMBAJqcGAAAAANQTFRFAAAAp3o92gAAAAF0Uk5TAEDm2GYAAASYSURBVHic7c8BDQAgDMAw7t80Lk5SVgXbnM/M64BtDesa1jWsa1jXsK5hXcO6hnUN6xrWNaxrWNewrmFdw7qGdQ3rGtY1rGtY17CuYV3DuoZ1Desa1jWsa1jXsK5hXcO6hnUN6xrWNaxrWNewrmFdw7qGdQ3rGtY1rGtY17CuYV3DuoZ1Desa1jWsa1jXsK5hXcO6hnUN6xrWNaxrWNewrmFdw7qGdQ3rGtY1rGtY17CuYV3DuoZ1Desa1jWsa1jXsK5hXcO6hnUN6xrWNaxrWNewrmFdw7qGdQ3rGtY1rGtY17CuYV3DuoZ1Desa1jWsa1jXsK5hXcO6hnUN6xrWNaxrWNewrmFdw7qGdQ3rGtY1rGtY17CuYV3DuoZ1Desa1jWsa1jXsK5hXcO6hnUN6xrWNaxrWNewrmFdw7qGdQ3rGtY1rGtY17CuYV3DuoZ1Desa1jWsa1jXsK5hXcO6hnUN6xrWNaxrWNewrmFdw7qGdQ3rGtY1rGtY17CuYV3DuoZ1Desa1jWsa1jXsK5hXcO6hnUN6xrWNaxrWNewrmFdw7qGdQ3rGtY1rGtY17CuYV3DuoZ1Desa1jWsa1jXsK5hXcO6hnUN6xrWNaxrWNewrmFdw7qGdQ3rGtY1rGtY17CuYV3DuoZ1Desa1jWsa1jXsK5hXcO6hnUN6xrWNaxrWNewrmFdw7qGdQ3rGtY1rGtY17CuYV3DuoZ1Desa1jWsa1jXsK5hXcO6hnUN6xrWNaxrWNewrmFdw7qGdQ3rGtY1rGtY17CuYV3DuoZ1Desa1jWsa1jXsK5hXcO6hnUN6xrWNaxrWNewrmFdw7qGdQ3rGtY1rGtY17CuYV3DuoZ1Desa1jWsa1jXsK5hXcO6hnUN6xrWNaxrWNewrmFdw7qGdQ3rGtY1rGtY17CuYV3DuoZ1Desa1jWsa1jXsK5hXcO6hnUN6xrWNaxrWNewrmFdw7qGdQ3rGtY1rGtY17CuYV3DuoZ1Desa1jWsa1jXsK5hXcO6hnUN6xrWNaxrWNewrmFdw7qGdQ3rGtY1rGtY17CuYV3DuoZ1Desa1jWsa1jXsK5hXcO6hnUN6xrWNaxrWNewrmFdw7qGdQ3rGtY1rGtY17CuYV3DuoZ1Desa1jWsa1jXsK5hXcO6hnUN6xrWNaxrWNewrmFdw7qGdQ3rGtY1rGtY17CuYV3DuoZ1Desa1jWsa1jXsK5hXcO6hnUN6xrWNaxrWNewrmFdw7qGdQ3rGtY1rGtY17CuYV3DuoZ1Desa1jWsa1jXsK5hXcO6hnUN6xrWNaxrWNewrmFdw7qGdQ3rGtY1rGtY17CuYV3DuoZ1Desa1jWsa1jXsK5hXcO6hnUN6xrWNaxrWNewrmFdw7qGdQ3rGtY1rGtY17CuYV3DuoZ1Desa1jWsa1jXsK5hXcO6hnUN6xrWNaxrWNewrmFdw7qGdQ3rGtY1rGtY17CuYV3DuoZ1Desa1jWsa1jXsK5hXcO6hnUN6xrWNaxrWNewrmFdw7qGdQ3rGtY1rGtY17CuYV3DuoZ1Desa1jWsa1jXsK5hXcO6hnUN6xrWNay7Fz0EOVPDeGwAAAAASUVORK5CYII=";module.exports=r;