mooho-base-admin-plus 2.10.95 → 2.10.97

package/package.json

@@ -1,58 +1,68 @@
-{
-  "name": "mooho-base-admin-plus",
-  "description": "MOOHO basic framework for admin by Vue3",
-  "version": "2.10.95",
-  "author": "jinyifan <jinyifan@mooho.com.cn>",
-  "license": "MIT",
-  "private": false,
-  "type": "module",
-  "module": "./package/mooho-base-admin-plus.min.js",
-  "scripts": {
-    "postinstall": "node scripts/sync-ckeditor.cjs",
-    "dev": "vite --open",
-    "build": "vite build",
-    "package": "vite build --mode lib"
-  },
-  "dependencies": {
-    "@fortawesome/fontawesome-free": "^5.13.0",
-    "@handsontable/vue3": "^16.1.1",
-    "axios": "^1.6.7",
-    "ckeditor4": "4.22.1",
-    "date-fns": "^2.9.0",
-    "echarts": "^5.3.2",
-    "file-saver": "^2.0.2",
-    "handsontable": "^16.1.1",
-    "js-cookie": "^3.0.1",
-    "jsencrypt": "^3.3.2",
-    "lodash": "^4.17.21",
-    "lowdb": "^1.0.0",
-    "screenfull": "^4.2.1",
-    "sweetalert2": "^9.8.2",
-    "view-ui-plus": "^1.0.0",
-    "vue-i18n": "^9.1.9",
-    "vue-router": "^4.0.14",
-    "vuedraggable": "^4.1.0",
-    "vuex": "^4.0.2"
-  },
-  "browserslist": [
-    "defaults",
-    "> 1%",
-    "last 2 versions",
-    "not ie <= 8",
-    "iOS >= 7",
-    "Android >= 4.0"
-  ],
-  "devDependencies": {
-    "@vitejs/plugin-vue": "^5.0.0",
-    "@vue/compiler-sfc": "^3.0.0",
-    "@vue/eslint-config-standard": "^4.0.0",
-    "eslint-config-prettier": "^8.3.0",
-    "eslint-plugin-prettier": "^5.0.0",
-    "eslint-plugin-vue": "^8.0.3",
-    "less": "^2.7.3",
-    "less-loader": "^4.1.0",
-    "vite": "^5.0.0",
-    "vite-plugin-compression": "^0.5.1",
-    "vue-template-compiler": "^2.6.14"
-  }
-}
+{
+  "name": "mooho-base-admin-plus",
+  "description": "MOOHO basic framework for admin by Vue3",
+  "version": "2.10.97",
+  "author": "jinyifan <jinyifan@mooho.com.cn>",
+  "license": "MIT",
+  "private": false,
+  "type": "module",
+  "module": "./package/mooho-base-admin-plus.min.js",
+  "peerDependencies": {
+    "vue": "^3.3.0",
+    "vue-router": "^4.0.0",
+    "vuex": "^4.0.0",
+    "vue-i18n": "^9.0.0",
+    "view-ui-plus": "^1.0.0",
+    "vuedraggable": "^4.0.0",
+    "sortablejs": "^1.0.0"
+  },
+  "scripts": {
+    "postinstall": "node scripts/sync-ckeditor.cjs",
+    "dev": "vite --open",
+    "build": "vite build",
+    "package": "vite build --mode lib"
+  },
+  "dependencies": {
+    "@fortawesome/fontawesome-free": "^5.13.0",
+    "@handsontable/vue3": "^16.1.1",
+    "axios": "^1.6.7",
+    "ckeditor4": "4.22.1",
+    "date-fns": "^2.9.0",
+    "echarts": "^5.3.2",
+    "file-saver": "^2.0.2",
+    "handsontable": "^16.1.1",
+    "js-cookie": "^3.0.1",
+    "jsencrypt": "^3.3.2",
+    "lodash": "^4.17.21",
+    "lowdb": "^1.0.0",
+    "screenfull": "^4.2.1",
+    "sweetalert2": "^9.8.2",
+    "view-ui-plus": "^1.0.0",
+    "vue-i18n": "^9.1.9",
+    "vue-router": "^4.0.14",
+    "vuedraggable": "^4.1.0",
+    "vuex": "^4.0.2"
+  },
+  "browserslist": [
+    "defaults",
+    "> 1%",
+    "last 2 versions",
+    "not ie <= 8",
+    "iOS >= 7",
+    "Android >= 4.0"
+  ],
+  "devDependencies": {
+    "vue": "^3.4.0",
+    "@vitejs/plugin-vue": "^5.0.0",
+    "@vue/compiler-sfc": "^3.0.0",
+    "@vue/eslint-config-standard": "^4.0.0",
+    "eslint-config-prettier": "^8.3.0",
+    "eslint-plugin-prettier": "^5.0.0",
+    "eslint-plugin-vue": "^8.0.3",
+    "less": "^2.7.3",
+    "less-loader": "^4.1.0",
+    "vite": "^5.0.0",
+    "vite-plugin-compression": "^0.5.1",
+    "vue-template-compiler": "^2.6.14"
+  }
+}

package/src/components/view/modal-table-excel.vue

@@ -0,0 +1,230 @@
+<template>
+  <Modal
+    ref="modal"
+    v-model="opened"
+    scrollable
+    :fullscreen="isFullscreen"
+    :mask-closable="maskClosable == null ? layout.maskClosable : maskClosable"
+    :draggable="draggable == null ? layout.draggable : draggable"
+    :sticky="true"
+    :reset-drag-position="true"
+    :width="modalWidth"
+    :before-close="beforeClose"
+    :footer-hide="!footerEnable"
+    @on-visible-change="onVisibleChange"
+  >
+    <template #header>
+      <div>
+        <slot name="header">
+          <span class="title">{{ getNameI18n(tableView) }}</span>
+          <span class="description">{{ getDescI18n(tableView) }}</span>
+        </slot>
+      </div>
+    </template>
+    <template #close>
+      <div @click.stop>
+        <Icon v-if="!isFullscreen" style="font-size: 20px; color: #999; position: relative; top: -3px" type="ios-expand" @click="setFullscreen(true)" />
+        <Icon v-if="isFullscreen" style="font-size: 20px; color: #999; position: relative; top: -3px" type="ios-contract" @click="setFullscreen(false)" />
+        <Icon type="ios-close" @click="clickClose()" />
+      </div>
+    </template>
+    <div class="ivu-ml-8 ivu-mr-8">
+      <view-table-excel
+        ref="table"
+        :view-code="viewCode"
+        :readonly="readonly"
+        :parent-data="mergedParentData"
+        :setting-enable="settingEnable"
+        :auto-load="false"
+        :height="height"
+        @after-init="afterInit"
+        @on-change="onChange"
+        @on-load-data="onLoadData"
+      >
+        <template #top>
+          <slot name="top"></slot>
+        </template>
+      </view-table-excel>
+    </div>
+    <template #footer>
+      <div>
+        <slot name="footer"></slot>
+      </div>
+    </template>
+  </Modal>
+</template>
+<script>
+  import mixinPage from '../../mixins/page';
+
+  /**
+   * @displayName modal-table-excel 表格对话框（Handsontable / view-table-excel）
+   */
+  export default {
+    mixins: [mixinPage],
+    components: {},
+    emits: ['after-init', 'on-close', 'on-change', 'on-load-data'],
+    data() {
+      return {
+        opened: false,
+        isFullscreen: false,
+        tableView: {},
+        param: {}
+      };
+    },
+    props: {
+      viewCode: {
+        type: String
+      },
+      readonly: {
+        type: Boolean,
+        default: false
+      },
+      parentData: {
+        type: Object,
+        default() {
+          return {};
+        }
+      },
+      footerEnable: {
+        type: Boolean,
+        default: false
+      },
+      maskClosable: {
+        type: Boolean,
+        default: null
+      },
+      draggable: {
+        type: Boolean,
+        default: null
+      },
+      settingEnable: {
+        type: Boolean,
+        default: true
+      },
+      height: {
+        type: Number,
+        default: null
+      },
+      beforeClose: {
+        type: Function
+      }
+    },
+    computed: {
+      data() {
+        return this.$refs.table?.data;
+      },
+      table() {
+        return this.$refs.table;
+      },
+      screenWidth() {
+        return document.body.clientWidth * 0.8;
+      },
+      modalWidth() {
+        return this.tableView.width || this.screenWidth;
+      },
+      mergedParentData() {
+        return { ...this.parentData, ...this.param };
+      }
+    },
+    methods: {
+      async init(viewCode, callback, onFail) {
+        await this.$refs.table.init(viewCode, callback, onFail);
+        this.tableView = this.$refs.table.tableView || {};
+      },
+      open(param) {
+        setTimeout(() => {
+          this.param = param || {};
+          if (this.$refs.table) {
+            this.$refs.table.loadData();
+          }
+          this.opened = true;
+        });
+      },
+      async close() {
+        this.opened = false;
+      },
+      validate() {
+        return this.$refs.table.validate();
+      },
+      loadData(staticData) {
+        this.$refs.table.loadData(staticData);
+      },
+      getData() {
+        return this.$refs.table.getData();
+      },
+      getDefaultData() {
+        return this.$refs.table.getDefaultData();
+      },
+      clear() {
+        this.$refs.table.clear();
+      },
+      resetFilter() {},
+      onVisibleChange(show) {
+        if (!show) {
+          this.$refs.table?.loadData?.([]);
+          this.$emit('on-close');
+        }
+      },
+      onLoadData() {
+        this.$emit('on-load-data');
+      },
+      afterInit() {
+        this.tableView = this.$refs.table?.tableView || {};
+        this.$emit('after-init');
+      },
+      clickClose() {
+        if (typeof this.beforeClose == 'function') {
+          this.beforeClose().then(
+            () => {
+              this.close();
+            },
+            () => {}
+          );
+        } else {
+          this.close();
+        }
+      },
+      getNameI18n(tableView) {
+        if (!tableView || !tableView.code) {
+          return '';
+        }
+        if (this.layout.showI18n) {
+          let key = 'DataView_' + tableView.code;
+          let text = this.$t(key);
+          if (text == key) {
+            return tableView.name;
+          } else {
+            return text;
+          }
+        } else {
+          return tableView.name;
+        }
+      },
+      getDescI18n(tableView) {
+        if (!tableView || !tableView.code) {
+          return '';
+        }
+        if (this.layout.showI18n) {
+          let key = 'DataView_' + tableView.code + '_$Desc';
+          let text = this.$t(key);
+          if (text == key) {
+            return tableView.description || '';
+          } else {
+            return text;
+          }
+        } else {
+          return tableView.description || '';
+        }
+      },
+      setFullscreen(isFullscreen) {
+        if (this.$refs.table) {
+          this.$refs.table.isMaxHight = isFullscreen;
+        }
+        this.isFullscreen = isFullscreen;
+      },
+      onChange(data, sender, selected) {
+        this.$emit('on-change', data, sender, selected);
+      }
+    }
+  };
+</script>

package/src/components/view/view-form.vue

@@ -189,7 +189,7 @@
               </template>
               <template v-else-if="column.controlType === 'Select'">
                 <Select
-                  :model-value="parseData(data, column.code)"
+                  :model-value="parseData(data, column.code) == null ? null : parseData(data, column.code).toString()"
                   @update:model-value="$event => setData(data, column.code, $event)"
                   :disabled="readonly || column.isReadonly"
                   :clearable="!(readonly || column.isReadonly)"
@@ -951,7 +951,8 @@
             column.controlType == 'DateTime' ||
             column.controlType == 'Year' ||
             column.controlType == 'Month' ||
-            column.controlType == 'DateRange'
+            column.controlType == 'DateRange' ||
+            (column.controlType == 'Select' && column.dataType == 'Boolean')
           ) {
             rules.push({
               pattern: /.+/,
@@ -1047,7 +1048,7 @@
                         id: parseFloat(key),
                         name: value
                       });
-                    } else if (column.dataType == 'Boolean') {
+                    } else if (column.dataType == 'Boolean' && (column.controlType == 'Check' || column.controlType == 'Switch')) {
                       column.dataSource.push({
                         id: key.toUpperCase() == 'TRUE',
                         name: value

package/src/components/view/view-table-excel.vue

@@ -4,6 +4,7 @@
     -->
   <slot name="top"></slot>
   <hot-table ref="table" :settings="hotSetting"></hot-table>
+  <!-- DialogSelect 弹窗仍用 modal-table + view-table（行内「选择」列插槽）；modal-table-excel 供全站按需使用 -->
   <modal-table ref="dialogTable">
     <template #command="{ row }">
       <Button size="small" title="选择" type="primary" custom-icon="fa fa-check" @click="dialogCheck(row)"></Button>

package/src/components/view/view-table.vue

@@ -1922,7 +1922,7 @@
                             id: parseFloat(key),
                             name: value
                           });
-                        } else if (column.dataType == 'Boolean') {
+                        } else if (column.dataType == 'Boolean' && (column.controlType == 'Check' || column.controlType == 'Switch')) {
                           row._dataSource[column.code].push({
                             id: key.toUpperCase() == 'TRUE',
                             name: value

package/src/i18n/index.js

@@ -1,17 +1,17 @@
-import { createI18n } from 'vue-i18n/dist/vue-i18n.cjs.js';
-//import store from '../store/index';
-//import messages from './locale';
-
-//store.dispatch('admin/i18n/getLocale');
-
-//const locale = store.state.admin.i18n.locale;
-
-export default createI18n({
-  allowComposition: true,
-  globalInjection: true,
-  fallbackWarn: false,
-  missingWarn: false,
-  legacy: false
-  // locale,
-  // messages
-});
+import { createI18n } from 'vue-i18n';
+//import store from '../store/index';
+//import messages from './locale';
+
+//store.dispatch('admin/i18n/getLocale');
+
+//const locale = store.state.admin.i18n.locale;
+
+export default createI18n({
+  allowComposition: true,
+  globalInjection: true,
+  fallbackWarn: false,
+  missingWarn: false,
+  legacy: false
+  // locale,
+  // messages
+});

package/vite.config.js

@@ -1,99 +1,125 @@
-import { defineConfig } from 'vite';
-import vue from '@vitejs/plugin-vue';
-import { resolve } from 'path';
-import Setting from './test/setting.env';
-import compression from 'vite-plugin-compression';
-
-const build = defineConfig({
-  define: {
-    __VUE_OPTIONS_API__: true,
-    __VUE_PROD_DEVTOOLS__: false,
-    __VUE_PROD_HYDRATION_MISMATCH_DETAILS__: false
-  },
-  plugins: [
-    vue(),
-    compression({
-      algorithm: 'gzip',
-      threshold: 10240,
-      deleteOriginFile: false
-    })
-  ],
-  base: Setting.publicPath,
-  build: {
-    sourcemap: false, // 输出.map文件
-    outDir: Setting.outputDir,
-    assetsDir: Setting.assetsDir
-    // minify: 'terser', // 混淆器，terser构建后文件体积更小
-  },
-  resolve: {
-    alias: {
-      '@': resolve(__dirname, '.', 'src')
-    }
-    // extensions: ['.js', '.json', '.vue']
-  }
-});
-
-const lib = defineConfig({
-  plugins: [vue()],
-  publicDir: '',
-  base: Setting.publicPath,
-  build: {
-    sourcemap: false, // 输出.map文件
-    outDir: 'package',
-    assetsDir: Setting.assetsDir,
-    // minify: 'terser', // 混淆器，terser构建后文件体积更小
-    lib: {
-      entry: resolve(__dirname, './src/index.js'),
-      name: 'moohoBaseAdminPlus'
-    },
-    rollupOptions: {
-      context: 'globalThis',
-      preserveEntrySignatures: 'strict',
-      external: ['vue', 'view-ui-plus'],
-      output: [
-        {
-          name: 'mooho-base-admin-plus',
-          format: 'umd',
-          exports: 'named',
-          sourcemap: false,
-          entryFileNames: 'mooho-base-admin-plus.min.js',
-          chunkFileNames: '[name].js',
-          assetFileNames: '[name].[ext]',
-          namespaceToStringTag: true,
-          inlineDynamicImports: false,
-          manualChunks: undefined,
-          globals: { vue: 'Vue', 'view-ui-plus': 'viewUiPlus' }
-        },
-        {
-          name: 'mooho-base-admin-plus',
-          format: 'es',
-          exports: 'named',
-          sourcemap: false,
-          entryFileNames: 'mooho-base-admin-plus.min.esm.js',
-          chunkFileNames: '[name].js',
-          assetFileNames: '[name].[ext]',
-          namespaceToStringTag: true,
-          inlineDynamicImports: false,
-          manualChunks: undefined,
-          globals: { vue: 'Vue', 'view-ui-plus': 'viewUiPlus' }
-        }
-      ]
-    }
-  },
-  resolve: {
-    alias: {
-      '@': resolve(__dirname, '.', 'src')
-    }
-    // extensions: ['.js', '.json', '.vue']
-  }
-});
-
-export default ({ mode }) => {
-  switch (mode) {
-    case 'lib': // 打包库文件
-      return lib;
-
-    default: // 开发模式、生产模式
-      return build;
-  }
-};
+import { defineConfig } from 'vite';
+import vue from '@vitejs/plugin-vue';
+import { resolve } from 'path';
+import Setting from './test/setting.env';
+import compression from 'vite-plugin-compression';
+
+const build = defineConfig({
+  define: {
+    __VUE_OPTIONS_API__: true,
+    __VUE_PROD_DEVTOOLS__: false,
+    __VUE_PROD_HYDRATION_MISMATCH_DETAILS__: false
+  },
+  plugins: [
+    vue(),
+    compression({
+      algorithm: 'gzip',
+      threshold: 10240,
+      deleteOriginFile: false
+    })
+  ],
+  base: Setting.publicPath,
+  build: {
+    sourcemap: false, // 输出.map文件
+    outDir: Setting.outputDir,
+    assetsDir: Setting.assetsDir
+    // minify: 'terser', // 混淆器，terser构建后文件体积更小
+  },
+  resolve: {
+    alias: {
+      '@': resolve(__dirname, '.', 'src')
+    }
+    // extensions: ['.js', '.json', '.vue']
+  }
+});
+
+const lib = defineConfig({
+  plugins: [vue()],
+  publicDir: '',
+  base: Setting.publicPath,
+  build: {
+    sourcemap: false, // 输出.map文件
+    outDir: 'package',
+    assetsDir: Setting.assetsDir,
+    // minify: 'terser', // 混淆器，terser构建后文件体积更小
+    lib: {
+      entry: resolve(__dirname, './src/index.js'),
+      name: 'moohoBaseAdminPlus'
+    },
+    rollupOptions: {
+      context: 'globalThis',
+      preserveEntrySignatures: 'strict',
+      /**
+       * 源码里存在 `vue-i18n/dist/vue-i18n.cjs.js` 等子路径，仅写 `vue-i18n` 无法 external。
+       * 将 vue 生态全部外置，避免 Rollup 把 vue 合成 import X, {…} from "vue"。
+       */
+      external: (id) =>
+        id === 'vue' ||
+        id === 'vue-router' ||
+        id === 'vuex' ||
+        id === 'view-ui-plus' ||
+        id.startsWith('vue-i18n') ||
+        id === 'vuedraggable' ||
+        id === 'sortablejs',
+      output: [
+        {
+          name: 'mooho-base-admin-plus',
+          format: 'umd',
+          exports: 'named',
+          sourcemap: false,
+          entryFileNames: 'mooho-base-admin-plus.min.js',
+          chunkFileNames: '[name].js',
+          assetFileNames: '[name].[ext]',
+          inlineDynamicImports: false,
+          manualChunks: undefined,
+          globals: {
+            vue: 'Vue',
+            'view-ui-plus': 'viewUiPlus',
+            'vue-i18n': 'VueI18n',
+            'vue-router': 'VueRouter',
+            vuex: 'Vuex',
+            vuedraggable: 'vuedraggable',
+            sortablejs: 'Sortable'
+          }
+        },
+        {
+          name: 'mooho-base-admin-plus',
+          format: 'es',
+          exports: 'named',
+          interop: 'esModule',
+          sourcemap: false,
+          entryFileNames: 'mooho-base-admin-plus.min.esm.js',
+          chunkFileNames: '[name].js',
+          assetFileNames: '[name].[ext]',
+          inlineDynamicImports: false,
+          manualChunks: undefined,
+          globals: {
+            vue: 'Vue',
+            'view-ui-plus': 'viewUiPlus',
+            'vue-i18n': 'VueI18n',
+            'vue-router': 'VueRouter',
+            vuex: 'Vuex',
+            vuedraggable: 'vuedraggable',
+            sortablejs: 'Sortable'
+          }
+        }
+      ]
+    }
+  },
+  resolve: {
+    alias: {
+      '@': resolve(__dirname, '.', 'src')
+    }
+    // extensions: ['.js', '.json', '.vue']
+  }
+});
+
+export default ({ mode }) => {
+  switch (mode) {
+    case 'lib': // 打包库文件
+      return lib;
+
+    default: // 开发模式、生产模式
+      return build;
+  }
+};