mooho-base-admin-plus 2.5.24 → 2.5.26

package/package.json

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

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

@@ -321,6 +321,14 @@
       getFullData() {
         return this.$refs.form.getFullData();
       },
+      /**
+       * 获取完整数据，跳过验证
+       *
+       * @public
+       */
+      getFullDataWithoutValidate() {
+        return this.$refs.form.getFullDataWithoutValidate();
+      },
       // /**
       //  * 强制更新
       //  *

package/src/components/workflow/task-form.vue

@@ -227,7 +227,16 @@
       },
       // 执行结果
       async action(outcome) {
-        let isOK = await this.form.validate();
+        let isOK;
+        if (this.isCustom && typeof this.$refs.customComponent.actionValidation === 'function') {
+          isOK = await this.$refs.customComponent.actionValidation(outcome);
+
+          if (!isOK) {
+            return;
+          }
+        }
+
+        isOK = await this.form.validate();
 
         if (!isOK) {
           this.error('Front_Msg_Form_Validate_Fail');
@@ -265,6 +274,14 @@
       },
       // 拒绝
       async reject() {
+        if (this.isCustom && typeof this.$refs.customComponent.rejectValidation === 'function') {
+          let isOK = await this.$refs.customComponent.rejectValidation();
+
+          if (!isOK) {
+            return;
+          }
+        }
+
         this.confirmInput(
           'Front_Msg_Sure_To_Reject_Application',
           this.$t('Front_Label_Comment'),

package/src/mixins/page.js

@@ -825,7 +825,9 @@ export default {
     // 重置通知栏数字
     resetNotice() {
       let notice = this.getNotice(this);
-      notice.init();
+      if (notice) {
+        notice.init();
+      }
     },
     // 获取通知栏
     getNotice(node) {

package/styleguide.config.js

@@ -0,0 +1,51 @@
+const VueLoaderPlugin = require('vue-loader/lib/plugin');
+
+module.exports = {
+  title: 'mooho-base-admin-plus',
+  components: [
+    'src/components/view/modal-form.vue',
+    'src/components/view/modal-table.vue',
+    'src/components/view/view-form.vue',
+    'src/components/view/view-table.vue',
+    'src/components/view/view-chart.vue',
+    'src/components/input/*.vue'
+  ],
+  styleguideDir: 'styleguide-dist',
+  // 在编辑器的右上角添加一个小按钮，用于将编辑器的内容复制到剪贴板
+  copyCodeButton: true,
+  // 是否每个章节是一个独立的页面. 默认:false
+  pagePerSection: false,
+  // props/events/slot的说明默认是展开还是收缩: expand / collapse / hide
+  usageMode: 'expand',
+  // 左侧导航默认是展开还是收缩: expand / collapse / hide
+  tocMode: 'expand',
+  // 显示 prop、事件、槽或方法是否来自当前文件或在 mixin 或扩展组件中配置。如果它是外部的，它会显示组件的名称，并在悬停时显示文件的相对路径。
+  displayOrigins: true,
+  webpackConfig: {
+    module: {
+      rules: [
+        // Vue loader
+        {
+          test: /\.vue$/,
+          exclude: /node_modules/,
+          loader: 'vue-loader'
+        },
+        // Babel loader, will use your project’s .babelrc
+        {
+          test: /\.js?$/,
+          exclude: /node_modules/,
+          loader: 'babel-loader'
+        },
+        // Other loaders that are needed for your components
+        {
+          test: /\.css$/,
+          loader: 'style-loader!css-loader'
+        }
+      ]
+    },
+    plugins: [
+      // add vue-loader plugin
+      new VueLoaderPlugin()
+    ]
+  }
+};