cloud-web-corejs 1.0.54-dev.9 → 1.0.55

package/src/components/xform/form-designer/form-widget/dialog/formDialog.vue

@@ -87,6 +87,7 @@ export default {
         fullscreen: this.option.fullscreen,
       };
       config = Object.assign({}, config, this.option.dialogConfig, {customClass});
+      config.title = this.$t1(config.title);
       return config;
     },
     bodyConfig() {

package/src/components/xform/form-designer/form-widget/dialog/formDrawer.vue

@@ -81,6 +81,7 @@ export default {
         direction:"btt"
       };
       config = Object.assign({}, config, this.option.dialogConfig, {customClass});
+      config.title = this.$t1(config.title);
       return config;
     },
     bodyConfig() {

package/src/components/xform/form-designer/form-widget/dialog/formFieldDialog.vue

@@ -55,7 +55,7 @@
       </div>
     </label>
     <div class="multipleChoice">
-      <el-tooltip :enterable="false" effect="dark" content="全部删除" placement="top"><a class="allDel icon-quanbushanchu"
+      <el-tooltip :enterable="false" effect="dark" :content="$t1('全部删除')" placement="top"><a class="allDel icon-quanbushanchu"
                                                                                      @click="clearChecked()"></a>
       </el-tooltip>
       <div class="list">
@@ -66,7 +66,7 @@
       </div>
     </div>
     <span slot="footer" class="dialog-footer">
-			<span class="fl tips" v-if="!selectMulti">注：双击确认选择（单选）</span>
+			<span class="fl tips" v-if="!selectMulti">{{ $t1('注：双击确认选择（单选）') }}</span>
 			<el-button type="primary" plain class="button-sty" @click="dialogClose">
 				<i class="el-icon-close el-icon"></i>
 				{{ $t2('取 消', 'system.button.cancel2') }}

package/src/components/xform/form-designer/form-widget/dialog/preformDialog.vue

@@ -1,6 +1,6 @@
 <template>
   <el-dialog
-    title="表单提交"
+    :title="$t1('提交内容')"
     :visible.sync="showDialog"
     :modal-append-to-body="false"
     :close-on-click-modal="false"
@@ -18,7 +18,7 @@
             <th>
                 <span class="t">
                   <em class="f-red">*</em>
-                  {{ $t1('备注') }}
+                  {{ $t1('内容') }}
                 </span>
             </th>
             <td>

package/src/components/xform/form-designer/form-widget/dialog/searchFormDialog.vue

@@ -20,7 +20,7 @@
       </div>
     </label>
     <div class="multipleChoice">
-      <el-tooltip :enterable="false" effect="dark" content="全部删除" placement="top"><a
+      <el-tooltip :enterable="false" effect="dark" :content="$t1('全部删除')" placement="top"><a
         class="allDel icon-quanbushanchu"
         @click="clearChecked()"></a>
       </el-tooltip>
@@ -34,14 +34,14 @@
       </div>
     </div>
     <span slot="footer" class="dialog-footer" v-if="option.showFooter!==false" v-bind="option.footerConfig">
-			<span class="fl tips" v-if="!selectMulti">注：双击确认选择（单选）</span>
+			<span class="fl tips" v-if="!selectMulti">{{ $t1('注：双击确认选择（单选）') }}</span>
 			<el-button type="primary" plain class="button-sty" @click="close">
 				<i class="el-icon-close el-icon"></i>
-				{{ $t2('取 消', 'system.button.cancel2') }}
+				{{ $t1('取 消') }}
 			</el-button>
 			<el-button type="primary" @click="dialogSubmit" class="button-sty">
 				<i class="el-icon-check el-icon"></i>
-				{{ $t2('确 定', 'system.button.confirm2') }}
+				{{ $t1('确 定') }}
 			</el-button>
 		</span>
   </el-dialog>
@@ -130,6 +130,7 @@ export default {
         fullscreen: this.option.fullscreen,
       };
       config = Object.assign({}, config, this.option.dialogConfig, {customClass});
+      config.title = this.$t1(config.title);
       return config;
     },
     bodyConfig() {

package/src/components/xform/form-designer/form-widget/dialog/vabSearchDialog.vue

@@ -53,7 +53,7 @@
       </div>
     </label>
     <div class="multipleChoice">
-      <el-tooltip :enterable="false" effect="dark" content="全部删除" placement="top"><a class="allDel icon-quanbushanchu"
+      <el-tooltip :enterable="false" effect="dark" :content="$t1('全部删除')" placement="top"><a class="allDel icon-quanbushanchu"
                                                                                      @click="clearChecked()"></a>
       </el-tooltip>
       <div class="list">
@@ -64,7 +64,7 @@
       </div>
     </div>
     <span slot="footer" class="dialog-footer">
-			<span class="fl tips" v-if="!selectMulti">注：双击确认选择（单选）</span>
+			<span class="fl tips" v-if="!selectMulti">{{ $t1('注：双击确认选择（单选）') }}</span>
 			<el-button type="primary" plain class="button-sty" @click="dialogClose">
 				<i class="el-icon-close el-icon"></i>
 				{{ $t2('取 消', 'system.button.cancel2') }}

package/src/components/xform/form-designer/setting-panel/form-setting.vue

@@ -13,12 +13,6 @@
           <el-form-item :label="i18nt('启用流程')">
             <el-switch v-model="formConfig.wfEnabled"></el-switch>
           </el-form-item>
-          <el-form-item label="流程单据定义">
-            <a href="javascript:void(0);" class="a-link link-oneLind" @click="openWfObjConfigDialog">
-              <span>{{ wfObjConfigs.length ? '已维护' : null}}</span>
-              <i class="el-icon-edit"></i>
-            </a>
-          </el-form-item>
           <el-form-item :label="i18nt('加载详情数据')">
             <el-switch v-model="formConfig.isLoadEntity"></el-switch>
           </el-form-item>
@@ -296,8 +290,6 @@
 
     <formTemplateDialog v-if="showFormTemplateDialog" :visiable.sync="showFormTemplateDialog"
                         @confirm="confirmFormTemplate" multi="false"/>
-    <wfObjConfigDialog v-if="showWfObjConfigDialog" :visiable.sync="showWfObjConfigDialog"
-                       @confirm="confirmWfObjConfigDialog" :formTemplate="designer.vueInstance.reportTemplate"/>
   </div>
 </template>
 
@@ -305,15 +297,12 @@
 import i18n from '../../../../components/xform/utils/i18n';
 import {deepClone, insertCustomCssToHead, insertGlobalFunctionsToHtml} from '../../../../components/xform/utils/util';
 import formTemplateDialog from '../../../../views/bd/setting/form_template/dialog.vue'
-import wfObjConfigDialog from "./wfObjConfigDialog.vue";
-
 
 export default {
   name: 'form-setting',
   mixins: [i18n],
   components: {
-    formTemplateDialog,
-    wfObjConfigDialog
+    formTemplateDialog
   },
   props: {
     designer: Object,
@@ -359,9 +348,7 @@ export default {
       formScriptParam:null,
       showFormScriptParamDialog: false,
       formScriptSuccess:null,
-      showFormScriptSuccessDialog: false,
-      wfObjConfigs:[],
-      showWfObjConfigDialog:false
+      showFormScriptSuccessDialog: false
     };
   },
   created() {
@@ -382,7 +369,6 @@ export default {
       this.extractCssClass();
       this.designer.emitEvent('form-css-updated', deepClone(this.cssClassList));
     }, 1200);
-    this.getListByObjTypeCode();
   },
   methods: {
     showEventCollapse() {
@@ -559,26 +545,6 @@ export default {
       this.designer.formConfig.formScriptSuccess = this.formScriptSuccess;
       this.showFormScriptSuccessDialog = false;
     },
-    openWfObjConfigDialog(){
-      this.showWfObjConfigDialog = true;
-    },
-    confirmWfObjConfigDialog(rows){
-      this.wfObjConfigs = rows || [];
-    },
-    getListByObjTypeCode(){
-      let reportTemplate = this.designer.vueInstance.reportTemplate
-      this.$http({
-        url: `/${reportTemplate.serviceName}/wf_obj_config/listByObjTypeCode`,
-        method: `post`,
-        data:{
-          stringOne:reportTemplate.objTypeCode
-        },
-        isLoading: true,
-        success: res => {
-          this.wfObjConfigs = res.objx || [];
-        }
-      });
-    },
   }
 };
 </script>

package/src/components/xform/form-designer/setting-panel/propertyRegister.js

@@ -105,8 +105,6 @@ const COMMON_PROPERTIES = {
   'h5Card': 'h5-card-editor',
   'listH5': 'list-h5-editor',
   'formScriptEnabled': 'formScriptEnabled-editor',
-  'textFlag': 'textFlag-editor',
-  'showRuleFlag': 'showRuleFlag-editor',
 
   //弹框
   title: "title-editor",