mooho-base-admin-plus 0.4.18 → 0.4.21

package/package.json

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

package/src/index.js

@@ -180,6 +180,9 @@ const created = async app => {
   // 初始化全屏监听
   store.dispatch('admin/layout/listenFullscreen');
 
+  // 所有页面
+  app.config.globalProperties.$pages = pages;
+
   // // 加载远程 i18n
   // if (Setting.i18n.remote) loadRemoteLocaleMessages(i18n);
 };

package/src/mixins/page.js

@@ -501,6 +501,9 @@ export default {
             data = '';
           }
           let value = setting.condition[i].value;
+          if (value == null) {
+            value = '';
+          }
           let operator = setting.condition[i].operator;
           let result = false;
 

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

@@ -136,6 +136,8 @@
 
             this.form = this.$refs.customComponent.form;
             this.form.data = this.model;
+            this.form.onDataChange();
+            this.form.clearValidate();
             this.readonly = !this.task.activityInst.activity.isEditable;
 
             if (this.form.formView) {
@@ -175,23 +177,27 @@
           this.customComponent = this.$pages[applicationType.templateUrl]; // 动态组件
           this.isCustom = true;
 
-          if (applicationType.isCustom) {
-            this.model = await customModelApi.get(applicationType.model, row.processInst.modelID);
-          } else {
-            this.model = await modelApi.get(applicationType.model, row.processInst.modelID);
-          }
+          setTimeout(async () => {
+            if (applicationType.isCustom) {
+              this.model = await customModelApi.get(applicationType.model, row.processInst.modelID);
+            } else {
+              this.model = await modelApi.get(applicationType.model, row.processInst.modelID);
+            }
 
-          this.form = this.$refs.customComponent.form;
-          this.form.data = this.model;
-          this.readonly = !this.task.activityInst.activity.isEditable;
+            this.form = this.$refs.customComponent.form;
+            this.form.data = this.model;
+            this.form.onDataChange();
+            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;
+            this.opened = true;
+          });
         } else if (applicationType.pageMode == 'Form') {
           this.form = this.$refs.form;
           this.form.init(applicationType.formViewCode, async view => {

package/src/styles/css/default.css

@@ -219,6 +219,10 @@
 }
 
 /* 表格筛选 */
+.filter {
+  margin-top: 4px;
+}
+
 .filter .ivu-col {
   margin-top: 0px;
   margin-bottom: 4px;

package/test/main.js

@@ -50,8 +50,8 @@ const app = createApp({
 });
 
 app.use(router);
-//app.use(store);
-//app.use(i18n);
 app.use(moohoBaseAdminPlus);
 
+//app.config.globalProperties.$pages = pages;
+
 app.mount('#app');