cloud-web-corejs 1.0.54-dev.251 → 1.0.54-dev.253

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "cloud-web-corejs",
   "private": false,
-  "version": "1.0.54-dev.251",
+  "version": "1.0.54-dev.253",
   "scripts": {
     "dev": "vue-cli-service serve",
     "lint": "eslint --ext .js,.vue src",

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

@@ -0,0 +1,301 @@
+<template>
+  <el-dialog
+    :visible.sync="showDialog"
+    v-el-drag-dialog
+    v-el-dialog-center
+    v-bind="dialogConfig"
+    @close="close"
+  >
+    <div class="cont designer-view" v-bind="bodyConfig" id="containt">
+      <component v-if="showWfContent && wfContent" :is="wfContent" visible-key="showWfContent" :outParam.sync="outParam"
+                 :_dataId.sync="dataId" :defaultShowWfContent="defaultShowWfContent" :_isOutLink="true"
+                 :parent-target="_self"
+                 @reload="$reloadHandle" v-bind="queryParam" v-on="listeners"></component>
+    </div>
+    <span slot="footer" class="dialog-footer" v-if="option.showFooter!==false" v-bind="option.footerConfig">
+			<el-button type="primary" plain class="button-sty" @click="close">
+				<i class="el-icon-close el-icon"></i>
+				{{ $t2('取 消', 'system.button.cancel2') }}
+			</el-button>
+			<el-button type="primary" @click="dialogSubmit" class="button-sty">
+				<i class="el-icon-check el-icon"></i>
+				{{ $t2('确 定', 'system.button.confirm2') }}
+			</el-button>
+		</span>
+  </el-dialog>
+</template>
+
+<script>
+
+export default {
+  // name: "vabSearchDialog",
+  components: {},
+  props: {
+    visiable: Boolean,
+    option: Object
+  },
+  mixins: [],
+  inject: ["getFormConfig"],
+
+  mounted() {
+
+  },
+  data() {
+    var that = this;
+    return {
+      showFormField: "_tt",
+      showDialog: true,
+      falseValue: false,
+      selectMulti: true,
+
+      formJson: {},
+      formData: {},
+      optionData: {},
+      showRender: false,
+      formTemplate: {},
+      /*      formCode: null,*/
+      layoutType: null,
+      conditionParam: null,
+      formInsData: null,
+      $grid: null,
+      currentLayoutType: null,
+      dataId: null,
+
+      showWfContent: true,
+      wfContent: null,
+      outParam: null,
+      // dataId: null,
+      defaultShowWfContent: null,
+      queryParam: {},
+      listeners:null
+    };
+  },
+  computed: {
+    formCode() {
+      return this.option.formCode;
+    },
+    dialogParam() {
+      return this.option?.param;
+    },
+    formConfig() {
+      return this.option?.formConfig;
+    },
+    dialogConfig() {
+      let customClass = "dialog-style list-dialog dialog-checkbox pd_0";
+      if (this.option.dialogConfig?.customClass) {
+        customClass = customClass + " " + this.option.dialogConfig.customClass
+      }
+      let config = {
+        title: this.formTemplate.formName,
+        appendToBody: true,
+        modalAppendToBody: true,
+        closeOnClickModal: false,
+        modal: false,
+        width: "1200px",
+        fullscreen: this.option.fullscreen,
+      };
+      config = Object.assign({}, config, this.option.dialogConfig, {customClass});
+      config.title = this.$t1(config.title);
+      return config;
+    },
+    bodyConfig() {
+      let config = {};
+      let classStr = this.currentLayoutType
+      if (this.option.bodyConfig?.class) {
+        classStr = classStr + " " + this.option.bodyConfig.class;
+      }
+      if (this.option.showFooter == false) {
+        classStr = classStr + " nfootBtn";
+      }
+      config = Object.assign({}, config, this.option.bodyConfig, {class: classStr});
+      return config;
+    }
+  },
+  created() {
+    /*let dataId = this.option?.formConfig?.dataId??null
+    delete this.option?.formConfig?.dataId
+    this.dataId = dataId;*/
+
+    let currentFormConfig = this.getFormConfig();
+    this.currentLayoutType = currentFormConfig.layoutType
+
+    // this.selectMulti = this.option.multiple ?? true;
+    this.initData();
+  },
+  methods: {
+    initData() {
+      const isMobile = /iPhone|iPad|iPod|Android/i.test(navigator.userAgent);
+      let queryParam = this.$baseLodash.cloneDeep(this.dialogParam);
+      let murl = queryParam.urlmobile;
+      let purl = murl && isMobile ? murl : queryParam.url;
+      let dataId = queryParam.dataId;
+      if (purl == '/index') {
+        location.hash = '/home';
+        location.reload();
+        return;
+      }
+
+      this.dataId = dataId;
+      if (queryParam.showWfContent == 'true') {
+        this.defaultShowWfContent = true;
+      }
+
+      delete queryParam.urlmobile;
+      delete queryParam.url;
+
+      if (purl.indexOf('.html') >= 0) {
+        let eUrl = purl;
+        let pstr = Object.keys(queryParam).map(key => {
+          return key + "=" + queryParam[key]
+        }).join("&")
+
+        if (pstr) {
+          if (purl.indexOf('.html?') >= 0) {
+            eUrl = eUrl + '&' + pstr
+          } else {
+            eUrl = eUrl + '?' + pstr
+          }
+        }
+
+        location.href = eUrl;
+        return
+      }
+
+      delete queryParam.dataId;
+      delete queryParam.showWfContent;
+      delete queryParam.access_token;
+      delete queryParam.tp;
+      delete queryParam.thirdparty_info;
+      delete queryParam.i18nLang;
+
+      let url = purl + '.vue';
+      this.queryParam = queryParam;
+      let listeners= this.option?.on;
+      this.listeners = listeners;
+
+      this.showWfContent = true;
+
+      let t = "@base/views";
+      let urlArr = [
+        '/user/bill_setting/h5_view.vue',
+        '/user/form/view/list.vue',
+        '/user/form/view/edit.vue'
+      ]
+
+      if (urlArr.includes(url)) {
+        this.wfContent = require('@base/views' + url).default;
+      } else if (url.startsWith(t)) {
+        let path = url.slice(t.length);
+        this.wfContent = require('@base/views' + path).default;
+      } else {
+        this.wfContent = require('@/views' + url).default;
+      }
+    },
+
+
+    reload(e, option) {
+      let updateParam = option?.updateParam || {};
+      Object.assign(this.formConfig, updateParam)
+      this.showRender = false;
+      this.getReportTemplate();
+    },
+    async getReportTemplate(callback) {
+      let param = {
+        objTypeCode: this.$attrs.objTypeCode,
+        objId: this.$attrs.objId,
+        taskId: this.$attrs.taskId
+      };
+      this.conditionParam = param;
+      let url, data;
+      url = USER_PREFIX + `/formTemplate/getByFormCode`;
+      data = {stringOne: this.formCode}
+
+      let that = this;
+      this.$http({
+        url: url,
+        method: `post`,
+        data: data,
+        isLoading: true,
+        loadingTarget: document.body,
+        modalStrictly: true,
+        success: res => {
+          let formTemplate = res.objx || {};
+          this.formTemplate = formTemplate;
+          this.formJson = formTemplate.formViewContent ? JSON.parse(formTemplate.formViewContent) : {};
+          this.layoutType = this.formJson.formConfig.layoutType
+          let formConfig = this.formJson.formConfig;
+          if (formConfig.searchDialogUniqueField) {
+            this.fieldKey = formConfig.searchDialogUniqueField;
+          }
+
+          this.showRender = true;
+
+
+        }
+      });
+    },
+    close() {
+      let formRef = this.$refs.vFormRef;
+      this.showDialog = false;
+      this.$emit('update:visiable', false);
+      this.option.close && this.option.close(formRef, this);
+    },
+    dialogSubmit() {
+      let formRef = this.$refs.vFormRef;
+      if (this.option.confirm) {
+        if (this.option.confirm(formRef, this) !== false) {
+          this.close();
+        }
+      } else {
+        this.close();
+      }
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+::v-deep .H5 .h5-fixed-bottom-btns {
+  bottom: 95px;
+}
+
+.list-dialog {
+  .el-dialog__body {
+    height: calc(100% - 42px);
+
+    .cont {
+      height: calc(100vh - 210px);
+
+      &.nfootBtn {
+        height: calc(100vh - 158px)
+      }
+
+      &#containt {
+        padding: 0;
+
+        ::v-deep .grid-container {
+          outline: none;
+
+          &.detail-wrap .d-cont {
+            height: calc(100vh - 150px);
+
+            .title .field-wrapper {
+              display: inline-block !important
+            }
+          }
+        }
+      }
+    }
+  }
+
+  &.is-fullscreen .el-dialog__body {
+    .cont {
+      height: calc(100vh - 110px);
+
+      &.nfootBtn {
+        height: calc(100vh - 58px)
+      }
+    }
+  }
+}
+</style>

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

@@ -8,7 +8,7 @@ import {
   getAccessUrl,
   generateId
 } from "../../../../../components/xform/utils/util";
-import FormValidators from "../../../../../components/xform/utils/validators";
+import FormValidators, {getRegExp} from "../../../../../components/xform/utils/validators";
 import scriptHttpMixin from "../../../../../components/xform/mixins/scriptHttp";
 import defaultHandleMixin from "../../../../../components/xform/mixins/defaultHandle";
 
@@ -245,7 +245,7 @@ modules = {
           nullValue = undefined;
         } else if (widgetType === 'checkbox' || (widgetType === 'select' && this.field.options.multiple)) {
           nullValue = [];
-        }else if(widgetType == "time-range"  || widgetType=="date-range" || (widgetType === 'date' && this.field.options.type=="dates")){
+        } else if (widgetType == "time-range" || widgetType == "date-range" || (widgetType === 'date' && this.field.options.type == "dates")) {
           nullValue = [];
         }
         if (void 0 === currentData[this.fieldKeyName]) {
@@ -701,70 +701,134 @@ modules = {
       void 0 !== this.field.options.defaultValue &&
       (this.fieldModel = this.field.options.defaultValue);
     },
-    clearFieldRules: function () {
-      this.field.formItemFlag && this.rules.splice(0, this.rules.length);
+
+    clearFieldRules() {
+      if (!this.field.formItemFlag) {
+        return
+      }
+
+      this.rules.splice(0, this.rules.length)  //清空已有
     },
-    buildFieldRules: function () {
-      var e = this;
-      if (this.field.formItemFlag) {
-        if (
-          (this.rules.splice(0, this.rules.length),
-          this.field.options.required &&
+
+    getValidateDefaultMsg(labelCode, vldName) {
+      let label = this.$t1(labelCode);
+      let map = {
+        number: "[{label}]包含非数字字符",
+        letter: "[{label}]包含非字母字符",
+        letterAndNumber: "[{label}]只能输入字母或数字",
+        mobilePhone: "[{label}]手机号码格式有误",
+        letterStartNumberIncluded: "[{label}]必须以字母开头，可包含数字",
+        noChinese: "[{label}]不可输入中文字符",
+        chinese: "[{label}]只能输入中文字符",
+        email: "[{label}]邮箱格式有误",
+        url: "[{label}]URL格式有误",
+        required: "[{label}]不能为空"
+      }
+      let result = null
+      let value = map[vldName]
+      if (!value) {
+        value = "[{label}]invalid value"
+      }
+      result = this.$t1(value, {label});
+      return result
+    },
+    getValidationHintMsg() {
+      let vldName = this.field.options.validation
+      if (this.field.options.validationHint) {
+        return this.$t1(this.field.options.validationHint)
+      } else {
+        return this.getValidateDefaultMsg(this.field.options.label, vldName)
+      }
+    },
+    getRequiredHintMsg() {
+      if (this.field.options.requiredHint) {
+        return this.$t1(this.field.options.requiredHint)
+      } else {
+        return this.getValidateDefaultMsg(this.field.options.label, "required")
+      }
+    },
+    buildFieldRules() {
+      if (!this.field.formItemFlag || this.field.options.hidden) {
+        return
+      }
+
+      this.rules.splice(0, this.rules.length)  //清空已有
+      if (!!this.field.options.required) {
+        this.rules.push({
+          required: true,
+          //trigger: ['blur', 'change'],
+          trigger: ['blur'],  /* 去掉change事件触发校验，change事件触发时formModel数据尚未更新，导致radio/checkbox必填校验出错！！ */
+          message: this.getRequiredHintMsg()
+        })
+      }
+
+      if (!!this.field.options.validation) {
+        let vldName = this.field.options.validation
+        if (!!FormValidators[vldName]) {
           this.rules.push({
-            required: !0,
-            trigger: ["blur"],
-            message:
-              this.field.options.requiredHint ||
-              this.i18nt("render.hint.fieldRequired"),
-          }),
-            this.field.options.validation)
-        ) {
-          var t = this.field.options.validation;
-          a["a"][t]
-            ? this.rules.push({
-              validator: a["a"][t],
-              trigger: ["blur", "change"],
-              label: this.field.options.label,
-              errorMsg: this.field.options.validationHint,
-            })
-            : this.rules.push({
-              validator: a["a"]["regExp"],
-              trigger: ["blur", "change"],
-              regExp: t,
-              label: this.field.options.label,
-              errorMsg: this.field.options.validationHint,
-            });
-        }
-        if (this.field.options.onValidate) {
-          var i = function (t, i, n) {
-            var o = new Function(
-              "rule",
-              "value",
-              "callback",
-              e.field.options.onValidate
-            );
-            return o.call(e, t, i, n);
-          };
+            validator: FormValidators[vldName],
+            trigger: ['blur', 'change'],
+            label: this.field.options.label,
+            // errorMsg: this.field.options.validationHint
+            errorMsg: this.getValidationHintMsg()
+          })
+        } else {
           this.rules.push({
-            validator: i,
-            trigger: ["blur", "change"],
+            validator: FormValidators['regExp'],
+            trigger: ['blur', 'change'],
+            regExp: vldName,
             label: this.field.options.label,
-          });
+            // errorMsg: this.field.options.validationHint
+            errorMsg: this.getValidationHintMsg()
+          })
         }
       }
+
+      if (!!this.field.options.onValidate) {
+        let customFn = (rule, value, callback) => {
+          let tmpFunc = new Function('rule', 'value', 'callback', this.field.options.onValidate)
+          return tmpFunc.call(this, rule, value, callback)
+        }
+        this.rules.push({
+          validator: customFn,
+          trigger: ['blur', 'change'],
+          label: this.field.options.label
+        })
+      }
     },
-    disableChangeValidate: function () {
-      this.rules &&
-      this.rules.forEach(function (e) {
-        e.trigger && e.trigger.splice(0, e.trigger.length);
-      });
+
+    /**
+     * 禁用字段值变动触发表单校验
+     */
+    disableChangeValidate() {
+      if (!this.rules) {
+        return
+      }
+
+      this.rules.forEach(rule => {
+        if (!!rule.trigger) {
+          rule.trigger.splice(0, rule.trigger.length)
+        }
+      })
     },
-    enableChangeValidate: function () {
-      this.rules &&
-      this.rules.forEach(function (e) {
-        e.trigger && (e.trigger.push("blur"), e.trigger.push("change"));
-      });
+
+    /**
+     * 启用字段值变动触发表单校验
+     */
+    enableChangeValidate() {
+      if (!this.rules) {
+        return
+      }
+
+      this.rules.forEach(rule => {
+        if (!!rule.trigger) {
+          rule.trigger.push('blur')
+          rule.trigger.push('change')
+        }
+      })
     },
+
+
     disableOptionOfList: function (e, t) {
       e &&
       e.length > 0 &&

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

@@ -1,32 +1,32 @@
 <template>
-  <el-form-item
-    :label="i18nt('designer.setting.required')"
-    v-show="showProperty()"
-  >
-    <el-switch v-model="optionModel.required"></el-switch>
+  <el-form-item :label="i18nt('designer.setting.required')">
+    <el-switch v-model="optionModel.required" @change="handleChangeEvent"></el-switch>
   </el-form-item>
 </template>
 
 <script>
-import i18n from "../../../../../components/xform/utils/i18n";
+  import i18n from "../../../../../components/xform/utils/i18n"
 
-export default {
-  name: "required-editor",
-  mixins: [i18n],
-  props: {
-    designer: Object,
-    selectedWidget: Object,
-    optionModel: Object,
-  },
-  methods: {
-    showProperty() {
-      let widgetRef = this.designer.vueInstance.getWidgetRef(
-        this.selectedWidget.options.name
-      );
-      return widgetRef?.$attrs["table-condition"] !== true;
+  export default {
+    name: "required-editor",
+    mixins: [i18n],
+    props: {
+      designer: Object,
+      selectedWidget: Object,
+      optionModel: Object,
     },
-  },
-};
+    methods: {
+      handleChangeEvent(val) {
+        const wRef = this.designer.formWidget.getSelectedWidgetRef()
+        if (wRef && wRef.setRequired) {
+          wRef.setRequired(val)
+        }
+      },
+
+    }
+  }
 </script>
 
-<style scoped></style>
+<style scoped>
+
+</style>

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

@@ -5,10 +5,10 @@
 </template>
 
 <script>
-  import i18n from "../../../../../components/xform/utils/i18n"
-  import propertyMixin from "../../../../../components/xform/form-designer/setting-panel/property-editor/propertyMixin"
+import i18n from "../../../../../components/xform/utils/i18n"
+import propertyMixin from "../../../../../components/xform/form-designer/setting-panel/property-editor/propertyMixin"
 
-  export default {
+export default {
     name: "requiredHint-editor",
     mixins: [i18n, propertyMixin],
     props: {

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

@@ -15,9 +15,9 @@
 </template>
 
 <script>
-  import i18n from "../../../../../components/xform/utils/i18n"
+import i18n from "../../../../../components/xform/utils/i18n"
 
-  export default {
+export default {
     name: "validation-editor",
     mixins: [i18n],
     props: {

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

@@ -5,9 +5,9 @@
 </template>
 
 <script>
-  import i18n from "../../../../../components/xform/utils/i18n"
+import i18n from "../../../../../components/xform/utils/i18n"
 
-  export default {
+export default {
     name: "validationHint-editor",
     mixins: [i18n],
     props: {

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

@@ -29,9 +29,9 @@ const COMMON_PROPERTIES = {
   'labelHidden': 'labelHidden-editor',
   'rows': 'rows-editor',
   'required': 'required-editor',
-  // 'requiredHint': 'requiredHint-editor',
-  // 'validation': 'validation-editor',
-  // 'validationHint': 'validationHint-editor',
+  'requiredHint': 'requiredHint-editor',
+  'validation': 'validation-editor',
+  'validationHint': 'validationHint-editor',
   'readonly': 'readonly-editor',
   'disabled': 'disabled-editor',
   'hidden': 'hidden-editor',

package/src/components/xform/form-render/index.vue

@@ -59,6 +59,7 @@
     <importDialog v-if="showImportDialog" :visiable.sync="showImportDialog" :param="importDialogOption"
                   :parentTarget="_self"></importDialog>
     <formDrawer v-if="showFormDrawer" :visiable.sync="showFormDrawer" :option="formDrawerOption"></formDrawer>
+    <fileReferenceDialog v-if="showFileReferenceDialog" :visiable.sync="showFileReferenceDialog" :option="fileReferenceDialogOption"></fileReferenceDialog>
   </div>
 </template>
 
@@ -76,7 +77,9 @@ export default {
     searchFormDialog: () => import("../../../components/xform/form-designer/form-widget/dialog/searchFormDialog.vue"),
     formDialog: () => import("../../../components/xform/form-designer/form-widget/dialog/formDialog.vue"),
     importDialog: () => import("../../../components/xform/form-designer/form-widget/dialog/importDialog.vue"),
-    formDrawer: () => import("../../../components/xform/form-designer/form-widget/dialog/formDrawer.vue")
+    formDrawer: () => import("../../../components/xform/form-designer/form-widget/dialog/formDrawer.vue"),
+    fileReferenceDialog: () => import("../../../components/xform/form-designer/form-widget/dialog/fileReferenceDialog.vue")
+
   },
   mixins: [indexMixin],
 };