cloud-web-corejs 1.0.235 → 1.0.237

package/package.json

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

package/src/utils/vab.js

@@ -7,11 +7,11 @@ function reqImg(a) {
 
 import request from "./request";
 import * as lodash from "lodash";
-import {Loading, Message, MessageBox, Notification, Form} from "element-ui";
+import { Loading, Message, MessageBox, Notification, Form } from "element-ui";
 import store from "../store";
 import ElImageViewer from "../components/VabUpload/image-viewer";
 
-import {getToken} from "./auth";
+import { getToken } from "./auth";
 import XEUtils from "xe-utils";
 
 import prefixConfig from "@/prefixConfig.js";
@@ -61,10 +61,14 @@ install = (Vue, opts = {}) => {
     if (opts.addCreateInfo === null || opts.addCreateInfo === undefined) {
       option.addCreateInfo = defaultOption.addCreateInfo;
     }
-    if (opts.queryCreateInfo === null || opts.queryCreateInfo === undefined || opts.queryCreateInfo === true) {
+    if (
+      opts.queryCreateInfo === null ||
+      opts.queryCreateInfo === undefined ||
+      opts.queryCreateInfo === true
+    ) {
       option.queryCreateInfo = defaultOption.queryCreateInfo;
     }
-    if(opts.queryCreateInfo === false){
+    if (opts.queryCreateInfo === false) {
       option.queryCreateInfo = "0";
     }
     return this.$http(option);
@@ -142,7 +146,7 @@ install = (Vue, opts = {}) => {
     return loading;
   };
   /* 全局Message */
-  Vue.prototype.$baseMessage = ({message, type, onClose}) => {
+  Vue.prototype.$baseMessage = ({ message, type, onClose }) => {
     imFun.Message({
       offset: 60,
       showClose: true,
@@ -326,6 +330,7 @@ install = (Vue, opts = {}) => {
     "webp",
     "tga",
     "svg",
+    "vue",
   ];
   Vue.prototype.$commonFileUtil = {
     // 文件类型获取与判断接口
@@ -369,7 +374,7 @@ install = (Vue, opts = {}) => {
         gif: true,
         bmp: true,
         mpg: true,
-        webp: true
+        webp: true,
       };
 
       let type = fileTypeMap[suffix];
@@ -503,12 +508,12 @@ install = (Vue, opts = {}) => {
       return true;
     },
     isPictureFile: function (fileName) {
-      if(!fileName)return false;
+      if (!fileName) return false;
       let typeStr = Object.prototype.toString.call(fileName);
-      let suffix = null
+      let suffix = null;
       if (typeStr === "[object Object]") {
         suffix = this.getFileSuffix(fileName.name);
-      }else{
+      } else {
         suffix = this.getFileSuffix(fileName);
       }
       return this.isPicture(suffix);
@@ -634,17 +639,17 @@ install = (Vue, opts = {}) => {
       return iconType;
     },
     getFileExtension(urlString) {
-      if(!urlString)return null
+      if (!urlString) return null;
       const url = new URL(urlString);
       // 获取路径部分，例如 "/images/photo.jpg"
       const pathname = url.pathname;
 
       // 使用 lastIndexOf 找到最后一个点的位置
-      const lastDotIndex = pathname.lastIndexOf('.');
+      const lastDotIndex = pathname.lastIndexOf(".");
 
       // 如果没有点，或者点在最后一位（即没有后缀），返回空字符串
       if (lastDotIndex === -1 || lastDotIndex === pathname.length - 1) {
-        return '';
+        return "";
       }
 
       // 截取点之后的部分
@@ -670,7 +675,7 @@ install = (Vue, opts = {}) => {
         }
         if (name) {
           let fileSuffix = this.getFileExtension(filePath);
-          if(fileSuffix && !name.endsWith("."+fileSuffix)){
+          if (fileSuffix && !name.endsWith("." + fileSuffix)) {
             name = name + "." + fileSuffix;
           }
 
@@ -835,7 +840,12 @@ install = (Vue, opts = {}) => {
     let parentTarget = target.$attrs["parent-target"] || target.$parent;
     let originTarget = parentTarget.$refs._viewDialog ? parentTarget : target;
     let updateParam =
-      param !== null && param !== undefined && param.updateParam !== null && param.updateParam !== undefined ? param.updateParam : {};
+      param !== null &&
+      param !== undefined &&
+      param.updateParam !== null &&
+      param.updateParam !== undefined
+        ? param.updateParam
+        : {};
     for (let key in updateParam) {
       originTarget.$emit("update:" + key, updateParam[key]);
     }
@@ -932,7 +942,6 @@ install = (Vue, opts = {}) => {
   Vue.prototype.$baseMul = baseMul;
   Vue.prototype.$baseDiv = baseDiv;
 
-
   /**
    * 格式化数字为带千分位的字符串。
    *
@@ -957,25 +966,25 @@ install = (Vue, opts = {}) => {
    * formatNumber(1000, { fixed: true, digits: 0 });   // "1,000"
    */
   function formatNumber(value, options = {}) {
-    if (value === null || value === undefined || value === '') {
-      return '';
+    if (value === null || value === undefined || value === "") {
+      return "";
     }
 
     const {
       fixed = false,
       digits = 2,
-      thousandsSeparator = ',',
-      decimalSeparator = '.'
+      thousandsSeparator = ",",
+      decimalSeparator = ".",
     } = options;
 
-    const isNumber = typeof value === 'number';
+    const isNumber = typeof value === "number";
     let str = String(value).trim();
 
     // Normalize ".123" → "0.123"
     if (str.charCodeAt(0) === 46) {
-      str = '0' + str;
-    } else if (str.startsWith('-.')) {
-      str = '-0.' + str.slice(2);
+      str = "0" + str;
+    } else if (str.startsWith("-.")) {
+      str = "-0." + str.slice(2);
     }
 
     let intPart, decPart, isNegative;
@@ -986,9 +995,9 @@ install = (Vue, opts = {}) => {
       if (num !== num) return str;
 
       const fixedStr = num.toFixed(digits);
-      const dotIndex = fixedStr.indexOf('.');
+      const dotIndex = fixedStr.indexOf(".");
       intPart = dotIndex === -1 ? fixedStr : fixedStr.slice(0, dotIndex);
-      decPart = dotIndex === -1 ? '' : fixedStr.slice(dotIndex + 1);
+      decPart = dotIndex === -1 ? "" : fixedStr.slice(dotIndex + 1);
       isNegative = intPart.charCodeAt(0) === 45;
       if (isNegative) intPart = intPart.slice(1);
     } else {
@@ -997,18 +1006,18 @@ install = (Vue, opts = {}) => {
       isNegative = s.charCodeAt(0) === 45;
       if (isNegative) s = s.slice(1);
 
-      const dotIndex = s.indexOf('.');
+      const dotIndex = s.indexOf(".");
       intPart = dotIndex === -1 ? s : s.slice(0, dotIndex);
-      decPart = dotIndex === -1 ? '' : s.slice(dotIndex + 1);
+      decPart = dotIndex === -1 ? "" : s.slice(dotIndex + 1);
 
-      if (intPart === '') intPart = '0';
+      if (intPart === "") intPart = "0";
       if (!/^\d+$/.test(intPart)) return str;
     }
 
     // 千分位（始终应用）
     let fmtInt = intPart;
-    if (intPart !== '0') {
-      let out = '';
+    if (intPart !== "0") {
+      let out = "";
       for (let i = intPart.length - 1, c = 0; i >= 0; i--, c++) {
         if (c > 0 && c % 3 === 0) out = thousandsSeparator + out;
         out = intPart[i] + out;
@@ -1017,11 +1026,11 @@ install = (Vue, opts = {}) => {
     }
 
     // 拼接
-    let result = isNegative ? '-' + fmtInt : fmtInt;
+    let result = isNegative ? "-" + fmtInt : fmtInt;
     if (decPart) {
       result += decimalSeparator + decPart;
     } else if (fixed && digits > 0) {
-      result += decimalSeparator + '0'.repeat(digits);
+      result += decimalSeparator + "0".repeat(digits);
     }
 
     return result;
@@ -1037,18 +1046,23 @@ install = (Vue, opts = {}) => {
     crypto.getRandomValues(buf);
     buf[6] = (buf[6] & 0x0f) | 0x40; // version 4
     buf[8] = (buf[8] & 0x3f) | 0x80; // variant RFC4122
-    const hex = Array.from(buf, b => b.toString(16).padStart(2, '0')).join('');
-    return `${hex.slice(0,8)}-${hex.slice(8,12)}-${hex.slice(12,16)}-${hex.slice(16,20)}-${hex.slice(20)}`;
+    const hex = Array.from(buf, (b) => b.toString(16).padStart(2, "0")).join(
+      ""
+    );
+    return `${hex.slice(0, 8)}-${hex.slice(8, 12)}-${hex.slice(
+      12,
+      16
+    )}-${hex.slice(16, 20)}-${hex.slice(20)}`;
   }
   Vue.prototype.$generateUUID = generateUUID;
 
   //数字精确位数
   Vue.prototype.$currency = function (value, priceScale, priceRoundType) {
-    if (value !== null  && value  !== undefined) {
-      if (priceScale === null  || priceScale  === undefined) {
+    if (value !== null && value !== undefined) {
+      if (priceScale === null || priceScale === undefined) {
         priceScale = 2;
       }
-      if (priceRoundType === null  || priceRoundType  === undefined) {
+      if (priceRoundType === null || priceRoundType === undefined) {
         priceRoundType = "roundHalfUp";
       }
       let price;
@@ -1087,24 +1101,24 @@ install = (Vue, opts = {}) => {
       success: (res) => {
         let dicts = res.objx || [];
         let dictMap = {};
-        for(let item of dicts){
+        for (let item of dicts) {
           dictMap[item.sn] = item.value;
         }
         /* dicts.forEach((item) => {
           dictMap[item.sn] = item.value;
         }); */
         option.success &&
-        option.success({
-          dicts,
-          dictMap,
-        });
+          option.success({
+            dicts,
+            dictMap,
+          });
       },
     });
   };
 
   imFun.Form.methods.$baseValidate = function (callback, opt) {
     let that = this;
-    that.validate((valid, obj,c,d) => {
+    that.validate((valid, obj, c, d) => {
       if (!valid && (!opt || opt.errorTip !== false)) {
         this.$message({
           message: this.$t2("必填项不能为空", "system.message.required"),
@@ -1120,8 +1134,8 @@ install = (Vue, opts = {}) => {
   function scrollToFirstError(formTarget) {
     // 获取第一个验证失败的字段
     // let formTarget = this.$refs['renderForm'];
-    const firstErrorField = Object.keys(formTarget.fields).find(key => {
-      return formTarget.fields[key].validateState === 'error';
+    const firstErrorField = Object.keys(formTarget.fields).find((key) => {
+      return formTarget.fields[key].validateState === "error";
     });
 
     if (firstErrorField) {
@@ -1131,19 +1145,18 @@ install = (Vue, opts = {}) => {
       if (dom) {
         // 滚动到该字段位置
         dom.scrollIntoView({
-          behavior: 'smooth',
-          block: 'center'
+          behavior: "smooth",
+          block: "center",
         });
 
         // 添加高亮效果
-        dom.classList.add('highlight');
+        dom.classList.add("highlight");
 
         // 3秒后移除高亮效果
         setTimeout(() => {
-          dom.classList.remove('highlight');
+          dom.classList.remove("highlight");
         }, 3000);
       }
-
     }
   }
 
@@ -1184,7 +1197,7 @@ install = (Vue, opts = {}) => {
       });
     };
     getDownloadDomian((domain) => {
-      if(fileName){
+      if (fileName) {
         fileWhole.fileName = fileName;
       }
       that.$http({
@@ -1223,13 +1236,16 @@ install = (Vue, opts = {}) => {
     let lang = that.$i18n.locale;
     const i18n = that.$i18n;
     if (lang === "zh") {
-      let val = i18n._t(path, lang, {zh: {[path]: path}}, null, values);
+      let val = i18n._t(path, lang, { zh: { [path]: path } }, null, values);
       return val;
     } else {
-      if(!i18n.te(path)){
-        return i18n._t(path, lang, {zh: {[path]: path}}, null, values);
-      }else{
-        return i18n.t(path, values) || i18n._t(path, lang, {zh: {[path]: path}}, null, values);
+      if (!i18n.te(path)) {
+        return i18n._t(path, lang, { zh: { [path]: path } }, null, values);
+      } else {
+        return (
+          i18n.t(path, values) ||
+          i18n._t(path, lang, { zh: { [path]: path } }, null, values)
+        );
       }
     }
   };
@@ -1250,9 +1266,9 @@ install = (Vue, opts = {}) => {
   };
 
   Vue.prototype.$utcToLocal = function (utcTime) {
-    if(!utcTime)return utcTime;
-    let offsetHours = this.$store.getters.utcTransformOffset;// 时区偏移量，单位：小时
-    if(!offsetHours || offsetHours === 0)return utcTime;
+    if (!utcTime) return utcTime;
+    let offsetHours = this.$store.getters.utcTransformOffset; // 时区偏移量，单位：小时
+    if (!offsetHours || offsetHours === 0) return utcTime;
     let localTime = moment(utcTime).add(offsetHours, "hours");
     return localTime.format("YYYY-MM-DD HH:mm:ss");
   };

package/src/views/user/form/view/edit.vue

@@ -1,5 +1,5 @@
 <template>
-  <vFormRender :formCode="formCode" :dataId.sync="dataId"
+  <vFormRender :formCode="formCode" :dataId.sync="dataId" :param="param"
                v-if="showEdit" visible-key="showEdit" :parent-target="_self"
                @reload="$reloadHandle"></vFormRender>
 </template>
@@ -14,15 +14,33 @@ export default {
       formCode: null,
       dataId: null,
       showEdit: false,
+      param: {},
     }
   },
   created() {
     this.init()
   },
   methods: {
+    parseViewParam() {
+      let param = {};
+      let rawParam = this.$attrs.param ?? this.$route.query.param;
+      if (rawParam) {
+        if (typeof rawParam === "string") {
+          try {
+            param = JSON.parse(rawParam) || {};
+          } catch (e) {
+            param = {};
+          }
+        } else if (typeof rawParam === "object") {
+          param = { ...rawParam };
+        }
+      }
+      return param;
+    },
     init() {
       let formCode = this.$route.query.formCode || this.$attrs.formCode;
       let dataId = this.$route.query.dataId || this.$attrs.dataId || this.$attrs._dataId;
+      this.param = this.parseViewParam();
 
       if (dataId && formCode) {
         this.formCode = formCode;

package/src/views/user/form/view/list.vue

@@ -1,7 +1,12 @@
 <template>
   <div id="containt">
     <template v-if="layoutType == 'PC'">
-      <x-tabs ref="xTabs" v-model="activeName" class="tab-box" :tabNameEnable="true">
+      <x-tabs
+        ref="xTabs"
+        v-model="activeName"
+        class="tab-box"
+        :tabNameEnable="true"
+      >
         <el-tab-pane :label="$t2('常规')" name="first">
           <vFormRender
             ref="edit"
@@ -17,11 +22,15 @@
             @openCopyEditTab="openCopyEditTab"
           ></vFormRender>
         </el-tab-pane>
-        <el-tab-pane :label="$t2(formConfig.customListTabLabel || '列表')" name="second">
+        <el-tab-pane
+          :label="$t2(formConfig.customListTabLabel || '列表')"
+          name="second"
+        >
           <div class="grid-height">
             <vFormRender
               ref="list"
               :formCode="formCode"
+              :param="param"
               style="height: 100%"
               v-if="showRender"
               visible-key="showRender"
@@ -97,8 +106,9 @@
       >
         <div class="cont" style="height: calc(100vh - 73px)">
           <vFormRender
-            :formCode="formCode2"
+            :formCode="formCode1"
             :dataId.sync="dataId"
+            :param="param"
             v-if="showEditDialog && showEdit"
             visible-key="showEdit"
             :parent-target="_self"
@@ -108,6 +118,7 @@
       </el-dialog>
       <vFormRender
         :formCode="formCode"
+        :param="param"
         style="height: 100%"
         v-if="showRender"
         visible-key="showRender"
@@ -159,6 +170,7 @@ export default {
         let num = Number(val.substring("otherTab".length));
         this.otherTabList[num].showContent = true;
       }
+      this.handleTabChange(val);
     },
   },
   created() {
@@ -171,11 +183,37 @@ export default {
     };
   },
   methods: {
+    handleTabChange(tabName) {
+      if (tabName == "second") {
+        this.$refs.list.dataTableSearch();
+      } else if (tabName.startsWith("otherTab")) {
+        let refName = tabName.replace("otherTab", "list");
+        if (this.$refs[refName]?.length)
+          this.$refs[refName][0].dataTableSearch();
+      }
+    },
+    parseViewParam() {
+      let param = {};
+      let rawParam = this.$attrs.param ?? this.$route.query.param;
+      if (rawParam) {
+        if (typeof rawParam === "string") {
+          try {
+            param = JSON.parse(rawParam) || {};
+          } catch (e) {
+            param = {};
+          }
+        } else if (typeof rawParam === "object") {
+          param = { ...rawParam };
+        }
+      }
+      return param;
+    },
     initParam() {
       let path = this.$route.path;
-      let param = path.split("/").reverse();
+      let pathSegments = path.split("/").reverse();
 
-      this.formCode = this.$attrs.formCode || param[0];
+      this.formCode = this.$attrs.formCode || pathSegments[0];
+      this.param = this.parseViewParam();
       this.showRender = true;
     },
     getReportTemplate() {
@@ -211,7 +249,9 @@ export default {
     openOtherTab(row, param, option) {
       let dataId = row && row.id ? row.id : null;
       let formCode = option.formCode;
-      let otherTab = this.otherTabList.find((item) => item.formCode == formCode);
+      let otherTab = this.otherTabList.find(
+        (item) => item.formCode == formCode
+      );
       let otherTabIndex = this.otherTabList.findIndex(
         (item) => item.formCode == formCode
       );
@@ -227,21 +267,26 @@ export default {
       });
     },
     openEditDialog(row, param, option) {
+      debugger;
       if (option?.otherTab) {
         this.openOtherTab(row, param, option);
         return;
       }
       if (this.layoutType == "H5") {
-        this.openEditH5Dialog(row);
+        this.openEditH5Dialog(row, param);
         return;
       }
       let formConfig = this.formJson.formConfig;
-      let tabLabelField = option?.multiTabLabelField || formConfig.multiTabLabelField;
+      let tabLabelField =
+        option?.multiTabLabelField || formConfig.multiTabLabelField;
       let multiTabEnabled = false;
       if (tabLabelField) {
         if (option?.multiTabEnabled) {
           multiTabEnabled = true;
-        } else if (formConfig.multiTabEnabled && option?.multiTabEnabled !== false) {
+        } else if (
+          formConfig.multiTabEnabled &&
+          option?.multiTabEnabled !== false
+        ) {
           multiTabEnabled = true;
         }
       }
@@ -275,9 +320,11 @@ export default {
     openEditDialog1(row, param, option) {
       this.openEditDialog(row, param, { multiTabEnabled: false, ...option });
     },
-    openEditH5Dialog(row) {
+    openEditH5Dialog(row, param) {
+      debugger;
       this.formCode1 = this.addFormCode;
       this.dataId = row && row.id ? row.id : null;
+      this.param = param;
       this.activeName = "first";
       this.showEdit = false;
       this.showEditDialog = true;