cloud-web-corejs 1.0.54-dev.327 → 1.0.54-dev.329

package/src/components/xform/form-designer/form-widget/field-widget/fieldMixin.js

@@ -17,8 +17,10 @@ import {
   fieldIsUsedInFormula, calculateFormula, recalculateFormulaOnSubFormRowDelete,
 } from '@base/components/xform/utils/formula-util'
 import * as formulajs from '@formulajs/formulajs'
+import settingConfig from "@/settings.js";
 
 let modules = {};
+const isDev = process.env.NODE_ENV === "development";
 const baseRefUtil = {
   deepClone,
   translateOptionItems,
@@ -463,11 +465,24 @@ modules = {
           ...eventParamNames,
           funtionStr
         );
-        return e.call(
-          this,
-          ...eventParam.eventParamValues,
-          ...eventParamValues
-        );
+        let that = this;
+        try{
+          return e.call(
+            this,
+            ...eventParam.eventParamValues,
+            ...eventParamValues
+          );
+        }catch(error){
+          if(settingConfig.fontErrorTipEnabled){
+            that.$errorMsg({
+              rmid: that.$t1("前端脚本异常"),
+              content: error.message,
+              type: 'error',
+              _errorMsg: error.stack
+            })
+          }
+          throw error;
+        }
       }
     },
     handleOnCreated: function () {

package/src/components/xform/form-designer/form-widget/field-widget/form-item-wrapper.vue

@@ -12,7 +12,7 @@
   <div class="field-wrapper" :class="{'design-time-bottom-margin': !!this.designer}"
        v-show="!field.options.hidden || (designState === true)">
     <div>
-      <template v-if="formItemProp=='false'">
+      <template v-if="formItemProp==='false'">
         <template v-if="!field.options.hidden">
           <template v-if="isShowWidget()">
             <slot></slot>
@@ -39,7 +39,7 @@
         <el-form-item v-if="!!field.formItemFlag && (!field.options.hidden || (designState === true))"
                       :label="label" :label-width="labelWidth"
                       :title="field.options.labelTooltip"
-                      :rules="rules" :prop="getPropName()"
+                      :rules="getRules()" :prop="getPropName()"
                       :class="[selected ? 'selected' : '', labelAlign, customClass, field.options.required ? 'required' : '']"
                       @click.native.stop="selectField(field)">
 
@@ -211,6 +211,10 @@ export default {
   created() {
     //
     this.initShowType();
+    /* let propName = this.formItemProp;
+    if(propName){
+      debugger
+    } */
   },
   methods: {
     isSubFormItem() {
@@ -277,13 +281,24 @@ export default {
         })
       }
     },
-
+    getIsFormItemUnabled(){
+      return this.field.type == "vabUpload" || this.field.type == "baseAttachment"
+    },
+    getRules(){
+      if(this.getIsFormItemUnabled()){
+        return null
+      }
+      return this.rules;
+    },
     getPropName() {
+      if(this.getIsFormItemUnabled()){
+        return null
+      }
       if (this.formItemProp) {
         return this.formItemProp;
       }
       let o = this.field.options.name;
-      return (
+      let propName = (
         (o
           = (this.field.options.keyNameEnabled
             && this.field.options.keyName)
@@ -298,6 +313,11 @@ export default {
               ? this.getObjectName() + "." + o
               : o
       );
+      /* if(this.$parent.tableParam){
+          debugger
+        } */
+
+      return propName
     },
     getI18nLabel(label, path, param) {
       return !this.designState && label ? this.$t2(label, path, param) : label;

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

@@ -13,7 +13,7 @@
           name="1"
           :title="i18nt('designer.setting.basicSetting')"
         >
-          <el-form-item :label="i18nt('实体表')">
+          <el-form-item :label="i18nt('数据库表')">
             <el-input type="text" v-model="formConfig.entity"></el-input>
           </el-form-item>
           <el-form-item :label="i18nt('数据保存脚本编码')">