mooho-base-admin-plus 0.4.57 → 0.4.59

package/dist/setting.js

@@ -19,7 +19,7 @@ window.setting = {
     // 是否根据操作系统缩放比例，自动调整比例
     autoFixRatio: true,
     // 是否显示多语言
-    showI18n: true,
+    showI18n: false,
     // 是否显示通知
     showNotice: true,
     // 是否开启多 Tabs 页签

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "mooho-base-admin-plus",
   "description": "MOOHO basic framework for admin by Vue3",
-  "version": "0.4.57",
+  "version": "0.4.59",
   "author": "jinyifan <jinyifan@mooho.com.cn>",
   "dotnetVersion": "1.4.0",
   "license": "MIT",

package/public/setting.js

@@ -19,7 +19,7 @@ window.setting = {
     // 是否根据操作系统缩放比例，自动调整比例
     autoFixRatio: true,
     // 是否显示多语言
-    showI18n: true,
+    showI18n: false,
     // 是否显示通知
     showNotice: true,
     // 是否开启多 Tabs 页签

package/src/components/view/column-check.vue

@@ -63,8 +63,6 @@
         let objProperty = groupColumn.property.substr(0, groupColumn.property.length - 2);
         let node = findNode(nodes, objColumnExp);
 
-        console.log('xxx', objColumnExp, objProperty);
-
         if (node != null) {
           // 找到外键节点
           results.push({
@@ -193,8 +191,6 @@
               title: groupMethod.aggregateType + (groupMethod.aggregateType == 'Count' ? '' : ' - ' + groupMethod.columnExp) + ' (' + groupMethod.property + ')'
               // children: convertList(item.columns, columns, isGroupBy, groupColumns)
             });
-
-            console.log('aaa', this.data);
           });
         } else {
           // 数据源

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

@@ -431,7 +431,7 @@
               option.series = chartSeries.map((item, index) => {
                 return {
                   type: 'pie',
-                  radius: (this.setting.chartItemWidth == null ? 70 : this.setting.chartItemWidth) + 100 / count,
+                  radius: (this.setting.chartItemWidth == null ? 70 : this.setting.chartItemWidth) / count,
                   center: [(100 / (count + 1)) * (index + 1) + '%', '50%'],
                   datasetIndex: index,
                   data: this.data.map(data => {

package/src/index.js

@@ -167,7 +167,6 @@ let isFirstRouteChange = true;
 const created = async app => {
   // 加载多语言
   await store.dispatch('admin/i18n/load', app);
-
   // 初始化动态路由
   //let dynamicRoutes = await dynamicRouter.init(router, pages, layout);
   // 处理路由 得到每一级的路由设置

package/src/layouts/basic-layout/menu-side/menu-title.vue

@@ -10,7 +10,7 @@
       :class="{
         'i-layout-menu-side-title-text-selected': selected,
         'i-layout-menu-side-title-text-with-subtitle':
-          (layout.showI18n && !!($t('Permission_' + menu.code + '_SubName') || '').trim()) || (!layout.showI18n && !!(menu.subtitle || '').trim()),
+          (layout.showI18n && !!($t('Permission_' + menu.code + '_SubName') || '').trim()) || (!layout.showI18n && !!(menu.subTitle || '').trim()),
         'i-layout-menu-side-title-text-with-icon': withIcon
       }"
       v-if="!hideTitle"

package/src/pages/common/task-form.vue

@@ -14,7 +14,7 @@
       </template>
       <div class="ivu-ml-8 ivu-mr-8">
         <view-form v-if="!isCustom" ref="form" :readonly="readonly"></view-form>
-        <component v-if="isCustom" ref="customComponent" :is="customComponent" :readonly="readonly"></component>
+        <component v-if="isCustom" ref="customComponent" :is="customComponent" :readonly="readonly" @on-ready="customComponentReady"></component>
       </div>
       <template #footer>
         <div>
@@ -142,11 +142,11 @@
               this.form.clearValidate();
               this.readonly = !this.task.activityInst.activity.isEditable;
 
-              if (this.form.formView) {
-                this.width = this.form.formView.width || '800';
-                this.name = this.form.formView.name;
-                this.description = this.form.formView.description;
-              }
+              // if (this.form.formView) {
+              //   this.width = this.form.formView.width || '800';
+              //   this.name = this.form.formView.name;
+              //   this.description = this.form.formView.description;
+              // }
 
               this.opened = true;
             });
@@ -192,11 +192,11 @@
               this.form.clearValidate();
               this.readonly = !this.task.activityInst.activity.isEditable;
 
-              if (this.form.formView) {
-                this.width = this.form.formView.width || '800';
-                this.name = this.form.formView.name;
-                this.description = this.form.formView.description;
-              }
+              // if (this.form.formView) {
+              //   this.width = this.form.formView.width || '800';
+              //   this.name = this.form.formView.name;
+              //   this.description = this.form.formView.description;
+              // }
 
               this.opened = true;
             });
@@ -230,6 +230,12 @@
           this.outcomes = res.data;
         });
       },
+      // 自定义组件就绪
+      customComponentReady(formView) {
+        this.width = formView.width || '800';
+        this.name = formView.name;
+        this.description = formView.description;
+      },
       // 执行结果
       async action(outcome) {
         let isOK = await this.form.validate();

package/src/store/modules/admin/modules/menu.js

@@ -49,7 +49,7 @@ function convertMenu(source) {
       path: reg.test(item.url) ? item.url : '/' + item.url.split('?')[0],
       code: item.url,
       title: item.name,
-      subtitle: item.subName,
+      subTitle: item.subName,
       target: item.isNewWindow ? '_blank' : null,
       header: 'home',
       custom: item.icon,