cloud-web-corejs 1.0.276 → 1.0.278

package/src/components/xform/form-render/container-item/containerItemMixin.js

@@ -1,8 +1,11 @@
-import {traverseFieldWidgetsOfContainer, traverseWidgetsOfContainer} from "../../../../components/xform/utils/util";
+import {
+  traverseFieldWidgetsOfContainer,
+  traverseWidgetsOfContainer,
+} from "../../../../components/xform/utils/util";
 import {
   getReportGlobalMap,
-  getAccessUrl
-} from "../../../../components/xform/utils/util"
+  getAccessUrl,
+} from "../../../../components/xform/utils/util";
 import scriptHttpMixin from "../../../../components/xform/mixins/scriptHttp";
 import defaultHandleMixin from "../../../../components/xform/mixins/defaultHandle";
 import settingConfig from "@/settings.js";
@@ -11,7 +14,7 @@ const isDev = process.env.NODE_ENV === "development";
 const baseRefUtil = {
   traverseFieldWidgetsOfContainer,
   getReportGlobalMap,
-  getAccessUrl
+  getAccessUrl,
 };
 modules = {
   props: {
@@ -25,51 +28,60 @@ modules = {
     },
   },
   mixins: [scriptHttpMixin, defaultHandleMixin],
-  inject: ['widgetKeyNameMap','doScriptAccess', 'getReportTemplate'],
+  inject: ["widgetKeyNameMap", "doScriptAccess", "getReportTemplate"],
   data() {
     return {
       extraAccessData: {},
-      timerMap: {}
+      timerMap: {},
     };
   },
   computed: {
     customClass() {
-      return this.widget.options.customClass || '';
+      return this.widget.options.customClass || "";
     },
 
     formModel: {
       cache: false,
       get() {
         return this.globalModel.formModel;
-      }
+      },
     },
     fieldKeyName() {
       let o = this.widget.options.name;
       return (
-        (this.widget.options.keyNameEnabled
-          && this.widget.options.keyName)
-        || o
+        (this.widget.options.keyNameEnabled && this.widget.options.keyName) || o
       );
     },
-
   },
   beforeDestroy() {
     this.clearAllInterval();
   },
-  created() {
-
-  },
+  created() {},
   mounted() {
     this.callSetHidden();
   },
   methods: {
-    setFormScriptEnabled(value){
-      this.widget.options.formScriptEnabled = value || false
-    },
-    unregisterFromRefList() {  //销毁容器组件时注销组件ref
-      if ((this.refList !== null) && !!this.widget.options.name) {
-        let oldRefName = this.widget.options.name;
-        delete this.refList[oldRefName];
+    setFormScriptEnabled(value) {
+      this.widget.options.formScriptEnabled = value || false;
+    },
+    unregisterFromRefList() {
+      //销毁容器组件时注销组件ref
+      // 注销 key 必须与 refMixin.initRefList 对齐：行内容器注册的是 name + "@row" + rowIndex，
+      // 且 initRefList 会无条件注册一份不带后缀的 name。仅当 key 仍指向当前实例时才删除，
+      // 避免同名容器重建时误删新注册的实例。
+      if (this.refList !== null && !!this.widget.options.name) {
+        let name = this.widget.options.name;
+        let inRow =
+          this.subFormRowIndex !== -1 &&
+          this.subFormRowIndex !== void 0 &&
+          !!this.tableParam;
+        let key = inRow ? name + "@row" + this.tableParam.rowIndex : name;
+        if (this.refList[key] === this) {
+          delete this.refList[key];
+        }
+        if (key !== name && this.refList[name] === this) {
+          delete this.refList[name];
+        }
       }
     },
 
@@ -129,8 +141,9 @@ modules = {
       //注意：单行子表单、多行子表单容器的setDisabled方法由单行子表单、多行子表单组件自己实现！！
     }, */
 
-    activeTab(tabIndex) { //tabIndex从0计数
-      if ((tabIndex >= 0) && (tabIndex < this.widget.tabs.length)) {
+    activeTab(tabIndex) {
+      //tabIndex从0计数
+      if (tabIndex >= 0 && tabIndex < this.widget.tabs.length) {
         this.widget.tabs.forEach((tp, idx) => {
           tp.options.active = idx === tabIndex;
           if (idx === tabIndex) {
@@ -141,30 +154,31 @@ modules = {
     },
 
     disableTab(tabIndex) {
-      if ((tabIndex >= 0) && (tabIndex < this.widget.tabs.length)) {
+      if (tabIndex >= 0 && tabIndex < this.widget.tabs.length) {
         this.widget.tabs[tabIndex].options.disabled = true;
       }
     },
 
     enableTab(tabIndex) {
-      if ((tabIndex >= 0) && (tabIndex < this.widget.tabs.length)) {
+      if (tabIndex >= 0 && tabIndex < this.widget.tabs.length) {
         this.widget.tabs[tabIndex].options.disabled = false;
       }
     },
 
     hideTab(tabIndex) {
-      if ((tabIndex >= 0) && (tabIndex < this.widget.tabs.length)) {
+      if (tabIndex >= 0 && tabIndex < this.widget.tabs.length) {
         this.widget.tabs[tabIndex].options.hidden = true;
       }
     },
 
     showTab(tabIndex) {
-      if ((tabIndex >= 0) && (tabIndex < this.widget.tabs.length)) {
+      if (tabIndex >= 0 && tabIndex < this.widget.tabs.length) {
         this.widget.tabs[tabIndex].options.hidden = false;
       }
     },
 
-    setWidgetOption(optionName, optionValue) { //通用组件选项修改API
+    setWidgetOption(optionName, optionValue) {
+      //通用组件选项修改API
       if (this.widget.options.hasOwnProperty(optionName)) {
         this.widget.options[optionName] = optionValue;
       }
@@ -178,23 +192,25 @@ modules = {
     },
 
     disableSubFormRow(rowIndex) {
-      this.widget.widgetList.forEach(subWidget => {
-        let swRefName = subWidget.options.name + '@row' + this.rowIdData[rowIndex];
+      this.widget.widgetList.forEach((subWidget) => {
+        let swRefName =
+          subWidget.options.name + "@row" + this.rowIdData[rowIndex];
         let foundSW = this.getWidgetRef(swRefName);
         if (!!foundSW) {
           foundSW.setDisabled(true);
         }
-      })
+      });
     },
 
     enableSubFormRow(rowIndex) {
-      this.widget.widgetList.forEach(subWidget => {
-        let swRefName = subWidget.options.name + '@row' + this.rowIdData[rowIndex];
+      this.widget.widgetList.forEach((subWidget) => {
+        let swRefName =
+          subWidget.options.name + "@row" + this.rowIdData[rowIndex];
         let foundSW = this.getWidgetRef(swRefName);
         if (!!foundSW) {
           foundSW.setDisabled(false);
         }
-      })
+      });
     },
 
     disableSubForm() {
@@ -219,8 +235,9 @@ modules = {
       this.actionDisabled = false;
     },
 
-    resetSubForm() { //重置subForm数据为空
-      if (this.widget.type === 'sub-form') {
+    resetSubForm() {
+      //重置subForm数据为空
+      if (this.widget.type === "sub-form") {
         let subFormModel = this.formModel[this.widget.options.name];
         if (!!subFormModel) {
           subFormModel.splice(0, subFormModel.length);
@@ -234,11 +251,11 @@ modules = {
     },
 
     getSubFormValues(needValidation = true) {
-      if (this.widget.type === 'sub-form') {
+      if (this.widget.type === "sub-form") {
         //TODO: 逐行校验子表单！暂未实现！！
         return this.formModel[this.widget.options.name];
       } else {
-        this.$message.error(this.i18nt('render.hint.nonSubFormType'));
+        this.$message.error(this.i18nt("render.hint.nonSubFormType"));
       }
     },
 
@@ -294,7 +311,7 @@ modules = {
     },
     addExtraAccessData(data) {
       if (data) {
-        Object.keys(data).forEach(field => {
+        Object.keys(data).forEach((field) => {
           this.extraAccessData[field] = data[field];
         });
       }
@@ -313,20 +330,15 @@ modules = {
           accessCode: accessCode,
           conditions: {
             ...conditions,
-            ...globalReqData
-          }
+            ...globalReqData,
+          },
         },
         isLoading: true,
-        success: res => {
-          callback && callback(res.objx)
-        }
+        success: (res) => {
+          callback && callback(res.objx);
+        },
       });
     },
-    autoExcScript() {
-      if (!this.designState && this.widget.options.accessAutoExc) {
-        this.scriptHttp(this.widget.options);
-      }
-    },
     //--------------------- 以上为组件支持外部调用的API方法 end ------------------//
     getEventParam() {
       let formRef = this.getFormRef();
@@ -335,28 +347,32 @@ modules = {
       return {
         eventParamNames: ["dataId", "formCode"],
         eventParamValues: [dataId, formCode],
-      }
+      };
     },
     handleCustomEvent(funtionStr, eventParamNames = [], eventParamValues = []) {
-      if (funtionStr) {
+      if (!this.designState && funtionStr) {
         let eventParam = this.getEventParam();
-        var e = new Function(...eventParam.eventParamNames, ...eventParamNames, funtionStr);
+        var e = new Function(
+          ...eventParam.eventParamNames,
+          ...eventParamNames,
+          funtionStr
+        );
         // return e.call(this, ...eventParam.eventParamValues, ...eventParamValues);
         let that = this;
-        try{
+        try {
           return e.call(
             this,
             ...eventParam.eventParamValues,
             ...eventParamValues
           );
-        }catch(error){
-          if(settingConfig.fontErrorTipEnabled){
+        } catch (error) {
+          if (settingConfig.fontErrorTipEnabled) {
             that.$errorMsg({
               rmid: that.$t1("前端脚本异常"),
               content: error.message,
-              type: 'error',
-              _errorMsg: error.stack
-            })
+              type: "error",
+              _errorMsg: error.stack,
+            });
           }
           throw error;
         }
@@ -381,9 +397,8 @@ modules = {
     getParentTarget() {
       let name = this.parentWidget?.options?.name ?? null;
       return name ? this.getWidgetRef(name) : null;
-    }
+    },
   },
-
 };
 
 export default modules;

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

@@ -158,13 +158,13 @@
         <component
           v-else
           :is="getColumnWidgetName(obj.column.params.widget)"
-          :field="fieldSchemaMap[obj.row._X_ROW_KEY][obj.column.params.widget.id]"
+          :field="getTableColumnWidget(obj)"
           :form-model="globalModel.formModel"
           :designer="null"
           :key="
             obj.rowIndex +
             '-' +
-            fieldSchemaMap[obj.row._X_ROW_KEY][obj.column.params.widget.id].id
+            (getTableColumnWidget(obj) && getTableColumnWidget(obj).id)
           "
           :parent-widget="widget"
           :columnConfig="obj.column.params.columnConfig"
@@ -276,7 +276,7 @@
             class="a-link"
             data-tit="新增"
             @click="addEditRow(null, obj)"
-            v-if="widget.options.isTreeTable"
+            v-if="widget.options.isTreeTable && canShowRowAdd(obj)"
           >
             <el-tooltip
               :enterable="false"
@@ -287,7 +287,12 @@
               ><i class="el-icon-circle-plus-outline"></i
             ></el-tooltip>
           </a>
-          <a @click="editRowEvent(obj)" class="a-link" data-tit="行编辑">
+          <a
+            @click="editRowEvent(obj)"
+            class="a-link"
+            data-tit="行编辑"
+            v-if="canShowRowEdit(obj)"
+          >
             <el-tooltip
               :enterable="false"
               effect="dark"
@@ -317,15 +322,6 @@ export default {
     ...FieldComponents,
   },
   mixins: [dataTableMixin],
-  computed: {
-    /*heightStyle() {
-      let tableHeight = this.widget.options.tableHeight;
-      if (tableHeight && (tableHeight == 'auto' || tableHeight.slice(-1) == '%')) {
-        return 'height:100%';
-      }
-      return '';
-    }*/
-  },
 };
 </script>
 
@@ -333,4 +329,19 @@ export default {
 .field-wrapper {
   display: inline-block;
 }
+/* 对比：变更行/新增行整行高亮（vxe 行加 rowClassName） */
+::v-deep .vxe-body--row.xform-compare-row-changed,
+::v-deep .vxe-body--row.xform-compare-row-changed td {
+  background-color: #fdf2e3; /* 橙 - 变更 */
+}
+::v-deep .vxe-body--row.xform-compare-row-changed td:first-child {
+  box-shadow: inset 3px 0 0 #e6a23c;
+}
+::v-deep .vxe-body--row.xform-compare-row-new,
+::v-deep .vxe-body--row.xform-compare-row-new td {
+  background-color: #eef8e3; /* 绿 - 新增 */
+}
+::v-deep .vxe-body--row.xform-compare-row-new td:first-child {
+  box-shadow: inset 3px 0 0 #67c23a;
+}
 </style>