@zscreate/form-component 1.1.221-test.36 → 1.1.221-test.38

package/dist/form-component.umd.js

@@ -147320,7 +147320,7 @@ var __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_DEFINE_RESULT__;/*!
 /***/ ((module) => {
 
 "use strict";
-module.exports = JSON.parse('{"i8":"1.1.221-test.36"}');
+module.exports = JSON.parse('{"i8":"1.1.221-test.38"}');
 
 /***/ })
 
@@ -158281,8 +158281,8 @@ var warpFormulaEditvue_type_template_id_3f747a29_render = function () {var _vm=t
 var warpFormulaEditvue_type_template_id_3f747a29_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=86fb2a4e&
-var formula_editvue_type_template_id_86fb2a4e_render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('a-modal',{staticClass:"form-formula-dialog",attrs:{"visible":_vm.dialogVisible,"width":"800px","append-to-body":""},on:{"update:visible":function($event){_vm.dialogVisible=$event},"cancel":_vm.closeDialog}},[_c('template',{slot:"title"},[_c('div',{staticStyle:{"display":"flex"}},[_vm._v(" 公式编辑 "),_c('div',{staticStyle:{"color":"#838892","margin-left":"10px","font-size":"12px"}},[_vm._v("使用数学运算符编辑公式")])])]),(_vm.dialogVisible)?_c('div',{on:{"click":function($event){_vm.replaceVisible && (_vm.replaceVisible = false)}}},[_c('div',{staticClass:"formula-head-title"},[_c('div',{staticClass:"CodeMirror-wrap",staticStyle:{"line-height":"18px"}},[_c('div',{staticClass:"head-options"},[_c('div',{staticStyle:{"overflow":"hidden","line-break":"anywhere","text-overflow":"ellipsis","white-space":"nowrap"},attrs:{"title":_vm.widgetName}},[_vm._v(" "+_vm._s(_vm.widgetName)+" ")]),_c('span',{staticStyle:{"margin-right":"auto"}},[_vm._v(" =")]),_c('div',{staticClass:"head-opt-btns"},[_c('button',{on:{"click":function($event){return _vm.handleClick('copy')}}},[_c('form-iconfont',{staticStyle:{"font-size":"15px"},attrs:{"type":"icon-Copy"}}),_vm._v("复制")],1),_c('a-popconfirm',{attrs:{"visible":_vm.replaceVisible,"placement":"bottomRight","ok-text":"确认","icon":[],"cancel-text":"取消"},on:{"cancel":function($event){_vm.replaceVisible = false},"confirm":_vm.replaceConfirm}},[_c('template',{slot:"title"},[_c('div',{staticClass:"replace-param-content",staticStyle:{"width":"200px","margin-left":"-20px"}},[_c('div',{staticClass:"tip"},[_vm._v(" 仅支持替换引用的当前表单字段 ")]),_c('a-form',{attrs:{"form":_vm.replaceForm}},[_c('a-form-item',{staticStyle:{"margin-bottom":"0"},attrs:{"label":"1. 选择要替换的变量"}},[_c('a-select',{directives:[{name:"decorator",rawName:"v-decorator",value:([
+;// 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=75d03d8b&
+var formula_editvue_type_template_id_75d03d8b_render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('a-modal',{staticClass:"form-formula-dialog",attrs:{"visible":_vm.dialogVisible,"width":"800px","append-to-body":""},on:{"update:visible":function($event){_vm.dialogVisible=$event},"cancel":_vm.closeDialog}},[_c('template',{slot:"title"},[_c('div',{staticStyle:{"display":"flex"}},[_vm._v(" 公式编辑 "),_c('div',{staticStyle:{"color":"#838892","margin-left":"10px","font-size":"12px"}},[_vm._v("使用数学运算符编辑公式")])])]),(_vm.dialogVisible)?_c('div',{on:{"click":function($event){_vm.replaceVisible && (_vm.replaceVisible = false)}}},[_c('div',{staticClass:"formula-head-title"},[_c('div',{staticClass:"CodeMirror-wrap",staticStyle:{"line-height":"18px"}},[_c('div',{staticClass:"head-options"},[_c('div',{staticStyle:{"overflow":"hidden","line-break":"anywhere","text-overflow":"ellipsis","white-space":"nowrap"},attrs:{"title":_vm.widgetName}},[_vm._v(" "+_vm._s(_vm.widgetName)+" ")]),_c('span',{staticStyle:{"margin-right":"auto"}},[_vm._v(" =")]),_c('div',{staticClass:"head-opt-btns"},[_c('button',{on:{"click":function($event){return _vm.handleClick('copy')}}},[_c('form-iconfont',{staticStyle:{"font-size":"15px"},attrs:{"type":"icon-Copy"}}),_vm._v("复制")],1),_c('a-popconfirm',{attrs:{"visible":_vm.replaceVisible,"placement":"bottomRight","ok-text":"确认","icon":[],"cancel-text":"取消"},on:{"cancel":function($event){_vm.replaceVisible = false},"confirm":_vm.replaceConfirm}},[_c('template',{slot:"title"},[_c('div',{staticClass:"replace-param-content",staticStyle:{"width":"200px","margin-left":"-20px"}},[_c('div',{staticClass:"tip"},[_vm._v(" 仅支持替换引用的当前表单字段 ")]),_c('a-form',{attrs:{"form":_vm.replaceForm}},[_c('a-form-item',{staticStyle:{"margin-bottom":"0"},attrs:{"label":"1. 选择要替换的变量"}},[_c('a-select',{directives:[{name:"decorator",rawName:"v-decorator",value:([
                             'curr',
                             {
                               rules: [{ required: true, message: '此内容必填' }],
@@ -158291,7 +158291,7 @@ var formula_editvue_type_template_id_86fb2a4e_render = function () {var _vm=this
                             {
                               rules: [{ required: true, message: '此内容必填' }],
                             } ]),expression:"[\n                            'replace',\n                            {\n                              rules: [{ required: true, message: '此内容必填' }],\n                            },\n                          ]"}],staticClass:"param-combo",staticStyle:{"width":"100%"},attrs:{"show-search":"","filterOption":_vm.replaceFilterOption}},_vm._l((Object.keys(_vm.f_dataObj)),function(item){return _c('a-select-option',{key:item,attrs:{"title":_vm.f_dataObj[item]}},[_vm._v(_vm._s(_vm.f_dataObj[item]))])}),1)],1):_vm._e()],1)],1)]),_c('button',{on:{"click":function($event){return _vm.handleClick('replace')}}},[_c('form-iconfont',{staticStyle:{"font-size":"14px"},attrs:{"type":"icon-replace"}}),_vm._v("替换变量")],1)],2),_c('a-popconfirm',{attrs:{"placement":"bottomRight","icon":[],"ok-text":"确认","cancel-text":"取消"},on:{"confirm":function($event){_vm.form.remark = _vm.remark}}},[_c('template',{slot:"title"},[_c('div',{staticStyle:{"margin-left":"-20px","width":"200px"}},[_c('a-textarea',{staticStyle:{"height":"100px","resize":"none"},attrs:{"auto-size":false,"placeholder":"请输入备注"},model:{value:(_vm.remark),callback:function ($$v) {_vm.remark=$$v},expression:"remark"}})],1)]),_c('button',{on:{"click":function($event){return _vm.handleClick('remark')}}},[_c('form-iconfont',{staticStyle:{"font-size":"12px"},attrs:{"type":"icon-beizhu"}}),_vm._v("备注")],1)],2),_c('button',{on:{"click":function($event){return _vm.handleClick('debug')}}},[_c('form-iconfont',{staticStyle:{"font-size":"14px"},attrs:{"type":"icon-tiaoshi"}}),_vm._v("调试")],1)],1)]),_c('div',{staticStyle:{"padding":"0 5px"}},[_c('textarea',{directives:[{name:"model",rawName:"v-model",value:(_vm.form.formula),expression:"form.formula"}],ref:"formula",staticClass:"cm-s-default",staticStyle:{"height":"180px","font-size":"14px"},domProps:{"value":(_vm.form.formula)},on:{"input":function($event){if($event.target.composing){ return; }_vm.$set(_vm.form, "formula", $event.target.value)}}})])]),(_vm.err_msg)?_c('div',{staticClass:"formula-error"},[_vm._v(" "+_vm._s(_vm.err_msg)+" ")]):_vm._e()]),_c('a-row',[_c('a-col',{attrs:{"span":8}},[_c('div',{staticClass:"formula-info-main"},[_c('div',{staticClass:"head",staticStyle:{"height":"35px"}},[_c('a-input',{attrs:{"allow-clear":"","placeholder":"搜索变量"},model:{value:(_vm.search_variable),callback:function ($$v) {_vm.search_variable=$$v},expression:"search_variable"}},[_c('a-icon',{attrs:{"slot":"prefix","type":"search"},slot:"prefix"})],1)],1),_c('div',{staticClass:"formula-container"},[(_vm.boData.length === 0)?_c('div',{staticClass:"empty-tip"},[_vm._v("无可用变量，请添加或保存表单后重试")]):(_vm.filter_boData.length === 0)?_c('div',{staticClass:"empty-tip"},[_vm._v("无搜索结果")]):_vm._e(),_vm._l((_vm.filter_boData),function(item,idx){return _c('div',{key:item.id,on:{"click":function($event){return _vm.clickBoNode(item)}}},[_c('div',{staticClass:"variable-list"},[_c('div',{attrs:{"title":item.name}},[_vm._v(_vm._s(item.name))]),_c('div',{class:("style-" + (item.type))},[_vm._v(_vm._s(_vm.TypesName[item.type]))])])])})],2)])]),_c('a-col',{attrs:{"span":6}},[_c('div',{staticClass:"formula-info-main ",staticStyle:{"border-left":"none","border-right":"none"}},[_c('div',{staticClass:"head",staticStyle:{"height":"35px"}},[_c('a-input',{attrs:{"allow-clear":"","placeholder":"搜索函数"},model:{value:(_vm.search_methods),callback:function ($$v) {_vm.search_methods=$$v},expression:"search_methods"}},[_c('a-icon',{attrs:{"slot":"prefix","type":"search"},slot:"prefix"})],1)],1),_c('div',{staticStyle:{"height":"100%","overflow-y":"auto"},on:{"mouseleave":_vm.handleMouseLeave}},[(_vm.filter_treeData.length === 0)?_c('div',{staticClass:"empty-tip"},[_vm._v("没有对应的函数")]):_vm._e(),_c('div',{staticClass:"formula-menu"},[_c('div',{staticClass:"formula-list"},_vm._l((_vm.filter_treeData),function(tree,idx){return _c('div',{key:tree.key,class:("formula-category " + (_vm.expandIndex[idx] ? 'expand': ''))},[_c('div',{staticClass:"title",on:{"click":function($event){return _vm.$set(_vm.expandIndex,idx, !_vm.expandIndex[idx])}}},[_c('form-iconfont',{staticClass:"arrow-icon",staticStyle:{"font-size":"13px"},attrs:{"type":"icon-rightyou"}}),_vm._v(" "+_vm._s(tree.title)+" ")],1),_c('div',{staticClass:"children"},_vm._l((tree.children),function(child){return _c('div',{key:child.title,class:("formula-item " + (_vm.formulaIntro.title === child.title ? 'select': '')),on:{"click":function($event){return _vm.clickFunctionNode(child)},"mouseenter":function($event){return _vm.handleFunctionHover(child)}}},[_c('span',{staticClass:"formula-item-name"},[_vm._v(_vm._s(child.title))]),_c('span',{staticClass:"formula-item-subName"},[_vm._v(_vm._s(child.subName))])])}),0)])}),0)])])])]),_c('a-col',{attrs:{"span":10}},[_c('div',{staticClass:"formula-info-main "},[(_vm.formulaIntro)?_c('div',{staticClass:"formula-intro"},[_c('div',{staticClass:"formula-title head"},[_vm._v(_vm._s(_vm.formulaIntro.name))]),_c('div',{staticStyle:{"padding":"0 10px"}},[_c('div',{staticStyle:{"line-height":"22px"}},[_c('div',{staticClass:"intro",staticStyle:{"margin":"5px 0"}},[_vm._v(" "+_vm._s(_vm.formulaIntro.intro)+" ")]),_c('div',{staticClass:"usage",staticStyle:{"margin-bottom":"5px","line-break":"anywhere"}},[_vm._v("用法："),_c('span',{staticClass:"formula-name"},[_vm._v(_vm._s(_vm.formulaIntro.name))]),_vm._v(_vm._s(_vm.formulaIntro.usage.replace(_vm.formulaIntro.name, '')))]),_c('div',{staticClass:"example",staticStyle:{"margin-bottom":"5px","line-break":"anywhere"}},[_vm._v("示例："),_c('span',{domProps:{"innerHTML":_vm._s(_vm.formulaIntro.example)}})])])])]):_vm._e(),_c('div',{staticClass:"formula-container"},[(!_vm.formulaIntro)?_c('ul',{staticStyle:{"padding-left":"20px"}},[_c('li',{staticStyle:{"list-style":"initial","margin-bottom":"20px"}},[_vm._v(" 从左侧面板选择字段名和函数，或输入函数 ")]),_c('li',{staticStyle:{"list-style":"initial"}},[_vm._v("公式编辑样式举例："),_c('span',{staticClass:"formula-name"},[_vm._v(" AVERAGE")]),_vm._v("("),_c('span',{staticClass:"formula-field"},[_vm._v("基本工资")]),_vm._v(","),_c('span',{staticClass:"formula-field"},[_vm._v("加班工资")]),_vm._v(") ")])]):_vm._e()])])])],1)],1):_vm._e(),_c('div',{attrs:{"slot":"footer"},slot:"footer"},[_c('a-button',{on:{"click":_vm.closeDialog}},[_vm._v("取消")]),_c('a-button',{attrs:{"type":"primary"},on:{"click":_vm.handleConfirm}},[_vm._v("确定")])],1)],2)}
-var formula_editvue_type_template_id_86fb2a4e_staticRenderFns = []
+var formula_editvue_type_template_id_75d03d8b_staticRenderFns = []
 
 
 // EXTERNAL MODULE: ./node_modules/_core-js@3.32.1@core-js/modules/es.string.replace-all.js
@@ -159351,6 +159351,7 @@ list_2.forEach(item => {
     visible: {
       handler: function (val, oldVal) {
         this.replaceVisible = false;
+        this.search_methods = this.search_variable = '';
         this.dialogVisible = this.visible;
         if (this.dialogVisible) {
           this.$nextTick(() => {
@@ -159556,7 +159557,7 @@ list_2.forEach(item => {
         formula = ''
       } = this._getValue();
       this.form.formula = formula;
-      if (!formula) return;
+      if (!formula) return this.err_msg = '';
       try {
         const checkRes = new dist_formula.FormulaCheck().run(formula, this.dataTypes, false);
         console.log(`check:`, checkRes);
@@ -159937,25 +159938,25 @@ list_2.forEach(item => {
 });
 ;// CONCATENATED MODULE: ./src/form/formula/formula-edit.vue?vue&type=script&lang=js&
  /* harmony default export */ const formula_formula_editvue_type_script_lang_js_ = (formula_editvue_type_script_lang_js_); 
-;// CONCATENATED MODULE: ./node_modules/_mini-css-extract-plugin@2.7.6@mini-css-extract-plugin/dist/loader.js??clonedRuleSet-32.use[0]!./node_modules/_css-loader@6.8.1@css-loader/dist/cjs.js??clonedRuleSet-32.use[1]!./node_modules/_vue-loader@15.10.2@vue-loader/lib/loaders/stylePostLoader.js!./node_modules/_postcss-loader@6.2.1@postcss-loader/dist/cjs.js??clonedRuleSet-32.use[2]!./node_modules/_less-loader@5.0.0@less-loader/dist/cjs.js??clonedRuleSet-32.use[3]!./node_modules/_vue-loader@15.10.2@vue-loader/lib/index.js??vue-loader-options!./src/form/formula/formula-edit.vue?vue&type=style&index=0&id=86fb2a4e&prod&lang=less&
+;// CONCATENATED MODULE: ./node_modules/_mini-css-extract-plugin@2.7.6@mini-css-extract-plugin/dist/loader.js??clonedRuleSet-32.use[0]!./node_modules/_css-loader@6.8.1@css-loader/dist/cjs.js??clonedRuleSet-32.use[1]!./node_modules/_vue-loader@15.10.2@vue-loader/lib/loaders/stylePostLoader.js!./node_modules/_postcss-loader@6.2.1@postcss-loader/dist/cjs.js??clonedRuleSet-32.use[2]!./node_modules/_less-loader@5.0.0@less-loader/dist/cjs.js??clonedRuleSet-32.use[3]!./node_modules/_vue-loader@15.10.2@vue-loader/lib/index.js??vue-loader-options!./src/form/formula/formula-edit.vue?vue&type=style&index=0&id=75d03d8b&prod&lang=less&
 // extracted by mini-css-extract-plugin
 
-;// CONCATENATED MODULE: ./src/form/formula/formula-edit.vue?vue&type=style&index=0&id=86fb2a4e&prod&lang=less&
+;// CONCATENATED MODULE: ./src/form/formula/formula-edit.vue?vue&type=style&index=0&id=75d03d8b&prod&lang=less&
 
-;// CONCATENATED MODULE: ./node_modules/_mini-css-extract-plugin@2.7.6@mini-css-extract-plugin/dist/loader.js??clonedRuleSet-12.use[0]!./node_modules/_css-loader@6.8.1@css-loader/dist/cjs.js??clonedRuleSet-12.use[1]!./node_modules/_vue-loader@15.10.2@vue-loader/lib/loaders/stylePostLoader.js!./node_modules/_postcss-loader@6.2.1@postcss-loader/dist/cjs.js??clonedRuleSet-12.use[2]!./node_modules/_vue-loader@15.10.2@vue-loader/lib/index.js??vue-loader-options!./src/form/formula/formula-edit.vue?vue&type=style&index=1&id=86fb2a4e&prod&lang=css&
+;// CONCATENATED MODULE: ./node_modules/_mini-css-extract-plugin@2.7.6@mini-css-extract-plugin/dist/loader.js??clonedRuleSet-12.use[0]!./node_modules/_css-loader@6.8.1@css-loader/dist/cjs.js??clonedRuleSet-12.use[1]!./node_modules/_vue-loader@15.10.2@vue-loader/lib/loaders/stylePostLoader.js!./node_modules/_postcss-loader@6.2.1@postcss-loader/dist/cjs.js??clonedRuleSet-12.use[2]!./node_modules/_vue-loader@15.10.2@vue-loader/lib/index.js??vue-loader-options!./src/form/formula/formula-edit.vue?vue&type=style&index=1&id=75d03d8b&prod&lang=css&
 // extracted by mini-css-extract-plugin
 
-;// CONCATENATED MODULE: ./src/form/formula/formula-edit.vue?vue&type=style&index=1&id=86fb2a4e&prod&lang=css&
+;// CONCATENATED MODULE: ./src/form/formula/formula-edit.vue?vue&type=style&index=1&id=75d03d8b&prod&lang=css&
 
-;// CONCATENATED MODULE: ./node_modules/_mini-css-extract-plugin@2.7.6@mini-css-extract-plugin/dist/loader.js??clonedRuleSet-12.use[0]!./node_modules/_css-loader@6.8.1@css-loader/dist/cjs.js??clonedRuleSet-12.use[1]!./node_modules/_vue-loader@15.10.2@vue-loader/lib/loaders/stylePostLoader.js!./node_modules/_postcss-loader@6.2.1@postcss-loader/dist/cjs.js??clonedRuleSet-12.use[2]!./node_modules/_vue-loader@15.10.2@vue-loader/lib/index.js??vue-loader-options!./src/form/formula/formula-edit.vue?vue&type=style&index=2&id=86fb2a4e&prod&lang=css&
+;// CONCATENATED MODULE: ./node_modules/_mini-css-extract-plugin@2.7.6@mini-css-extract-plugin/dist/loader.js??clonedRuleSet-12.use[0]!./node_modules/_css-loader@6.8.1@css-loader/dist/cjs.js??clonedRuleSet-12.use[1]!./node_modules/_vue-loader@15.10.2@vue-loader/lib/loaders/stylePostLoader.js!./node_modules/_postcss-loader@6.2.1@postcss-loader/dist/cjs.js??clonedRuleSet-12.use[2]!./node_modules/_vue-loader@15.10.2@vue-loader/lib/index.js??vue-loader-options!./src/form/formula/formula-edit.vue?vue&type=style&index=2&id=75d03d8b&prod&lang=css&
 // extracted by mini-css-extract-plugin
 
-;// CONCATENATED MODULE: ./src/form/formula/formula-edit.vue?vue&type=style&index=2&id=86fb2a4e&prod&lang=css&
+;// CONCATENATED MODULE: ./src/form/formula/formula-edit.vue?vue&type=style&index=2&id=75d03d8b&prod&lang=css&
 
-;// CONCATENATED MODULE: ./node_modules/_mini-css-extract-plugin@2.7.6@mini-css-extract-plugin/dist/loader.js??clonedRuleSet-32.use[0]!./node_modules/_css-loader@6.8.1@css-loader/dist/cjs.js??clonedRuleSet-32.use[1]!./node_modules/_vue-loader@15.10.2@vue-loader/lib/loaders/stylePostLoader.js!./node_modules/_postcss-loader@6.2.1@postcss-loader/dist/cjs.js??clonedRuleSet-32.use[2]!./node_modules/_less-loader@5.0.0@less-loader/dist/cjs.js??clonedRuleSet-32.use[3]!./node_modules/_vue-loader@15.10.2@vue-loader/lib/index.js??vue-loader-options!./src/form/formula/formula-edit.vue?vue&type=style&index=3&id=86fb2a4e&prod&lang=less&
+;// CONCATENATED MODULE: ./node_modules/_mini-css-extract-plugin@2.7.6@mini-css-extract-plugin/dist/loader.js??clonedRuleSet-32.use[0]!./node_modules/_css-loader@6.8.1@css-loader/dist/cjs.js??clonedRuleSet-32.use[1]!./node_modules/_vue-loader@15.10.2@vue-loader/lib/loaders/stylePostLoader.js!./node_modules/_postcss-loader@6.2.1@postcss-loader/dist/cjs.js??clonedRuleSet-32.use[2]!./node_modules/_less-loader@5.0.0@less-loader/dist/cjs.js??clonedRuleSet-32.use[3]!./node_modules/_vue-loader@15.10.2@vue-loader/lib/index.js??vue-loader-options!./src/form/formula/formula-edit.vue?vue&type=style&index=3&id=75d03d8b&prod&lang=less&
 // extracted by mini-css-extract-plugin
 
-;// CONCATENATED MODULE: ./src/form/formula/formula-edit.vue?vue&type=style&index=3&id=86fb2a4e&prod&lang=less&
+;// CONCATENATED MODULE: ./src/form/formula/formula-edit.vue?vue&type=style&index=3&id=75d03d8b&prod&lang=less&
 
 ;// CONCATENATED MODULE: ./src/form/formula/formula-edit.vue
 
@@ -159971,8 +159972,8 @@ list_2.forEach(item => {
 
 var formula_edit_component = (0,componentNormalizer/* default */.Z)(
   formula_formula_editvue_type_script_lang_js_,
-  formula_editvue_type_template_id_86fb2a4e_render,
-  formula_editvue_type_template_id_86fb2a4e_staticRenderFns,
+  formula_editvue_type_template_id_75d03d8b_render,
+  formula_editvue_type_template_id_75d03d8b_staticRenderFns,
   false,
   null,
   null,

package/package.json

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