修复 表单项vif不起作用 #67

修复 用户会话超时后，没有提示和返回登陆页面 #65

Author: yidalh

public/app.js

@@ -1,5 +1,5 @@
 {
-    "/app.js": "/app.js?id=e65338425eb667f6b50f",
+    "/app.js": "/app.js?id=3320bf1e803e19ba9913",
     "/manifest.js": "/manifest.js?id=8991394a854ee5cdffc3",
     "/vendor.js": "/vendor.js?id=df0be4950fcb717193ba"
 }

public/mix-manifest.json

@@ -1,62 +1,59 @@
 <template>
-    <div>
-        <component
-            v-if="item.topComponent"
-            :is="item.topComponent.componentName"
-            :attrs="item.topComponent"
-        />
+  <item-if :form-data="formData" :form-item="item">
+    <component
+      v-if="item.topComponent"
+      :is="item.topComponent.componentName"
+      :attrs="item.topComponent"
+    />
 
-        <el-form-item
-            :prop="item.prop"
-            :error="item.error"
-            :show-message="item.showMessage"
-            :inline-message="item.inlineMessage"
-            :size="item.size"
-            :label-width="item.labelWidth"
-        >
-            <span slot="label" v-if="!item.hideLabel">{{ item.label }}</span>
-            <el-col :span="item.inputWidth">
-                <ItemDisplay
-                    v-if="item.relationName"
-                    v-model="formData[item.relationName][item.relationValueKey]"
-                    :form-item="item"
-                    :form-data="formData"
-                    v-bind="$attrs"
-                />
-                <ItemDisplay
-                    v-else
-                    v-model="formData[item.prop]"
-                    :form-item="item"
-                    :form-data="formData"
-                    v-bind="$attrs"
-                />
-                <div v-if="item.help" class="form-item-help" v-html="item.help"></div>
-            </el-col>
-        </el-form-item>
-        <component
-            v-if="item.footerComponent"
-            :is="item.footerComponent.componentName"
-            :attrs="item.footerComponent"
+    <el-form-item
+      :prop="item.prop"
+      :error="item.error"
+      :show-message="item.showMessage"
+      :inline-message="item.inlineMessage"
+      :size="item.size"
+      :label-width="item.labelWidth"
+    >
+      <span slot="label" v-if="!item.hideLabel">{{ item.label }}</span>
+      <el-col :span="item.inputWidth">
+        <ItemDisplay
+          v-if="item.relationName"
+          v-model="formData[item.relationName][item.relationValueKey]"
+          :form-item="item"
+          :form-data="formData"
+          v-bind="$attrs"
+        />
+        <ItemDisplay
+          v-else
+          v-model="formData[item.prop]"
+          :form-item="item"
+          :form-data="formData"
+          v-bind="$attrs"
         />
-    </div>
+        <div v-if="item.help" class="form-item-help" v-html="item.help"></div>
+      </el-col>
+    </el-form-item>
+    <component
+      v-if="item.footerComponent"
+      :is="item.footerComponent.componentName"
+      :attrs="item.footerComponent"
+    />
+  </item-if>
 </template>
 <script>
 import ItemDisplay from "./ItemDisplay";
 import ItemIf from "./ItemIf";
-
 export default {
-    props: ["attrs",  "formData"],
-    components: {
-        ItemDisplay,
-        ItemIf,
-    },
-    mounted() {
-
-    },
-    computed: {
-        item() {
-            return this.attrs;
-        },
+  props: ["attrs", "formData"],
+  components: {
+    ItemDisplay,
+    ItemIf,
+  },
+  mounted() {},
+  computed: {
+    item() {
+      return this.attrs;
     },
+  },
 };
 </script>

resources/js/components/form/FormItem.vue

@@ -6,19 +6,18 @@
 <script>
 export default {
   props: {
-    form_item: Object,
-    form_items: Array,
-    form_data: Object,
+    formItem: Object,
+    formData: Object,
   },
   mounted() {},
   computed: {
     ifVif() {
-      let key = this.form_item.vif.key;
-      let value = this.form_item.vif.value;
-      let anyValue = this.form_item.vif.anyValue;
+      let key = this.formItem.vif.key;
+      let value = this.formItem.vif.value;
+      let anyValue = this.formItem.vif.anyValue;
 
       if (key) {
-        let cValue = window._.get(this.form_data, key);
+        let cValue = window._.get(this.formData, key);
         if (cValue == value || (cValue && anyValue)) {
           return true;
         } else {
@@ -30,13 +29,13 @@ export default {
     },
     ivEval() {
       try {
-        if (!this.form_item.vifEval) {
+        if (!this.formItem.vifEval) {
           return true;
         }
-        let expression = this.form_item.vifEval.expression;
-        let props = this.form_item.vifEval.props;
+        let expression = this.formItem.vifEval.expression;
+        let props = this.formItem.vifEval.props;
         props.map((prop) => {
-          window._.get(this.form_data, prop);
+          window._.get(this.formData, prop);
         });
         if (expression) {
           return eval(expression);

resources/js/components/form/ItemIf.vue

@@ -57,6 +57,20 @@ axios.interceptors.response.use(
                 });
                 router.replace('/404')
                 break;
+            case 401:
+                Notification.error({
+                    title: "登录信息已过期",
+                    message: response.data.message
+                });
+                location.reload();
+                break;
+            case 419:
+                Notification.error({
+                    title: "页面已过期",
+                    message: response.data.message
+                });
+                location.reload();
+                break;
             default:
                 Notification.error({
                     title: "请求错误",