mooho-base-admin-plus 2.0.47 → 2.0.49

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "mooho-base-admin-plus",
   "description": "MOOHO basic framework for admin by Vue3",
-  "version": "2.0.47",
+  "version": "2.0.49",
   "author": "jinyifan <jinyifan@mooho.com.cn>",
   "license": "MIT",
   "private": false,

package/public/setting.js

@@ -64,7 +64,7 @@ window.setting = {
     // 全局面包屑是否显示图标，开启 showBreadcrumb 时有效
     showBreadcrumbIcon: false,
     // 是否显示多语言
-    showI18n: false,
+    showI18n: true,
     // 是否支持动态修改布局配置，移动端下会自动强制关闭
     enableSetting: false,
     // 退出登录时，是否二次确认

package/src/components/input/dialog-select.vue

@@ -14,7 +14,7 @@
         <Button :size="size" custom-icon="fa fa-search" @click="dialogSelectOpen()"></Button>
       </template>
     </Input>
-    <modal-table ref="dialogTable" :view-code="source" :selectEnable="multi" :footerEnable="multi" v-if="dialogActive">
+    <modal-table ref="dialogTable" :view-code="source" :selectEnable="multi" check-cross-page="true" :footer-enable="multi" v-if="dialogActive">
       <template #command="{ row }">
         <Button size="small" v-if="!multi" type="primary" custom-icon="fa fa-check" @click="dialogCheck(row)">{{ $t('Front_Btn_Select') }}</Button>
       </template>

package/src/components/input/item-select.vue

@@ -19,9 +19,9 @@
             <view-table
               ref="selectSourceTable"
               :view-code="sourceViewCode"
-              :selectEnable="true"
-              :checkCrossPage="true"
-              :autoLoad="false"
+              :select-enable="true"
+              :check-cross-page="true"
+              :auto-load="false"
               :filter="sourceFilter"
               :height="480"
               @on-select-change="selectedChange"

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

@@ -89,6 +89,7 @@
   import viewFormDraggable from './view-form-draggable.vue';
   import draggable from 'vuedraggable';
   import enumApi from '../../api/enum';
+  import { get, set } from 'lodash';
 
   export default {
     mixins: [mixinPage],
@@ -233,6 +234,10 @@
             this.$refs.form.columns.push(item);
           });
 
+          // this.$refs.form.data.factory = {
+          //   name: null
+          // };
+
           // 添加新勾选的
           checked.forEach(item => {
             if (
@@ -240,13 +245,20 @@
                 return column.code === item.code;
               })
             ) {
-              this.$refs.form.columns.push({
+              let data = this.$refs.form.data;
+
+              // 创建结构
+              if (get(data, item.code) == null) {
+                set(data, item.code, null);
+              }
+
+              let column = {
                 code: item.code,
                 name: item.name,
                 dataType: item.dataType,
                 dataView: this.dataView,
                 isShow: true,
-                controlType: this.getDefaultControlType(item.dataType),
+                controlType: item.code.indexOf('.') > 0 ? 'Label' : this.getDefaultControlType(item.dataType),
                 columnWidth: this.columnWidth, // 默认宽度1/2
                 source: item.objColumn != null ? item.objColumn.dataType : null,
                 sourceDataCode: item.objColumn != null ? 'id' : null,
@@ -258,7 +270,9 @@
                   })
                     ? 'name'
                     : null
-              });
+              };
+
+              this.$refs.form.columns.push(column);
             }
           });
 

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

@@ -32,6 +32,8 @@
         :setting-enable="settingEnable"
         :select-enable="selectEnable"
         :autoLoad="false"
+        :selectEnable="selectEnable"
+        :checkCrossPage="checkCrossPage"
         :tree-enable="treeEnable"
         :tree-load="treeLoad"
         :has-children="hasChildren"
@@ -210,6 +212,13 @@
         type: Boolean,
         default: false
       },
+      /**
+       * 是否跨页选择
+       */
+      checkCrossPage: {
+        type: Boolean,
+        default: false
+      },
       /**
        * 是否允许树展开
        */

package/src/i18n/index.js

@@ -1,4 +1,4 @@
-import { createI18n } from 'vue-i18n';
+import { createI18n } from 'vue-i18n/dist/vue-i18n.cjs.js';
 //import store from '../store/index';
 //import messages from './locale';
 

package/src/mixins/page.js

@@ -108,7 +108,6 @@ export default {
         return this.userPermissions[key];
       } else {
         // 页面权限点
-        //console.log('router.currentRoute', router.currentRoute.value.fullPath);
         let url = router.currentRoute.value.fullPath.substr(1);
 
         if (this.userPermissions[url + '$' + key] == true) {

package/vite.config.js

@@ -14,8 +14,7 @@ const build = defineConfig({
   },
   resolve: {
     alias: {
-      '@': resolve(__dirname, '.', 'src'),
-      'vue-i18n': 'vue-i18n/dist/vue-i18n.cjs.js'
+      '@': resolve(__dirname, '.', 'src')
     }
     // extensions: ['.js', '.json', '.vue']
   }
@@ -68,8 +67,7 @@ const lib = defineConfig({
   },
   resolve: {
     alias: {
-      '@': resolve(__dirname, '.', 'src'),
-      'vue-i18n': 'vue-i18n/dist/vue-i18n.cjs.js'
+      '@': resolve(__dirname, '.', 'src')
     }
     // extensions: ['.js', '.json', '.vue']
   }