cloud-web-corejs 1.0.173 → 1.0.175

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

@@ -746,6 +746,7 @@ export default {
       gantt.parse(this.tasks);
     },
     initGantt() {
+      gantt.config.tooltip = true;
       // 配置国内日期格式（示例 1：YYYY-MM-DD）
       gantt.config.date_format = "%Y-%m-%d";
 
@@ -777,6 +778,7 @@ export default {
       this.initConfig();
       // 初始化
       gantt.init(this.$refs.gantt);
+
       /* *******重点******* */
       /*
       // 数据解析

package/src/components/xform/form-designer/form-widget/field-widget/html-text-widget.vue

@@ -2,7 +2,7 @@
   <static-content-wrapper :designer="designer" :field="field" :design-state="designState"
                           :parent-widget="parentWidget" :parent-list="parentList" :index-of-parent-list="indexOfParentList"
                           :sub-form-row-index="subFormRowIndex" :sub-form-col-index="subFormColIndex" :sub-form-row-id="subFormRowId">
-    <div ref="fieldEditor" v-html="field.options.htmlContent"></div>
+    <div :class="{'designer-html-container':designState}" ref="fieldEditor" v-html="field.options.htmlContent"></div>
   </static-content-wrapper>
 </template>
 
@@ -78,5 +78,9 @@
 
 <style lang="scss" scoped>
   @import "~@/styles/global.scss"; //* static-content-wrapper已引入，还需要重复引入吗？ *//
-
+  .designer-html-container{
+        outline: 1px dashed #336699;
+        padding: 10px;
+        margin: 5px;
+  }
 </style>

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

@@ -77,6 +77,7 @@ export default {
     },
     computedStyle() {
       let displayStyle = !this.designState && this.field.options.hidden ? "none !important":this.displayStyle
+      if(!this.designState && !this.isShow)displayStyle = "none !important";
       return {display: displayStyle, height: this.heightStyle};
     },
     isShow() {
@@ -85,6 +86,15 @@ export default {
         let hasWf = this.getHasWf() || false;
         result = result && !hasWf;
       }*/
+      if(!this.designState){
+        let authCode = this.$parent.getAuthCode ? this.$parent.getAuthCode() : null
+        if(authCode){
+          let dispermissions = this.$store.getters.dispermissions;
+          if (dispermissions.includes(authCode)) {
+            result = false
+          }
+        }
+      }
       return result;
     }
 

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

@@ -20,6 +20,7 @@ import FormItemWrapper from "./form-item-wrapper";
 import emitter from "../../../../../components/xform/utils/emitter";
 import i18n from "../../../../../components/xform/utils/i18n";
 import fieldMixin from "../../../../../components/xform/form-designer/form-widget/field-widget/fieldMixin";
+import * as formatUtil from "../../../../../components/xform/utils/format.js";
 
 export default {
   name: "text-widget",
@@ -63,9 +64,10 @@ export default {
   },
   computed: {
     showVaule() {
-      let value = !this.field.options.autoValueEnabled
-        ? this.fieldModel
-        : this.handleCustomEvent(this.field.options.autoValueHanlde);
+      if (this.designState) {
+        return this.field.options.defaultValue ?? "";
+      }
+      let value = this.formatterValue();
       return value;
     },
   },
@@ -92,7 +94,66 @@ export default {
     this.unregisterFromRefList();
   },
 
-  methods: {},
+  methods: {
+    formatterValue() {
+      let formatType = this.field.options.formatType;
+      let cellValue = this.fieldModel;
+      if (formatType === null || formatType === undefined) return cellValue;
+      if (formatType)
+        switch (formatType) {
+          case "render":
+            return this.handleCustomEvent(this.field.options.renderHandle);
+            break;
+          case "money":
+            return cellValue !== null && cellValue !== undefined
+              ? cellValue.toFixed(2)
+              : "";
+            break;
+          case "d1":
+            return formatUtil.formatDate1(cellValue);
+            break;
+          case "d2":
+            return formatUtil.formatDate2(cellValue);
+            break;
+          case "d3":
+            return formatUtil.formatDate3(cellValue);
+            break;
+          case "d4":
+            return formatUtil.formatDate4(cellValue);
+            break;
+          case "d5":
+            return formatUtil.formatDate4(cellValue);
+            break;
+          case "n0":
+            return cellValue !== null && cellValue !== undefined
+              ? cellValue.toFixed(this.field.options.formatDecimal || 0)
+              : "";
+            break;
+          case "n1":
+            return formatUtil.formatNumber1(cellValue);
+            break;
+          case "n2":
+            return formatUtil.formatNumber2(cellValue);
+            break;
+          case "n3":
+            return formatUtil.formatNumber3(cellValue);
+            break;
+          case "n4":
+            return formatUtil.formatNumber4(cellValue);
+            break;
+          case "n5":
+            return formatUtil.formatNumber5(cellValue);
+            break;
+          case "n6":
+            return formatUtil.formatNumber6(cellValue);
+            break;
+          case "n7":
+            return formatUtil.formatNumber7(cellValue);
+            break;
+        }
+      return cellValue;
+    },
+  },
 };
 </script>
 

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

@@ -20,12 +20,122 @@
               placeholder="默认saveUpdatge"
             ></el-input>
           </el-form-item>
+          <el-form-item label="全局参数配置">
+            <a
+              href="javascript:void(0);"
+              class="a-link link-oneLind"
+              @click="editFormEventHandler('globalConfig')"
+            >
+              <span>{{ formConfig.globalConfig }}</span>
+              <i class="el-icon-edit"></i>
+            </a>
+          </el-form-item>
+          <el-form-item :label="i18nt('designer.setting.globalFunctions')">
+            <a
+              href="javascript:void(0);"
+              class="a-link link-oneLind"
+              @click="editGlobalFunctions"
+            >
+              <span>{{ formConfig.functions }}</span>
+              <i class="el-icon-edit"></i>
+            </a>
+          </el-form-item>
+          <el-form-item :label="i18nt('designer.setting.formCss')">
+            <el-button type="info" icon="el-icon-edit" plain round @click="editFormCss">
+              {{ i18nt("designer.setting.addCss") }}
+            </el-button>
+          </el-form-item>
+        </el-collapse-item>
+        <el-collapse-item name="2" title="详情表单信息">
+          <el-form-item :label="i18nt('加载详情数据')">
+            <el-switch v-model="formConfig.isLoadEntity"></el-switch>
+          </el-form-item>
+          <el-form-item :label="i18nt('详情数据脚本编码')">
+            <el-input
+              type="text"
+              v-model="formConfig.formScriptCode"
+              placeholder="默认getOne"
+            ></el-input>
+          </el-form-item>
+          <el-form-item :label="i18nt('详情数据脚本参数')">
+            <a
+              href="javascript:void(0);"
+              class="a-link link-oneLind"
+              @click="editFormScriptParam"
+            >
+              <span>{{ formConfig.formScriptParam }}</span>
+              <i class="el-icon-edit"></i>
+            </a>
+          </el-form-item>
+          <el-form-item :label="i18nt('详情数据脚本回调')">
+            <a
+              href="javascript:void(0);"
+              class="a-link link-oneLind"
+              @click="editFormScriptSuccess"
+            >
+              <span>{{ formConfig.formScriptSuccess }}</span>
+              <i class="el-icon-edit"></i>
+            </a>
+          </el-form-item>
+          <el-form-item :label="i18nt('查看页面表单编码')">
+            <el-input
+              class="search-input"
+              max="200"
+              v-model="formConfig.editFormCode"
+              @clear="
+                formConfig.editFormName = null;
+                $forceUpdate();
+              "
+              v-el-readonly
+              clearable
+            >
+              <i
+                slot="suffix"
+                class="el-input__icon el-icon-search"
+                @click="openFormTemplate(2)"
+              ></i>
+            </el-input>
+          </el-form-item>
+          <el-form-item :label="i18nt('查看页面表单名称')">
+            {{ formConfig.editFormName }}
+          </el-form-item>
+          <el-form-item :label="i18nt('新增页面表单编码')">
+            <el-input
+              class="search-input"
+              max="200"
+              v-model="formConfig.addFormCode"
+              @clear="
+                formConfig.addFormCode = null;
+                $forceUpdate();
+              "
+              v-el-readonly
+              clearable
+              placeholder="默认使用查看表单编码"
+            >
+              <i
+                slot="suffix"
+                class="el-input__icon el-icon-search"
+                @click="openFormTemplate(1)"
+              ></i>
+            </el-input>
+          </el-form-item>
+          <el-form-item :label="i18nt('新增页面表单名称')">
+            {{ formConfig.addFormName }}
+          </el-form-item>
+        </el-collapse-item>
+        <el-collapse-item name="3" title="流程信息">
           <el-form-item :label="i18nt('启用流程')">
             <el-switch
               v-model="formConfig.wfEnabled"
               @change="changeWfEnabled"
             ></el-switch>
           </el-form-item>
+          <el-form-item :label="i18nt('默认流程单据类型名称')">
+            <el-input
+              type="text"
+              v-model="designer.vueInstance.reportTemplate.objTypeName"
+            ></el-input>
+          </el-form-item>
           <el-form-item>
             <span slot="label"
               >流程主题
@@ -33,13 +143,6 @@
                 title="流程主题说明"
                 path="static/readme/WfSubject.txt"
               ></scriptDescriptionButton>
-              <!-- <el-tooltip effect="light">
-              <i class="el-icon-info"></i>
-              <div slot="content" style="white-space: pre-wrap;">
-                {{tip1}}
-              </div>
-
-            </el-tooltip> -->
             </span>
           </el-form-item>
           <div>
@@ -87,13 +190,6 @@
               <i class="el-icon-edit"></i>
             </a>
           </el-form-item>
-
-          <el-form-item :label="i18nt('默认流程单据类型名称')">
-            <el-input
-              type="text"
-              v-model="designer.vueInstance.reportTemplate.objTypeName"
-            ></el-input>
-          </el-form-item>
           <el-form-item :label="i18nt('引用流程的表单编码')">
             <el-input
               type="text"
@@ -110,59 +206,8 @@
               <i class="el-icon-edit"></i>
             </a>
           </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>
-          <el-form-item :label="i18nt('详情数据脚本编码')">
-            <el-input
-              type="text"
-              v-model="formConfig.formScriptCode"
-              placeholder="默认getOne"
-            ></el-input>
-          </el-form-item>
-          <el-form-item :label="i18nt('详情数据脚本参数')">
-            <a
-              href="javascript:void(0);"
-              class="a-link link-oneLind"
-              @click="editFormScriptParam"
-            >
-              <span>{{ formConfig.formScriptParam }}</span>
-              <i class="el-icon-edit"></i>
-            </a>
-          </el-form-item>
-          <el-form-item :label="i18nt('详情数据脚本回调')">
-            <a
-              href="javascript:void(0);"
-              class="a-link link-oneLind"
-              @click="editFormScriptSuccess"
-            >
-              <span>{{ formConfig.formScriptSuccess }}</span>
-              <i class="el-icon-edit"></i>
-            </a>
-          </el-form-item>
-          <el-form-item :label="i18nt('designer.setting.globalFunctions')">
-            <a
-              href="javascript:void(0);"
-              class="a-link link-oneLind"
-              @click="editGlobalFunctions"
-            >
-              <span>{{ formConfig.functions }}</span>
-              <i class="el-icon-edit"></i>
-            </a>
-          </el-form-item>
-          <el-form-item :label="i18nt('designer.setting.formCss')">
-            <el-button type="info" icon="el-icon-edit" plain round @click="editFormCss">
-              {{ i18nt("designer.setting.addCss") }}
-            </el-button>
-          </el-form-item>
         </el-collapse-item>
-        <el-collapse-item name="2" title="列表标签页信息">
+        <el-collapse-item name="4" title="列表标签页信息">
           <el-form-item :label="i18nt('列表启用详情多标签')">
             <el-switch v-model="formConfig.multiTabEnabled"></el-switch>
           </el-form-item>
@@ -170,7 +215,7 @@
             <el-input type="text" v-model="formConfig.multiTabLabelField"></el-input>
           </el-form-item>
         </el-collapse-item>
-        <el-collapse-item name="2" title="其他标签页信息">
+        <el-collapse-item name="5" title="其他标签页信息">
           <el-form-item :label="i18nt('自定义列表标签名称')">
             <el-input
               type="text"
@@ -225,55 +270,7 @@
             </div>
           </el-form-item>
         </el-collapse-item>
-
-        <el-collapse-item name="3" title="详情表单信息">
-          <el-form-item :label="i18nt('查看页面表单编码')">
-            <el-input
-              class="search-input"
-              max="200"
-              v-model="formConfig.editFormCode"
-              @clear="
-                formConfig.editFormName = null;
-                $forceUpdate();
-              "
-              v-el-readonly
-              clearable
-            >
-              <i
-                slot="suffix"
-                class="el-input__icon el-icon-search"
-                @click="openFormTemplate(2)"
-              ></i>
-            </el-input>
-          </el-form-item>
-          <el-form-item :label="i18nt('查看页面表单名称')">
-            {{ formConfig.editFormName }}
-          </el-form-item>
-          <el-form-item :label="i18nt('新增页面表单编码')">
-            <el-input
-              class="search-input"
-              max="200"
-              v-model="formConfig.addFormCode"
-              @clear="
-                formConfig.addFormCode = null;
-                $forceUpdate();
-              "
-              v-el-readonly
-              clearable
-              placeholder="默认使用查看表单编码"
-            >
-              <i
-                slot="suffix"
-                class="el-input__icon el-icon-search"
-                @click="openFormTemplate(1)"
-              ></i>
-            </el-input>
-          </el-form-item>
-          <el-form-item :label="i18nt('新增页面表单名称')">
-            {{ formConfig.addFormName }}
-          </el-form-item>
-        </el-collapse-item>
-        <el-collapse-item name="4" title="查询弹框展示信息">
+        <el-collapse-item name="6" title="查询弹框展示信息">
           <el-form-item :label="i18nt('展示字段')">
             <el-input
               class="search-input"
@@ -296,7 +293,7 @@
 
         <el-collapse-item
           v-if="showEventCollapse()"
-          name="2"
+          name="7"
           :title="i18nt('designer.setting.eventSetting')"
         >
           <!--          <el-form-item label="onBeforeCreated" label-width="150px">
@@ -316,6 +313,16 @@
               <i class="el-icon-edit"></i>
             </a>
           </el-form-item>
+          <el-form-item label="onFormBeforeMounted" label-width="150px">
+            <a
+              href="javascript:void(0);"
+              class="a-link link-oneLind"
+              @click="editFormEventHandler('onFormBeforeMounted')"
+            >
+              <span>{{ formConfig.onFormBeforeMounted }}</span>
+              <i class="el-icon-edit"></i>
+            </a>
+          </el-form-item>
           <el-form-item label="onFormMounted" label-width="150px">
             <a
               href="javascript:void(0);"
@@ -876,6 +883,7 @@ import {
 import formTemplateDialog from "../../../../views/bd/setting/form_template/dialog.vue";
 import wfObjConfigDialog from "./wfObjConfigDialog.vue";
 import bdCompanyEnvDialog from "@base/views/bd/setting/bd_company_env/dialog";
+import Draggable from "vuedraggable";
 
 export default {
   name: "form-setting",
@@ -884,6 +892,7 @@ export default {
     formTemplateDialog,
     wfObjConfigDialog,
     bdCompanyEnvDialog,
+    Draggable,
   },
   props: {
     designer: Object,
@@ -894,7 +903,7 @@ export default {
     return {
       designerConfig: this.getDesignerConfig(),
 
-      formActiveCollapseNames: ["1", "2"],
+      formActiveCollapseNames: ["1", "2", "7"],
 
       formSizes: [
         { label: "default", value: "" },
@@ -918,10 +927,12 @@ export default {
       eventParamsMap: {
         onBeforeCreated: "onBeforeCreated(dataId,formCode,done) {",
         onFormCreated: "onFormCreated(dataId,formCode) {",
+        onFormBeforeMounted: "onFormBeforeMounted(dataId,formCode, done) {",
         onFormMounted: "onFormMounted(dataId,formCode) {",
         onFormDataChange:
           "onFormDataChange(fieldName, newValue, oldValue, formModel, subFormName, subFormRowIndex) {",
         wfConfig: "wfConfig(dataId, formCode, formData) {",
+        globalConfig: "globalConfig(dataId, formCode) {",
         //'onFormValidate':     'onFormValidate() {',
       },
       showVabsearchConfigDialog: false,
@@ -944,6 +955,8 @@ export default {
       showBdCompanyEnvDialog1: false,
       showBdCompanyEnvDialog2: false,
 
+      globalConfigParams: ["dataId", "formCode"],
+
       tip1: `流程主题表达式设置说明。
 
 1、可使用参数：

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

@@ -1,5 +1,5 @@
 <template>
-  <div>
+  <div v-show="false">
     <el-form-item :label="i18nt('启用动态值显示')">
       <el-switch v-model="optionModel.autoValueEnabled"></el-switch>
     </el-form-item>

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

@@ -0,0 +1,137 @@
+<template>
+  <div>
+    <el-form-item label="格式化"> </el-form-item>
+    <el-form-item label-width="0">
+      <el-select v-model="optionModel.formatType" clearable style="width: 100%">
+        <el-option-group v-for="t in op" :key="t.label" :label="t.label">
+          <el-option
+            v-for="e in t.options"
+            :key="e.value"
+            :value="e.value"
+            :label="e.label"
+          ></el-option>
+        </el-option-group>
+      </el-select>
+    </el-form-item>
+
+    <el-form-item
+      :label="i18nt('自定义渲染处理')"
+      v-if="optionModel.formatType === 'render'"
+    >
+      <a
+        href="javascript:void(0);"
+        class="a-link link-oneLind"
+        @click="editEventHandler('renderHandle', funConfigParams)"
+      >
+        <span>{{ optionModel.renderHandle }}</span>
+        <i class="el-icon-edit"></i>
+      </a>
+    </el-form-item>
+    <el-form-item :label="i18nt('格式化小数位')" v-if="optionModel.formatType === 'n0'">
+      <el-input-number v-model="optionModel.formatDecimal" />
+    </el-form-item>
+  </div>
+</template>
+
+<script>
+import i18n from "../../../../../components/xform/utils/i18n";
+import eventMixin from "./event-handler/eventMixin";
+export default {
+  name: "formatType-editor",
+  mixins: [i18n, eventMixin],
+  props: {
+    designer: Object,
+    selectedWidget: Object,
+    optionModel: Object,
+  },
+  data() {
+    return {
+      funConfigParams: ["dataId", "formCode"],
+      op: [
+        {
+          label: "自定义",
+          options: [
+            {
+              value: "render",
+              label: "自定义渲染",
+            },
+          ],
+        },
+        {
+          label: "业务",
+          options: [
+            {
+              value: "money",
+              label: "金额",
+            },
+          ],
+        },
+        {
+          label: "日期",
+          options: [
+            {
+              value: "d1",
+              label: "yyyy-MM-dd",
+            },
+            {
+              value: "d2",
+              label: "yyyy/MM/dd",
+            },
+            {
+              value: "d3",
+              label: "yyyy年MM月dd日",
+            },
+            {
+              value: "d4",
+              label: "yyyy-MM-dd HH:mm:ss",
+            },
+            {
+              value: "d5",
+              label: "yyyy-MM-dd hh:mm:ss",
+            },
+          ],
+        },
+        {
+          label: "数值",
+          options: [
+            {
+              value: "n0",
+              label: "自定义小数位",
+            },
+            {
+              value: "n1",
+              label: "###,###,###,##0.######",
+            },
+            {
+              value: "n2",
+              label: "###,###,###,##0.00####",
+            },
+            {
+              value: "n3",
+              label: "###,###,###,##0.000000",
+            },
+            {
+              value: "n4",
+              label: "###,###,###,##0.000",
+            },
+            {
+              value: "n5",
+              label: "###,###,###,##0.00",
+            },
+            {
+              value: "n6",
+              label: "###,###,###,##0",
+            },
+            {
+              value: "n7",
+              label: "###,##0.00##%",
+            },
+          ],
+        },
+      ],
+    };
+  },
+};
+</script>
+
+<style scoped></style>