cloud-web-corejs 1.0.195 → 1.0.196

package/package.json

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

package/src/components/table/util/index.js

@@ -1,5 +1,5 @@
 import Vue from "vue";
-import CellSlot from "@/components/table/CellSlot.vue";
+import CellSlot from "@base/components/table/CellSlot.vue";
 
 let instance = null;
 
@@ -28,9 +28,16 @@ export function getCellValue(obj) {
   let cellValue;
   if (column.slots && column.slots.filterVal) {
     cellValue = column.slots.filterVal(params);
-  } else {
+  } else if(column.renderCell){
     let result = column.renderCell(h, params);
     cellValue = vNodeRender(result);
+  }else{
+    if(column.slots?.default){
+      let result = column.slots.default(obj, h);
+      cellValue = vNodeRender(result);
+    }else{
+      cellValue = obj.row[column.field];
+    }
   }
   return cellValue;
 }
@@ -314,7 +321,7 @@ function domRender(dom) {
       });
       return arr.join("");
     } else {
-      if (item.nodeName == "INPUT") {
+      if (item.nodeName == "INPUT" || item.nodeName == "TEXTAREA") {
         return item.value;
       } else if (item.innerText != null && item.innerText != "") {
         return item.innerText;

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

@@ -13,7 +13,7 @@ function broadcast(componentName, eventName, params) {
 
 export default {
   methods: {
-    dispatch(componentName, eventName, params, isFormSetting) {
+    dispatch(componentName, eventName, params, option) {
 
       var parent = this.$parent || this.$root;
       var name = parent.$options.componentName;
@@ -25,15 +25,15 @@ export default {
           name = parent.$options.componentName;
         }
       }
-      if (isFormSetting) {
+      /*if (isFormSetting) {
         if (window.formSettingPanelRef) {
           parent = window.formSettingPanelRef;
         }
-      }
+      }*/
 
       if (parent) {
         let data = [eventName].concat(params);
-        data.push(isFormSetting)
+        data.push(option)
         parent.$emit.apply(parent, data);
       }
     },

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

@@ -1,4 +1,4 @@
-import dayjs from 'dayjs'
+// import dayjs from 'dayjs'
 import moment from 'moment'
 
 function validateDate(dateStr) {

package/src/components/xform/utils/formula-util.js

@@ -271,10 +271,6 @@ export function baseReplaceFieldsAndFunctionsOfFormula(VFR, formulaFieldRef, for
             }
           });
 
-          /* if(functionCalls.length){
-            debugger
-          } */
-
           if (isSameSubForm && !isInAggregationParam) {
             // 同一子表单且不在聚合函数参数中，使用当前行数据
             if(row){

package/src/components/xform/utils/smart-vue-i18n/index.js

@@ -1,6 +1,5 @@
 import {deepAssign, get} from './utils'
-import xeUtils from "xe-utils";
-import {extendDeeply} from "@/utils/index.js";
+import {extendDeeply} from "../../../../utils/index.js";
 
 
 const install = (Vue, options) => {