Merge branch 'dev' of http://110.41.163.243:9980/kd-aiot/kd-aiot-frontend into dev

src/views/bpm/model/index.vue

@@ -233,7 +233,7 @@
       },
       /* 刷新表格 */
       reload (params) {
-        if(params.reset){
+        if(params && params.reset){
           this.$refs.table.reload({ page: 1, where: params });
         } else {
           this.$refs.table.reload({ where: params });

src/views/system/dictionary/components/dict-edit.vue

@@ -4,7 +4,7 @@
     width="800px"
     :maxable="true"
     :visible="visible"
-    :close-on-click-modal="true"
+    :close-on-click-modal="false"
     :title="isUpdate ? '修改字典' : '添加字典'"
     @update:visible="updateVisible"
   >
@@ -23,7 +23,7 @@
       style="margin-bottom: 10px"
     >
       <el-row>
-  
+
         <el-col :span="12">
           <el-form-item label="字典值:" prop="code">
             <el-input