mooho-base-admin-plus 0.1.51 → 0.1.54

package/package.json

@@ -1,12 +1,12 @@
 {
   "name": "mooho-base-admin-plus",
   "description": "MOOHO basic framework for admin by Vue3",
-  "version": "0.1.51",
+  "version": "0.1.54",
   "author": "jinyifan <jinyifan@mooho.com.cn>",
   "dotnetVersion": "1.3.97",
   "license": "MIT",
   "private": false,
-  "main": "./dist/mooho-base-admin-plus.min.esm.js",
+  "main": "./dist/mooho-base-admin-plus.min.js",
   "scripts": {
     "dev": "vite --open",
     "build": "vite build",

package/src/layouts/basic-layout/index.vue

@@ -33,7 +33,7 @@
         <div class="i-layout-content-main">
           <router-view #default="{ Component }">
             <keep-alive :include="keepAlive">
-              <component :is="Component" v-if="loadRouter" />
+              <component :is="Component" :key="$route.name" v-if="loadRouter" />
             </keep-alive>
           </router-view>
         </div>

package/src/pages/system/user.vue

@@ -8,6 +8,7 @@
         <template #command="{ row }">
           <Button size="small" title="角色" type="info" custom-icon="fa fa-users" @click="$refs.userRoleTable.open({ userID: row.id })"></Button>
           <Button size="small" title="编辑" type="primary" custom-icon="fa fa-edit" @click="$refs.form.open(row)"></Button>
+          <Button size="small" title="数据权限" type="primary" custom-icon="fa fa-sitemap" @click="openDataPermission(row)"></Button>
           <Button size="small" title="删除" type="warning" custom-icon="fa fa-trash-alt" @click="$refs.table.remove(row)"></Button>
         </template>
       </view-table>
@@ -69,6 +70,11 @@
         <Button type="primary" custom-icon="fa fa-save" @click="userRoleSave">保存</Button>
       </template>
     </modal-form>
+    <modal-form ref="dataPermissionForm" view-code="DataPermission">
+      <template #footer>
+        <Button type="primary" custom-icon="fa fa-save" @click="saveDataPermission">保存</Button>
+      </template>
+    </modal-form>
   </div>
 </template>
 <script>
@@ -83,6 +89,7 @@
     components: {},
     data() {
       return {
+        user: null,
         userID: null,
         factories: []
       };
@@ -244,6 +251,33 @@
           await userApi.resetPassword(this.$refs.form.data.id);
           this.success('已重置为初始密码！');
         });
+      },
+      // 打开数据权限
+      openDataPermission(row) {
+        let data = {};
+        if (!!(row.dataPermission || '').trim()) {
+          data = JSON.parse(row.dataPermission);
+        }
+
+        this.user = row;
+        this.$refs.dataPermissionForm.open(data);
+      },
+      // 数据权限保存
+      saveDataPermission() {
+        let data = this.$refs.dataPermissionForm.data;
+        for (let key in data) {
+          if (typeof data[key] == 'object') {
+            delete data[key];
+          }
+        }
+
+        this.user.dataPermission = JSON.stringify(data);
+
+        this.confirm('确定要保存数据权限吗？', async () => {
+          await modelApi.update('User', this.user);
+          this.success('操作成功！');
+          this.$refs.dataPermissionForm.close();
+        });
       }
     }
   };

package/src/styles/index.less

@@ -1,6 +1,6 @@
 @import "./default/index.less";
 @import "./font/iconfont.css";
-@import "./font/icon-demo/iconfont.css";
+//@import "./font/icon-demo/iconfont.css";
 @import "./setting.less";
 @import "./common.less";
 

package/vite.config.js

@@ -11,11 +11,13 @@ export default defineConfig({
     sourcemap: false, // 输出.map文件
     outDir: Setting.outputDir,
     assetsDir: Setting.assetsDir,
-    // minify: 'terser', // 混淆器，terser构建后文件体积更小
-    lib: {
-      entry: resolve(__dirname, './src/index.js'),
-      name: 'moohoBaseAdminPlus'
-    },
+    cssCodeSplit: false,
+    // assetsInlineLimit: 4096,
+    // // minify: 'terser', // 混淆器，terser构建后文件体积更小
+    // lib: {
+    //   entry: resolve(__dirname, './src/index.js'),
+    //   name: 'moohoBaseAdminPlus'
+    // },
     rollupOptions: {
       context: 'globalThis',
       preserveEntrySignatures: 'strict',
@@ -32,18 +34,6 @@ export default defineConfig({
           inlineDynamicImports: false,
           manualChunks: undefined,
           globals: { vue: 'Vue', 'view-ui-plus': 'viewUiPlus' }
-        },
-        {
-          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' }
         }
       ]
     }