Merge branch 'lang_dev' of http://8.136.199.33:3000/eta_front/eta_front into lang_dev

src/lang/modules/SandboxManage/SandList.js

@@ -16,10 +16,13 @@ export const SandListEn = {
     parent_dir:'Parent directory',
     catalog_name:'Catalog name',
     catalog_name_placeholder:'Please enter the catalog name',
+    catalog_variety_placeholder:'Please select variety',
     associated_variety:'Associated variety',
     logic_diagram_name:"Logic diagram's name",
     delete_attention_msg1:'Logic diagrams exist under this category and cannot be deleted',
     delete_attention_msg2:'Are you sure to delete current category?',
+    add_diagram_msg01:"Please fill in the logic diagram's name",
+    select_categories_msg:'Please select category',
   };
   
   /* 中文 */
@@ -36,10 +39,14 @@ export const SandListEn = {
     parent_dir:'上级目录',
     catalog_name:'目录名称',
     catalog_name_placeholder:'请输入目录名称',
+    catalog_variety_placeholder:'请选择对应品种',
     associated_variety:'关联品种',
     logic_diagram_name:"逻辑图名称",
     delete_attention_msg1:'该分类下存在沙盘图，不可删除',
     delete_attention_msg2:'确定删除当前分类吗?',
+    add_diagram_msg01:'请填写逻辑图名称',
+    select_categories_msg:'请选择所属分类',
+
   };
   
   /**

src/views/sandbox_manage/index_new_version.vue

@@ -138,7 +138,7 @@
 							:options="classifyArr"
 							:props="classifyProps"
 							v-model="classifyForm.ChartPermissionId" 
-							placeholder="请选择对应品种" 
+							:placeholder="this.$t('SandboxManage.SandList.catalog_variety_placeholder')" 
               id="classifyAddCascader"
               ref="chartPermissionCascader"
               :disabled="(classifyForm.SandboxClassifyId && classifyForm.Level!=1) || (!classifyForm.SandboxClassifyId && classifyForm.Level!=0)"
@@ -302,7 +302,7 @@ import { myGraph } from './common/gragh';
         },
         classifyFormRules:{
           SandboxClassifyName:{required: true, message:this.$t('SandboxManage.SandList.catalog_name_placeholder')||'请输入目录名称', trigger: 'blur'},
-          ChartPermissionId:{required: true, message:'请选择对应品种', trigger: 'change'}
+          ChartPermissionId:{required: true, message:this.$t('SandboxManage.SandList.catalog_variety_placeholder')||'请选择对应品种', trigger: 'change'}
         },
         classifyProps: {
           children: 'Items',
@@ -873,7 +873,7 @@ import { myGraph } from './common/gragh';
             });
           }else {
             this.lockLoding && this.lockLoding.close();
-            this.$message.warning('当前协议暂不支持，仅支持https协议')
+            this.$message.warning(this.$t('MsgPrompt.http_not_support')||'当前协议暂不支持，仅支持https协议')
           }
         }
       },500),
@@ -1243,6 +1243,7 @@ import { myGraph } from './common/gragh';
       border-bottom: solid 1px #DCDFE6;
       box-shadow: 0px 2px 12px 0px rgba($color: #000000, $alpha: 0.08);
       display: flex;
+      flex-wrap: wrap;
       align-items: center;
       justify-content: space-between;
     }

src/views/sandbox_manage/sandFlowNew/index.vue

@@ -923,9 +923,9 @@ import addLInkDia from './components/addLInkDia.vue';
       },500),
       saveChart: _.debounce(function(callback=null) {
         if(!this.sandSaveParams.Name) 
-          return this.$message.warning('请填写逻辑图名称');
+          return this.$message.warning(this.$t('SandboxManage.SandList.add_diagram_msg01'));
         if(!this.sandSaveParams.SandboxClassifyId) 
-          return this.$message.warning('请选择所属分类');
+          return this.$message.warning(this.$t('SandboxManage.SandList.select_categories_msg'));
 
         if(!this.graph.toJSON().cells.length) return this.$message.warning('请绘制画布内容');