@zscreate/form-component 1.1.221-test.52 → 1.1.221-test.53

package/dist/form-component.umd.js

@@ -76923,7 +76923,7 @@ const API = '/form/formdesiger/countLeaveDays';
     m_subscribe(key, val) {
       if (!(pubsub_js__WEBPACK_IMPORTED_MODULE_5___default().calc_record)) (pubsub_js__WEBPACK_IMPORTED_MODULE_5___default().calc_record) = {};
     },
-    calc_run(isFirstRun) {
+    calc_run(isFirstRun, msgData) {
       let invalids = false;
       let {
         formula,
@@ -76932,6 +76932,7 @@ const API = '/form/formdesiger/countLeaveDays';
       relyWidgets.forEach(item => {
         formula = formula.replaceAll(`\$${item}\#`, item);
       });
+      if (msgData.tableKey && msgData.tableKey === this.widget.tableKey && this.tableIndex != msgData.tableIndex) return;
       const tableArr = relyWidgets.filter(item => item.includes(".")).map(item => item.split("."));
       const models = this.models;
       const keys = Object.keys(models);
@@ -76942,6 +76943,9 @@ const API = '/form/formdesiger/countLeaveDays';
         if (tableData && Array.isArray(models[curr])) {
           prev[key] = JSON.parse(JSON.stringify(models[curr]));
           prev[key][tableData[1]] = prev[key].map(item => item[tableData[1]]);
+          if ([msgData.tableKey, curr].every(item => this.widget.tableKey === item)) {
+            prev[key][tableData[1]] = prev[key][tableData[1]][msgData.tableIndex];
+          }
         }
         if (relyWidgets.includes(key) && isFirstRun && models[curr] === '') {
           invalids = true;
@@ -76978,7 +76982,7 @@ const API = '/form/formdesiger/countLeaveDays';
           if (item.includes('.')) item = item.split('.').slice(-1)[0];
           pubsub_js__WEBPACK_IMPORTED_MODULE_5___default().subscribe('calc_' + item.replace('_widget_', ''), (key, data) => {
             setTimeout(() => {
-              this.calc_run();
+              this.calc_run(false, data);
               console.log(this, key, data);
             }, 100);
           });
@@ -147362,7 +147366,7 @@ var __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_DEFINE_RESULT__;/*!
 /***/ ((module) => {
 
 "use strict";
-module.exports = JSON.parse('{"i8":"1.1.221-test.52"}');
+module.exports = JSON.parse('{"i8":"1.1.221-test.53"}');
 
 /***/ })
 
@@ -158322,9 +158326,9 @@ const watermark = __webpack_require__(2206);
     };
   }
 });
-;// CONCATENATED MODULE: ./node_modules/_vue-loader@15.10.2@vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/_vue-loader@15.10.2@vue-loader/lib/index.js??vue-loader-options!./src/form/formula/warpFormulaEdit.vue?vue&type=template&id=6f77e27d&
-var warpFormulaEditvue_type_template_id_6f77e27d_render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('div',[_c('a-button',{attrs:{"type":_vm.hasInValid ? '': 'primary'},on:{"click":function($event){return _vm.init(_vm.widget)}}},[_c('span',{style:({ color: _vm.hasInValid ? 'red': 'inherit'})},[_vm._v(" "+_vm._s(_vm.hasInValid ? '存在已删除字段，请重新设置' : '公式编辑')+" ")])]),_c('formula-edit',{attrs:{"visible":_vm.visible,"widgetName":_vm.widget.name,"bo-data":_vm.widgetsData,"data":_vm.formula},on:{"update:data":function($event){_vm.formula=$event},"callback":_vm.setFormulaValue,"debug":_vm.handleDebug,"close":function (_visible) { return _vm.visible = false; }}}),_c('a-modal',{attrs:{"title":"公式调试","footer":null,"width":"900px"},model:{value:(_vm.debugVisible),callback:function ($$v) {_vm.debugVisible=$$v},expression:"debugVisible"}},[_c('div',{staticStyle:{"display":"flex","justify-content":"center","overflow":"auto"}},[(_vm.debugVisible)?_c('layout-for-paper',{ref:"layoutForPaper",staticStyle:{"min-height":"initial!important"},attrs:{"insite":"true","data":_vm.warpDebugForm,"value":{}}}):_vm._e()],1)])],1)}
-var warpFormulaEditvue_type_template_id_6f77e27d_staticRenderFns = []
+;// CONCATENATED MODULE: ./node_modules/_vue-loader@15.10.2@vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/_vue-loader@15.10.2@vue-loader/lib/index.js??vue-loader-options!./src/form/formula/warpFormulaEdit.vue?vue&type=template&id=6829e348&
+var warpFormulaEditvue_type_template_id_6829e348_render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('div',[_c('a-button',{attrs:{"type":_vm.hasInValid ? '': 'primary'},on:{"click":function($event){return _vm.init(_vm.widget)}}},[_c('span',{style:({ color: _vm.hasInValid ? 'red': 'inherit'})},[_vm._v(" "+_vm._s(_vm.hasInValid ? '存在已删除字段，请重新设置' : '公式编辑')+" ")])]),_c('formula-edit',{attrs:{"visible":_vm.visible,"widgetName":_vm.widget.name,"bo-data":_vm.widgetsData,"data":_vm.formula},on:{"update:data":function($event){_vm.formula=$event},"callback":_vm.setFormulaValue,"debug":_vm.handleDebug,"close":function (_visible) { return _vm.visible = false; }}}),_c('a-modal',{attrs:{"title":"公式调试","footer":null,"width":"900px"},model:{value:(_vm.debugVisible),callback:function ($$v) {_vm.debugVisible=$$v},expression:"debugVisible"}},[_c('div',{staticStyle:{"display":"flex","justify-content":"center","overflow":"auto"}},[(_vm.debugVisible)?_c('layout-for-paper',{ref:"layoutForPaper",staticStyle:{"min-height":"initial!important"},attrs:{"insite":"true","data":_vm.warpDebugForm,"value":{}}}):_vm._e()],1)])],1)}
+var warpFormulaEditvue_type_template_id_6829e348_staticRenderFns = []
 
 
 ;// CONCATENATED MODULE: ./node_modules/_vue-loader@15.10.2@vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/_vue-loader@15.10.2@vue-loader/lib/index.js??vue-loader-options!./src/form/formula/formula-edit.vue?vue&type=template&id=23a01ed0&
@@ -160117,6 +160121,9 @@ var formula_edit_component = (0,componentNormalizer/* default */.Z)(
       const tableArr = [];
       const formulaComponents = this.widgetList.filter(item => {
         if (item.model === this.widget.model) return false;
+        // if (this.widget.tableKey) {
+        //     return item.tableKey !== this.widget.tableKey
+        // }
         return ['input', 'textarea', 'number', 'date'].includes(item.type);
       });
       return formulaComponents.map(item => {
@@ -160170,8 +160177,8 @@ var formula_edit_component = (0,componentNormalizer/* default */.Z)(
 ;
 var warpFormulaEdit_component = (0,componentNormalizer/* default */.Z)(
   formula_warpFormulaEditvue_type_script_lang_js_,
-  warpFormulaEditvue_type_template_id_6f77e27d_render,
-  warpFormulaEditvue_type_template_id_6f77e27d_staticRenderFns,
+  warpFormulaEditvue_type_template_id_6829e348_render,
+  warpFormulaEditvue_type_template_id_6829e348_staticRenderFns,
   false,
   null,
   null,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zscreate/form-component",
-  "version": "1.1.221-test.52",
+  "version": "1.1.221-test.53",
   "private": false,
   "description": "",
   "main": "dist/form-component.umd.js",