cloud-web-corejs 1.0.54-dev.514 → 1.0.54-dev.516

package/package.json

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

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,7 @@ export default {
   },
   computed: {
     showVaule() {
-      let value = !this.field.options.autoValueEnabled
-        ? this.fieldModel
-        : this.handleCustomEvent(this.field.options.autoValueHanlde);
+      let value = this.formatterValue();
       return value;
     },
   },
@@ -92,7 +91,62 @@ 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.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.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/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>

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

@@ -82,6 +82,7 @@ const COMMON_PROPERTIES = {
   'vabSearchName': 'vabSearchName-editor',
   'copyButton': 'copyButton-editor',
   "tempStorageFlag": "tempStorage-editor",
+  'formatType': 'formatType-editor',
 
   //容器
   'showBlankRow': 'showBlankRow-editor',

package/src/components/xform/form-designer/widget-panel/widgetsConfig.js

@@ -1948,6 +1948,8 @@ export const basicFields = [
 
       autoValueEnabled: false,
       autoValueHanlde: null,
+      formatType: null,
+      renderHandle: null,
 
       showRuleFlag: 1,
       showRuleEnabled: 1,
@@ -1989,6 +1991,8 @@ export const basicFields = [
       underline: false,
       href: "",
       colorClass: "f-red",
+      formatType: null,
+      renderHandle: null,
 
       onCreated: "",
       onMounted: "",

package/src/components/xform/utils/format.js

@@ -50,8 +50,7 @@ export function formatNumber1(v) {
 	if (typeof(v) != "number") {
 		return v;
 	}
-
-	let length = v.toString().split(".")[1].length;
+  let length = getFixedSize(v);
 	switch(length){
 		case 0:
 				v = v.toFixed(0)
@@ -82,13 +81,23 @@ export function formatNumber1(v) {
 	return res;
 }
 
+function getFixedSize(v){
+  let size = 0;
+  if(v!==null && v!==undefined){
+    let arr = v.toString().split(".");
+    if(arr.length>1){
+      size = arr[1].length;
+    }
+  }
+  return size;
+}
 //###,###,###,##0.00####
 export function formatNumber2(v) {
 	if (typeof(v) != "number") {
 		return v;
 	}
 
-	let length = v.toString().split(".")[1].length;
+	let length = getFixedSize(v);
 	switch(length){
 		case 0:
 		case 1:
@@ -181,7 +190,7 @@ export function formatNumber7(v) {
 		return v;
 	}
 
-	let length = v.toString().split(".")[1].length;
+	let length = getFixedSize(v);
 	v = v*100
 	switch(length){
 		case 0:
@@ -203,3 +212,4 @@ export function formatNumber7(v) {
 		})
 	return res+'%';
 }
+

package/src/layout/components/Sidebar/default.vue

@@ -411,12 +411,13 @@ export default {
             isLoading: true,
             success: (res) => {
               path = res.objx;
+              window.open(path);
             },
           });
         } else if (path.indexOf("token={token}") >= 0) {
           path = path.replace("token={token}", "token=" + getToken());
+          window.open(path);
         }
-        window.open(path);
       }
     },
     getCustomReqUrlAndCleanUrl(url) {