cloud-web-corejs 1.0.219 → 1.0.220

package/src/components/xform/form-render/container-item/data-table-mixin.js

@@ -359,8 +359,8 @@ modules = {
     },
 
     getWidgetRefByTableParam(tableParam) {
-      // let params = tableParam.column.params;
-      // let name = params.widget.options.name;
+      let params = tableParam.column.params;
+      let name = params.widget.options.name;
       // let key = this.getRowRefKey(tableParam.row, name);
       return this.getWidgetRefByTableRowData(tableParam.row, name);
       // return this.getWidgetRef(key);
@@ -782,7 +782,73 @@ modules = {
           columnConfig: t,
           editWidget,
         };
+
         Object.assign(col.params, params);
+        let types = ['input','number', 'text','select','checkbox','radio','status','vabsearch','date']
+        if(widget && types.includes(widget.type)){
+          const func = (obj)=>{
+            let value = obj.row[obj.column.field]
+            let fieldWidget = null;
+            if(!!obj.column?.params?.widget){
+              fieldWidget = this.getRowWidget(obj)
+            }
+            if(fieldWidget && !fieldWidget.options.hidden){
+              let widgetType = fieldWidget.type;
+              if(['input','number'].includes(widgetType)){
+                return value;
+              }
+              let widgetRef = this.getWidgetRefByTableParam(obj)
+              if('text' === widgetType){
+                return widgetRef ? widgetRef.showVaule : value;
+              }else if('select' === widgetType){
+                return this.getOptionLabel(fieldWidget, value);
+              }else if('checkbox' === widgetType){
+                return this.getOptionLabel(fieldWidget, value);
+              }else if('radio' === widgetType){
+                return this.getOptionLabel(fieldWidget, value);
+              }else if('status' === widgetType){
+                let statusParam = fieldWidget.options.statusParam || [];
+                let statusItem = statusParam.find(item => item.value === value)
+                return statusItem ? this.$t1(statusItem.label): null;
+              }else if('vabsearch' === widgetType){
+                let result = null;
+                let currentData = obj.row;
+                let fieldKeyName = this.getFieldKeyName(fieldWidget);
+                let vabSearchName = fieldWidget.options.vabSearchName;
+                let multipleChoices = fieldWidget.options.multipleChoices || false;
+                let labelField = vabSearchName || fieldKeyName;
+                if (!multipleChoices) {
+                  result = currentData[labelField] ?? null;
+                } else {
+                  if (value) {
+                    result = value.map(item => item[labelField]).join(",");
+                  }
+                }
+                return result;
+              }else if('date' === widgetType){
+                let dateType = fieldWidget.options.type;
+                if(['date','week'].includes(dateType)){
+                  return value?value.substring(0,10):null;
+                }else if(dateType === 'dates'){
+                  if(value){
+                    if(Array.isArray(value)){
+                      return value.map(item => item.substring(0,10)).join(",");
+                    }else{
+                      return value;
+                    }
+                  }
+                  return null;
+                }else{
+                  return value
+                }
+              }
+            }else{
+              return null
+            }
+
+          };
+          col.slots.filterVal = func;
+        }
         if (!col.children || !col.children.length) {
           if (t.formatS === "render") {
             let r = t.render ? new Function("params", "h", t.render) : null;
@@ -840,6 +906,35 @@ modules = {
       this.rowWidgetList = rowWidgetList;
       return this.$baseLodash.cloneDeep(newColumns);
     },
+    //begin
+     getOptionLabel(fieldWidget, fieldModel){
+      if (fieldModel === null) {
+        return null
+      } else {
+        let resultList = []
+        let labelField = fieldWidget.options.labelKey || "label";
+        let valueField = fieldWidget.options.valueKey || "value";
+        fieldWidget.options.optionItems.forEach(oItem => {
+          if ((oItem[valueField] === fieldModel) || (this.findInArray(fieldModel, oItem[valueField])) !== -1) {
+            resultList.push(this.$t1(oItem[labelField]))
+          }
+        })
+        return resultList.join(",")
+      }
+    },
+    findInArray: function (e, t) {
+      if (!Array.isArray(e)) return -1;
+      var i = -1;
+      return (
+        e.forEach(function (e, n) {
+          e === t && (i = n);
+        }),
+          i
+      );
+    },
+    //end
+
+
     async initTableList() {
       let that = this;
       let tableOption = null;
@@ -1558,7 +1653,6 @@ modules = {
       if (mergeRowEnabled && unikey) {
         tableOption.config.spanMethod = this.mergeRowMethod;
       }
-
       this.$vxeTableUtil.initVxeTable(tableOption).then((opts) => {
         this.vxeOption = opts;
         if (!isQueryTable) {

package/src/components/xform/mixins/defaultHandle.js

@@ -1,4 +1,3 @@
-// import dayjs from "dayjs";
 import moment from "moment";
 
 let modules = {};
@@ -6,29 +5,44 @@ modules = {
   data() {
     return {
       timerMap: {},
-      // dayjs: dayjs
-    }
+    };
   },
   beforeDestroy() {
     for (let timer in this.timerMap) {
-      this.clearInterval(timer)
+      this.clearInterval(timer);
     }
   },
   methods: {
+    getMoment(date) {
+      return moment(date);
+    },
+    getMomentUtil() {
+      return moment;
+    },
+    utcToCst(utcStr) {
+      if (!utcStr) return utcStr;
+      return moment.utc(utcStr).local().format("YYYY-MM-DD HH:mm:ss");
+    },
+    cstToUtc(localTime) {
+      if (!localTime) return localTime;
+      return moment(localTime).utc().format("YYYY-MM-DD HH:mm:ss");
+    },
+    addFormatDateTime(date, num, type, format) {
+      if (!date) return date;
+      if (!type) type = "days";
+      if (!format) format = "YYYY-MM-DD HH:mm:ss";
+      return moment(date).add(num, type).format(format);
+    },
     addFormatDate(date, num) {
       if (!date) return date;
-      // return dayjs(date).add(num, "day").format("YYYY-MM-DD");
       return moment(date).add(num, "days").format("YYYY-MM-DD");
-
     },
     formatDate(date) {
       if (!date) return date;
-      // return dayjs(date).format("YYYY-MM-DD");
       return moment(date).format("YYYY-MM-DD");
     },
     formatDateTime(date, format = "YYYY-MM-DD HH:mm:ss") {
-      if (!date) return date
-      // return dayjs(date).format(format);
+      if (!date) return date;
       return moment(date).format(format);
     },
     getFormEntityData(reqFormData) {
@@ -42,7 +56,7 @@ modules = {
       let formRef = this.getFormRef ? this.getFormRef() : this;
       let formConfig = formRef.formConfig;
       let entity = formConfig.entity;
-      if (!entity) return
+      if (!entity) return;
       let dataId = formRef?.dataId;
       let reportTemplate = formRef?.reportTemplate;
       let formCode = reportTemplate?.formCode;
@@ -63,7 +77,7 @@ modules = {
         formCode: formCode,
         formVersion: reportTemplate.formVersion,
         taBm: entity,
-        data: formData
+        data: formData,
       };
       return reqData;
     },
@@ -71,19 +85,17 @@ modules = {
       let formRef = this.getFormRef ? this.getFormRef() : this;
       let formConfig = formRef.formConfig;
       let entity = formConfig.entity;
-      if (!entity) return
+      if (!entity) return;
       let dataId = formRef?.dataId;
       let reportTemplate = formRef?.reportTemplate;
       let formCode = reportTemplate?.formCode;
-      let scriptCode = formConfig.saveScriptCode || "saveUpdate"
+      let scriptCode = formConfig.saveScriptCode || "saveUpdate";
       let config = option?.config;
       // formRef.clearValidate();
       // formRef.$forceUpdate();
       // let formDataModel = formRef.formDataModel;
 
-
-
-      formRef.validate(valid => {
+      formRef.validate((valid) => {
         if (valid) {
           let reqData = this.getReqFormData();
           this.formHttp({
@@ -93,20 +105,20 @@ modules = {
             successMsg: true,
             isConfirm: true,
             confirmText: this.$t1("您确定要保存吗？"),
-            success: res => {
-              let editFormCode = formConfig.editFormCode
+            success: (res) => {
+              let editFormCode = formConfig.editFormCode;
               let updateParam = {
-                dataId: res.objx
-              }
-              if(editFormCode){
+                dataId: res.objx,
+              };
+              if (editFormCode) {
                 updateParam.formCode = editFormCode;
               }
 
               formRef.reloadForm({
-                updateParam
+                updateParam,
               });
             },
-            ...config
+            ...config,
           });
         }
       });
@@ -116,7 +128,7 @@ modules = {
       this.timerMap[timer] = timer;
     },
     clearInterval(timer) {
-      clearInterval(timer)
+      clearInterval(timer);
       delete this.timerMap[timer];
     },
     getGlobalConfig() {
@@ -144,7 +156,7 @@ modules = {
      * @param {string} [seqField='seq'] - 序列字段名
      * @returns {Array} 更新后的数组
      */
-    deleteNumRows(list, deleteIndex, seqField = 'seq') {
+    deleteNumRows(list, deleteIndex, seqField = "seq") {
       if (deleteIndex < 0 || deleteIndex >= list.length) {
         return [...list]; // 返回副本
       }
@@ -171,7 +183,7 @@ modules = {
      * @param {string} [seqField='seq'] - 序列字段名
      * @returns {Array} 更新后的数组
      */
-    insertNumRows(list, newItems, insertIndex = list.length, seqField = 'seq') {
+    insertNumRows(list, newItems, insertIndex = list.length, seqField = "seq") {
       // 参数标准化
       const itemsArray = Array.isArray(newItems) ? newItems : [newItems];
 
@@ -182,8 +194,8 @@ modules = {
       const newList = [...list];
 
       // 准备要插入的项（移除可能的旧序列）
-      const itemsToInsert = itemsArray.map(item => {
-        const newItem = {...item};
+      const itemsToInsert = itemsArray.map((item) => {
+        const newItem = { ...item };
         if (newItem[seqField] !== undefined) {
           delete newItem[seqField];
         }
@@ -214,16 +226,26 @@ modules = {
      * @param {string} [superSeqField='super_seq'] - list2中的关联字段名
      * @returns {Object} 包含更新后的list1和list2
      */
-    insertRelRows(list1, list2, newItems, subItems = [], insertIndex, seqField = 'seq', superSeqField = 'super_seq') {
+    insertRelRows(
+      list1,
+      list2,
+      newItems,
+      subItems = [],
+      insertIndex,
+      seqField = "seq",
+      superSeqField = "super_seq"
+    ) {
       // 参数标准化
       const itemsArray = Array.isArray(newItems) ? newItems : [newItems];
-      const subItemsArray = Array.isArray(subItems) && subItems.length > 0 && Array.isArray(subItems[0])
-        ? subItems
-        : [subItems];
-
+      const subItemsArray =
+        Array.isArray(subItems) &&
+        subItems.length > 0 &&
+        Array.isArray(subItems[0])
+          ? subItems
+          : [subItems];
 
       if (insertIndex === null || insertIndex === undefined) {
-        insertIndex = list1.length
+        insertIndex = list1.length;
       }
       // 边界检查
       insertIndex = Math.max(0, Math.min(insertIndex, list1.length));
@@ -233,8 +255,8 @@ modules = {
       const newList2 = [...list2];
 
       // 1. 插入新项（不设置序列）
-      const itemsToInsert = itemsArray.map(item => {
-        const newItem = {...item};
+      const itemsToInsert = itemsArray.map((item) => {
+        const newItem = { ...item };
         if (newItem[seqField] !== undefined) {
           delete newItem[seqField]; // 确保不保留旧序列
         }
@@ -265,7 +287,7 @@ modules = {
       }
 
       // 4. 更新现有关联字段
-      newList2.forEach(item => {
+      newList2.forEach((item) => {
         const currentSuperSeq = item[superSeqField];
         if (seqMapping[currentSuperSeq] !== undefined) {
           item[superSeqField] = seqMapping[currentSuperSeq];
@@ -276,15 +298,15 @@ modules = {
       subItemsArray.forEach((subItems, idx) => {
         const superSeq = newSeqs[idx];
         if (Array.isArray(subItems) && subItems.length > 0) {
-          subItems.forEach(item => {
-            const newItem = {...item};
+          subItems.forEach((item) => {
+            const newItem = { ...item };
             newItem[superSeqField] = superSeq;
             newList2.push(newItem);
           });
         }
       });
 
-      return {list1: newList1, list2: newList2};
+      return { list1: newList1, list2: newList2 };
     },
 
     /**
@@ -296,10 +318,16 @@ modules = {
      * @param {string} [refField='super_seq'] - 关联字段名
      * @returns {Object} 包含更新后的masters和slaves
      */
-    deleteRelRows(masters, slaves, rowIdx, seqField = 'seq', refField = 'super_seq') {
+    deleteRelRows(
+      masters,
+      slaves,
+      rowIdx,
+      seqField = "seq",
+      refField = "super_seq"
+    ) {
       // 边界检查
       if (rowIdx < 0 || rowIdx >= masters.length) {
-        return {masters: [...masters], slaves: [...slaves]};
+        return { masters: [...masters], slaves: [...slaves] };
       }
 
       // 创建副本
@@ -327,17 +355,16 @@ modules = {
       });
 
       // 4. 更新从属数据引用
-      newSlaves.forEach(slave => {
+      newSlaves.forEach((slave) => {
         const ref = slave[refField];
         if (seqMap[ref] !== undefined) {
           slave[refField] = seqMap[ref];
         }
       });
 
-      return {list1: newMasters, list2: newSlaves};
-    }
+      return { list1: newMasters, list2: newSlaves };
+    },
     //2个数组的行号处理 end
-
-  }
-}
+  },
+};
 export default modules;

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

@@ -173,7 +173,7 @@
       v-if="showMenuModal"
     ></div>
     <el-dialog
-      title="切换组织"
+      :title="$t1('切换组织')"
       width="355px"
       custom-class="dialog-style list-dialog"
       v-if="showCompanyDialog"
@@ -186,7 +186,11 @@
       @close="changeCompanyClose"
     >
       <div class="cont">
-        <el-input placeholder="搜索" class="search-btn" v-model="filterText"></el-input>
+        <el-input
+          :placeholder="$t1('搜索')"
+          class="search-btn"
+          v-model="filterText"
+        ></el-input>
         <el-tree
           :props="defaultProps"
           :load="loadNode"
@@ -414,9 +418,9 @@ export default {
               window.open(path);
             },
           });
-        } else{
-          if (path.indexOf('token={token}') >= 0) {
-            path = path.replace('token={token}', 'token=' + getToken())
+        } else {
+          if (path.indexOf("token={token}") >= 0) {
+            path = path.replace("token={token}", "token=" + getToken());
           }
           window.open(path);
         }
@@ -610,7 +614,8 @@ export default {
           let parentLabel = companyCode ? node.label : null;
           datas.forEach((item) => {
             item.leaf = !item.hasChild;
-            let label = item.companyName;
+            let label = this.$t1(item.companyName);
+
             /*if(companyCode){
               label = label + '('+companyTypeMap[item.companyType]+')'
             }*/

package/src/layout/components/langTool.vue

@@ -1,14 +1,18 @@
 <template>
-  <div class="item" v-if="i18nEnabled && languageSettings.length>1">
-    <el-dropdown class='lang-box' trigger="click">
-    <span class="el-dropdown-link">
-      <i class="iconfont icon-duoyuyan"></i><i
-      class="el-icon-arrow-down el-icon--right"></i>
-    </span>
+  <div class="item" v-if="i18nEnabled && languageSettings.length > 1">
+    <el-dropdown class="lang-box" trigger="click">
+      <span class="el-dropdown-link">
+        <i class="iconfont icon-duoyuyan"></i
+        ><i class="el-icon-arrow-down el-icon--right"></i>
+      </span>
       <el-dropdown-menu slot="dropdown" class="lang-box-pup">
-        <el-dropdown-item v-for="(item,index) in languageSettings" :key="index" :command="item.languageCode"
-                          @click.native="changeLanguage(item.languageCode)"
-                          :class="{'cur':currentName == item.languageName}">{{ item.languageName }}
+        <el-dropdown-item
+          v-for="(item, index) in languageSettings"
+          :key="index"
+          :command="item.languageCode"
+          @click.native="changeLanguage(item.languageCode)"
+          :class="{ cur: currentName == item.languageName }"
+          >{{ $t1(item.languageName) }}
         </el-dropdown-item>
       </el-dropdown-menu>
     </el-dropdown>
@@ -24,13 +28,13 @@ export default {
     return {
       languageSettings: [],
       languageSettingMap: {},
-      i18nEnabled: settingConfig.i18nEnabled
-    }
+      i18nEnabled: settingConfig.i18nEnabled,
+    };
   },
   computed: {
     currentName() {
-      return this.languageSettingMap[this.$i18n.locale]
-    }
+      return this.languageSettingMap[this.$i18n.locale];
+    },
   },
   mounted() {
     this.initLanguageSetting();
@@ -42,33 +46,33 @@ export default {
           url: USER_PREFIX + `/auth/switchLanguage`,
           method: `post`,
           data: {
-            "stringOne": command
+            stringOne: command,
           },
           isLoading: true,
           modalStrictly: true,
           loadingTarget: document.body,
-          success: res => {
-            this.$i18n.locale = command // 设置给本地的i18n插件
+          success: (res) => {
+            this.$i18n.locale = command; // 设置给本地的i18n插件
             localStorage.setItem("i18n-lang", command);
-            this.$message.success('切换多语言成功')
-            location.reload()
-          }
-        })
+            this.$message.success("切换多语言成功");
+            location.reload();
+          },
+        });
       }
     },
     initLanguageSetting() {
       if (settingConfig.i18nEnabled !== true) return;
-      let languageSettings = []
-      languageSettings.push(...(this.$store.state.user.languageSettings));
+      let languageSettings = [];
+      languageSettings.push(...this.$store.state.user.languageSettings);
       let map = {};
-      languageSettings.forEach(item => {
+      languageSettings.forEach((item) => {
         map[item.languageCode] = item.languageName;
       });
       this.languageSettingMap = map;
       this.languageSettings = languageSettings;
     },
-  }
-}
+  },
+};
 </script>
 <style scoped lang="scss">
 /*多语言*/
@@ -78,7 +82,7 @@ export default {
   height: 18px;
   line-height: 18px;
   vertical-align: middle;
-  color: #FFF;
+  color: #fff;
   font-size: 12px;
 
   .el-icon--right {
@@ -86,7 +90,7 @@ export default {
   }
 
   .el-dropdown-link {
-    color: #FFF;
+    color: #fff;
 
     .name {
       display: inline-block;
@@ -95,7 +99,7 @@ export default {
       overflow: hidden;
       vertical-align: middle;
       font-size: 12px;
-      line-height: 19px
+      line-height: 19px;
     }
 
     i {
@@ -110,7 +114,6 @@ export default {
       }
     }
   }
-
 }
 
 .lang-box-pup .el-dropdown-menu__item.cur {

package/src/store/getters.js

@@ -19,6 +19,7 @@ const getters = {
   isBdAdmin: state => state.user.isBdAdmin,
   userFlag: state => state.user.userFlag,
   fileServerInfo: state => state.user.fileServerInfo,
-  loginConfig: state => state.user.loginConfig
+  loginConfig: state => state.user.loginConfig,
+  utcTransformOffset: state => state.user.utcTransformOffset,// 时区偏移量，单位：小时
 }
 export default getters

package/src/store/modules/user.js

@@ -44,6 +44,7 @@ state = {
   userFlag: null,
   fileServerInfo: null,
   loginConfig: null,
+  utcTransformOffset: 0,// 时区偏移量，单位：小时
 };
 
 mutations = {
@@ -95,6 +96,9 @@ mutations = {
   SET_LOGIN_CONFIG: (state, loginConfig) => {
     state.loginConfig = loginConfig;
   },
+  SET_UTC_TRANSFORM_OFFSET: (state, utcTransformOffset) => {
+    state.utcTransformOffset = utcTransformOffset;
+  },
 };
 
 actions = {
@@ -205,6 +209,25 @@ actions = {
                     console.error(error);
                   }),
                 ];
+                if (settingConfig.utcTransformEnabled) {
+                  requests.push(
+                    getParameterVauleByCode({
+                      data: { code: "utcTransformOffset" }, //UTC时间转换时差
+                      success: (res) => {
+                        let value =
+                          !res.objx || !res.objx.value
+                            ? 0
+                            : Number(res.objx.value);
+                        if (isNaN(value)) value = 0;
+                        commit("SET_UTC_TRANSFORM_OFFSET", value);
+                      },
+                      fail: (res) => {
+                        flag = false;
+                        reject(res);
+                      },
+                    })
+                  );
+                }
                 if (settingConfig.i18nEnabled) {
                   requests.push(
                     languageSettingListPage({
@@ -332,12 +355,13 @@ actions = {
           errorMsg: false,
           success: (res) => {
             let loginConfig = {};
-            if(res.objx){
+            if (res.objx) {
               loginConfig = JSON.parse(res.objx);
-              if(loginConfig.system_name)document.title = loginConfig.system_name;
+              if (loginConfig.system_name)
+                document.title = loginConfig.system_name;
             }
             commit("SET_LOGIN_CONFIG", loginConfig);
-          }
+          },
         }).finally(() => {
           resolve();
         });