@panpanzhao/component-ui 0.0.9 → 0.0.12

package/lib/components/formula.js

@@ -82,7 +82,7 @@ module.exports =
 /******/
 /******/
 /******/ 	// Load entry module and return exports
-/******/ 	return __webpack_require__(__webpack_require__.s = 72);
+/******/ 	return __webpack_require__(__webpack_require__.s = 73);
 /******/ })
 /************************************************************************/
 /******/ ({
@@ -94,18 +94,19 @@ module.exports = require("@vue/babel-helper-vue-jsx-merge-props");
 
 /***/ }),
 
-/***/ 19:
+/***/ 20:
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
 
 // EXPORTS
-__webpack_require__.d(__webpack_exports__, "d", function() { return /* reexport */ uuid; });
-__webpack_require__.d(__webpack_exports__, "a", function() { return /* reexport */ findTree; });
-__webpack_require__.d(__webpack_exports__, "b", function() { return /* reexport */ findTreeIndex; });
-__webpack_require__.d(__webpack_exports__, "c", function() { return /* reexport */ spliceTreeSelf; });
+__webpack_require__.d(__webpack_exports__, "e", function() { return /* reexport */ uuid; });
+__webpack_require__.d(__webpack_exports__, "a", function() { return /* reexport */ eachTree; });
+__webpack_require__.d(__webpack_exports__, "b", function() { return /* reexport */ findTree; });
+__webpack_require__.d(__webpack_exports__, "c", function() { return /* reexport */ findTreeIndex; });
+__webpack_require__.d(__webpack_exports__, "d", function() { return /* reexport */ spliceTreeSelf; });
 
-// UNUSED EXPORTS: mapTree, eachTree, getTree, filterTree, everyTree, someTree, spliceTree, getTreeDepth, getTreeAncestors, getTreeParent
+// UNUSED EXPORTS: mapTree, getTree, filterTree, everyTree, someTree, spliceTree, getTreeDepth, getTreeAncestors, getTreeParent
 
 // CONCATENATED MODULE: ./src/utils/helper.js
 // 参考 https://github.com/streamich/v4-uuid
@@ -441,77 +442,77 @@ function spliceTreeSelf(tree, idx, deleteCount) {
 
 /***/ }),
 
-/***/ 20:
+/***/ 22:
 /***/ (function(module, exports) {
 
 module.exports = require("element-ui/lib/input");
 
 /***/ }),
 
-/***/ 29:
+/***/ 3:
 /***/ (function(module, exports) {
 
-module.exports = require("codemirror");
+module.exports = require("@panpanzhao/component-ui/lib/utils/formula");
 
 /***/ }),
 
-/***/ 5:
+/***/ 33:
 /***/ (function(module, exports) {
 
-module.exports = require("element-ui/lib/tabs");
+module.exports = require("codemirror");
 
 /***/ }),
 
-/***/ 59:
+/***/ 6:
 /***/ (function(module, exports) {
 
-module.exports = require("element-ui/lib/tree");
+module.exports = require("element-ui/lib/tabs");
 
 /***/ }),
 
-/***/ 6:
+/***/ 62:
 /***/ (function(module, exports) {
 
-module.exports = require("element-ui/lib/tab-pane");
+module.exports = require("element-ui/lib/tree");
 
 /***/ }),
 
-/***/ 60:
+/***/ 63:
 /***/ (function(module, exports) {
 
 module.exports = require("element-ui/lib/badge");
 
 /***/ }),
 
-/***/ 61:
+/***/ 64:
 /***/ (function(module, exports) {
 
 module.exports = require("element-ui/lib/message");
 
 /***/ }),
 
-/***/ 65:
+/***/ 66:
 /***/ (function(module, exports) {
 
 module.exports = require("codemirror/mode/javascript/javascript");
 
 /***/ }),
 
-/***/ 66:
+/***/ 67:
 /***/ (function(module, exports) {
 
 module.exports = require("codemirror/mode/htmlmixed/htmlmixed");
 
 /***/ }),
 
-/***/ 67:
+/***/ 68:
 /***/ (function(module, exports) {
 
 module.exports = require("codemirror/addon/mode/simple");
 
 /***/ }),
 
-/***/ 68:
+/***/ 69:
 /***/ (function(module, exports) {
 
 module.exports = require("codemirror/addon/mode/multiplex");
@@ -521,11 +522,11 @@ module.exports = require("codemirror/addon/mode/multiplex");
 /***/ 7:
 /***/ (function(module, exports) {
 
-module.exports = require("element-ui/lib/collapse");
+module.exports = require("element-ui/lib/tab-pane");
 
 /***/ }),
 
-/***/ 72:
+/***/ 73:
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -537,20 +538,20 @@ var babel_helper_vue_jsx_merge_props_ = __webpack_require__(0);
 var babel_helper_vue_jsx_merge_props_default = /*#__PURE__*/__webpack_require__.n(babel_helper_vue_jsx_merge_props_);
 
 // EXTERNAL MODULE: external "codemirror"
-var external_codemirror_ = __webpack_require__(29);
+var external_codemirror_ = __webpack_require__(33);
 var external_codemirror_default = /*#__PURE__*/__webpack_require__.n(external_codemirror_);
 
 // EXTERNAL MODULE: external "codemirror/mode/javascript/javascript"
-var javascript_ = __webpack_require__(65);
+var javascript_ = __webpack_require__(66);
 
 // EXTERNAL MODULE: external "codemirror/mode/htmlmixed/htmlmixed"
-var htmlmixed_ = __webpack_require__(66);
+var htmlmixed_ = __webpack_require__(67);
 
 // EXTERNAL MODULE: external "codemirror/addon/mode/simple"
-var simple_ = __webpack_require__(67);
+var simple_ = __webpack_require__(68);
 
 // EXTERNAL MODULE: external "codemirror/addon/mode/multiplex"
-var multiplex_ = __webpack_require__(68);
+var multiplex_ = __webpack_require__(69);
 
 // CONCATENATED MODULE: ./src/components/formula/src/codeMirror.js
 function _regeneratorRuntime() { "use strict"; /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/facebook/regenerator/blob/main/LICENSE */ _regeneratorRuntime = function _regeneratorRuntime() { return exports; }; var exports = {}, Op = Object.prototype, hasOwn = Op.hasOwnProperty, defineProperty = Object.defineProperty || function (obj, key, desc) { obj[key] = desc.value; }, $Symbol = "function" == typeof Symbol ? Symbol : {}, iteratorSymbol = $Symbol.iterator || "@@iterator", asyncIteratorSymbol = $Symbol.asyncIterator || "@@asyncIterator", toStringTagSymbol = $Symbol.toStringTag || "@@toStringTag"; function define(obj, key, value) { return Object.defineProperty(obj, key, { value: value, enumerable: !0, configurable: !0, writable: !0 }), obj[key]; } try { define({}, ""); } catch (err) { define = function define(obj, key, value) { return obj[key] = value; }; } function wrap(innerFn, outerFn, self, tryLocsList) { var protoGenerator = outerFn && outerFn.prototype instanceof Generator ? outerFn : Generator, generator = Object.create(protoGenerator.prototype), context = new Context(tryLocsList || []); return defineProperty(generator, "_invoke", { value: makeInvokeMethod(innerFn, self, context) }), generator; } function tryCatch(fn, obj, arg) { try { return { type: "normal", arg: fn.call(obj, arg) }; } catch (err) { return { type: "throw", arg: err }; } } exports.wrap = wrap; var ContinueSentinel = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} var IteratorPrototype = {}; define(IteratorPrototype, iteratorSymbol, function () { return this; }); var getProto = Object.getPrototypeOf, NativeIteratorPrototype = getProto && getProto(getProto(values([]))); NativeIteratorPrototype && NativeIteratorPrototype !== Op && hasOwn.call(NativeIteratorPrototype, iteratorSymbol) && (IteratorPrototype = NativeIteratorPrototype); var Gp = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(IteratorPrototype); function defineIteratorMethods(prototype) { ["next", "throw", "return"].forEach(function (method) { define(prototype, method, function (arg) { return this._invoke(method, arg); }); }); } function AsyncIterator(generator, PromiseImpl) { function invoke(method, arg, resolve, reject) { var record = tryCatch(generator[method], generator, arg); if ("throw" !== record.type) { var result = record.arg, value = result.value; return value && "object" == typeof value && hasOwn.call(value, "__await") ? PromiseImpl.resolve(value.__await).then(function (value) { invoke("next", value, resolve, reject); }, function (err) { invoke("throw", err, resolve, reject); }) : PromiseImpl.resolve(value).then(function (unwrapped) { result.value = unwrapped, resolve(result); }, function (error) { return invoke("throw", error, resolve, reject); }); } reject(record.arg); } var previousPromise; defineProperty(this, "_invoke", { value: function value(method, arg) { function callInvokeWithMethodAndArg() { return new PromiseImpl(function (resolve, reject) { invoke(method, arg, resolve, reject); }); } return previousPromise = previousPromise ? previousPromise.then(callInvokeWithMethodAndArg, callInvokeWithMethodAndArg) : callInvokeWithMethodAndArg(); } }); } function makeInvokeMethod(innerFn, self, context) { var state = "suspendedStart"; return function (method, arg) { if ("executing" === state) throw new Error("Generator is already running"); if ("completed" === state) { if ("throw" === method) throw arg; return doneResult(); } for (context.method = method, context.arg = arg;;) { var delegate = context.delegate; if (delegate) { var delegateResult = maybeInvokeDelegate(delegate, context); if (delegateResult) { if (delegateResult === ContinueSentinel) continue; return delegateResult; } } if ("next" === context.method) context.sent = context._sent = context.arg;else if ("throw" === context.method) { if ("suspendedStart" === state) throw state = "completed", context.arg; context.dispatchException(context.arg); } else "return" === context.method && context.abrupt("return", context.arg); state = "executing"; var record = tryCatch(innerFn, self, context); if ("normal" === record.type) { if (state = context.done ? "completed" : "suspendedYield", record.arg === ContinueSentinel) continue; return { value: record.arg, done: context.done }; } "throw" === record.type && (state = "completed", context.method = "throw", context.arg = record.arg); } }; } function maybeInvokeDelegate(delegate, context) { var methodName = context.method, method = delegate.iterator[methodName]; if (undefined === method) return context.delegate = null, "throw" === methodName && delegate.iterator.return && (context.method = "return", context.arg = undefined, maybeInvokeDelegate(delegate, context), "throw" === context.method) || "return" !== methodName && (context.method = "throw", context.arg = new TypeError("The iterator does not provide a '" + methodName + "' method")), ContinueSentinel; var record = tryCatch(method, delegate.iterator, context.arg); if ("throw" === record.type) return context.method = "throw", context.arg = record.arg, context.delegate = null, ContinueSentinel; var info = record.arg; return info ? info.done ? (context[delegate.resultName] = info.value, context.next = delegate.nextLoc, "return" !== context.method && (context.method = "next", context.arg = undefined), context.delegate = null, ContinueSentinel) : info : (context.method = "throw", context.arg = new TypeError("iterator result is not an object"), context.delegate = null, ContinueSentinel); } function pushTryEntry(locs) { var entry = { tryLoc: locs[0] }; 1 in locs && (entry.catchLoc = locs[1]), 2 in locs && (entry.finallyLoc = locs[2], entry.afterLoc = locs[3]), this.tryEntries.push(entry); } function resetTryEntry(entry) { var record = entry.completion || {}; record.type = "normal", delete record.arg, entry.completion = record; } function Context(tryLocsList) { this.tryEntries = [{ tryLoc: "root" }], tryLocsList.forEach(pushTryEntry, this), this.reset(!0); } function values(iterable) { if (iterable) { var iteratorMethod = iterable[iteratorSymbol]; if (iteratorMethod) return iteratorMethod.call(iterable); if ("function" == typeof iterable.next) return iterable; if (!isNaN(iterable.length)) { var i = -1, next = function next() { for (; ++i < iterable.length;) if (hasOwn.call(iterable, i)) return next.value = iterable[i], next.done = !1, next; return next.value = undefined, next.done = !0, next; }; return next.next = next; } } return { next: doneResult }; } function doneResult() { return { value: undefined, done: !0 }; } return GeneratorFunction.prototype = GeneratorFunctionPrototype, defineProperty(Gp, "constructor", { value: GeneratorFunctionPrototype, configurable: !0 }), defineProperty(GeneratorFunctionPrototype, "constructor", { value: GeneratorFunction, configurable: !0 }), GeneratorFunction.displayName = define(GeneratorFunctionPrototype, toStringTagSymbol, "GeneratorFunction"), exports.isGeneratorFunction = function (genFun) { var ctor = "function" == typeof genFun && genFun.constructor; return !!ctor && (ctor === GeneratorFunction || "GeneratorFunction" === (ctor.displayName || ctor.name)); }, exports.mark = function (genFun) { return Object.setPrototypeOf ? Object.setPrototypeOf(genFun, GeneratorFunctionPrototype) : (genFun.__proto__ = GeneratorFunctionPrototype, define(genFun, toStringTagSymbol, "GeneratorFunction")), genFun.prototype = Object.create(Gp), genFun; }, exports.awrap = function (arg) { return { __await: arg }; }, defineIteratorMethods(AsyncIterator.prototype), define(AsyncIterator.prototype, asyncIteratorSymbol, function () { return this; }), exports.AsyncIterator = AsyncIterator, exports.async = function (innerFn, outerFn, self, tryLocsList, PromiseImpl) { void 0 === PromiseImpl && (PromiseImpl = Promise); var iter = new AsyncIterator(wrap(innerFn, outerFn, self, tryLocsList), PromiseImpl); return exports.isGeneratorFunction(outerFn) ? iter : iter.next().then(function (result) { return result.done ? result.value : iter.next(); }); }, defineIteratorMethods(Gp), define(Gp, toStringTagSymbol, "Generator"), define(Gp, iteratorSymbol, function () { return this; }), define(Gp, "toString", function () { return "[object Generator]"; }), exports.keys = function (val) { var object = Object(val), keys = []; for (var key in object) keys.push(key); return keys.reverse(), function next() { for (; keys.length;) { var key = keys.pop(); if (key in object) return next.value = key, next.done = !1, next; } return next.done = !0, next; }; }, exports.values = values, Context.prototype = { constructor: Context, reset: function reset(skipTempReset) { if (this.prev = 0, this.next = 0, this.sent = this._sent = undefined, this.done = !1, this.delegate = null, this.method = "next", this.arg = undefined, this.tryEntries.forEach(resetTryEntry), !skipTempReset) for (var name in this) "t" === name.charAt(0) && hasOwn.call(this, name) && !isNaN(+name.slice(1)) && (this[name] = undefined); }, stop: function stop() { this.done = !0; var rootRecord = this.tryEntries[0].completion; if ("throw" === rootRecord.type) throw rootRecord.arg; return this.rval; }, dispatchException: function dispatchException(exception) { if (this.done) throw exception; var context = this; function handle(loc, caught) { return record.type = "throw", record.arg = exception, context.next = loc, caught && (context.method = "next", context.arg = undefined), !!caught; } for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i], record = entry.completion; if ("root" === entry.tryLoc) return handle("end"); if (entry.tryLoc <= this.prev) { var hasCatch = hasOwn.call(entry, "catchLoc"), hasFinally = hasOwn.call(entry, "finallyLoc"); if (hasCatch && hasFinally) { if (this.prev < entry.catchLoc) return handle(entry.catchLoc, !0); if (this.prev < entry.finallyLoc) return handle(entry.finallyLoc); } else if (hasCatch) { if (this.prev < entry.catchLoc) return handle(entry.catchLoc, !0); } else { if (!hasFinally) throw new Error("try statement without catch or finally"); if (this.prev < entry.finallyLoc) return handle(entry.finallyLoc); } } } }, abrupt: function abrupt(type, arg) { for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i]; if (entry.tryLoc <= this.prev && hasOwn.call(entry, "finallyLoc") && this.prev < entry.finallyLoc) { var finallyEntry = entry; break; } } finallyEntry && ("break" === type || "continue" === type) && finallyEntry.tryLoc <= arg && arg <= finallyEntry.finallyLoc && (finallyEntry = null); var record = finallyEntry ? finallyEntry.completion : {}; return record.type = type, record.arg = arg, finallyEntry ? (this.method = "next", this.next = finallyEntry.finallyLoc, ContinueSentinel) : this.complete(record); }, complete: function complete(record, afterLoc) { if ("throw" === record.type) throw record.arg; return "break" === record.type || "continue" === record.type ? this.next = record.arg : "return" === record.type ? (this.rval = this.arg = record.arg, this.method = "return", this.next = "end") : "normal" === record.type && afterLoc && (this.next = afterLoc), ContinueSentinel; }, finish: function finish(finallyLoc) { for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i]; if (entry.finallyLoc === finallyLoc) return this.complete(entry.completion, entry.afterLoc), resetTryEntry(entry), ContinueSentinel; } }, catch: function _catch(tryLoc) { for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i]; if (entry.tryLoc === tryLoc) { var record = entry.completion; if ("throw" === record.type) { var thrown = record.arg; resetTryEntry(entry); } return thrown; } } throw new Error("illegal catch attempt"); }, delegateYield: function delegateYield(iterable, resultName, nextLoc) { return this.delegate = { iterator: values(iterable), resultName: resultName, nextLoc: nextLoc }, "next" === this.method && (this.arg = undefined), ContinueSentinel; } }, exports; }
@@ -651,15 +652,15 @@ function _asyncToGenerator(fn) { return function () { var self = this, args = ar
   }
 });
 // EXTERNAL MODULE: external "element-ui/lib/input"
-var input_ = __webpack_require__(20);
+var input_ = __webpack_require__(22);
 var input_default = /*#__PURE__*/__webpack_require__.n(input_);
 
 // EXTERNAL MODULE: external "element-ui/lib/collapse"
-var collapse_ = __webpack_require__(7);
+var collapse_ = __webpack_require__(8);
 var collapse_default = /*#__PURE__*/__webpack_require__.n(collapse_);
 
 // EXTERNAL MODULE: external "element-ui/lib/collapse-item"
-var collapse_item_ = __webpack_require__(8);
+var collapse_item_ = __webpack_require__(9);
 var collapse_item_default = /*#__PURE__*/__webpack_require__.n(collapse_item_);
 
 // CONCATENATED MODULE: ./src/components/formula/src/funcList.js
@@ -781,23 +782,23 @@ function _extends() { _extends = Object.assign ? Object.assign.bind() : function
   }
 });
 // EXTERNAL MODULE: external "element-ui/lib/tabs"
-var tabs_ = __webpack_require__(5);
+var tabs_ = __webpack_require__(6);
 var tabs_default = /*#__PURE__*/__webpack_require__.n(tabs_);
 
 // EXTERNAL MODULE: external "element-ui/lib/tab-pane"
-var tab_pane_ = __webpack_require__(6);
+var tab_pane_ = __webpack_require__(7);
 var tab_pane_default = /*#__PURE__*/__webpack_require__.n(tab_pane_);
 
 // EXTERNAL MODULE: external "element-ui/lib/tree"
-var tree_ = __webpack_require__(59);
+var tree_ = __webpack_require__(62);
 var tree_default = /*#__PURE__*/__webpack_require__.n(tree_);
 
 // EXTERNAL MODULE: external "element-ui/lib/badge"
-var badge_ = __webpack_require__(60);
+var badge_ = __webpack_require__(63);
 var badge_default = /*#__PURE__*/__webpack_require__.n(badge_);
 
 // EXTERNAL MODULE: ./src/utils/index.js + 2 modules
-var utils = __webpack_require__(19);
+var utils = __webpack_require__(20);
 
 // CONCATENATED MODULE: ./src/components/formula/src/variableList.js
 
@@ -848,7 +849,7 @@ var utils = __webpack_require__(19);
   methods: {
     handleSearch: function handleSearch(val) {
       this.searchVal = val;
-      var filtered = Object(utils["a" /* findTree */])(this.data, function (i) {
+      var filtered = Object(utils["b" /* findTree */])(this.data, function (i) {
         return ~i.label.indexOf(val);
       });
       this.filterVars = !val ? this.data : filtered ? [filtered] : [];
@@ -890,7 +891,7 @@ var utils = __webpack_require__(19);
         "attrs": {
           "value": "self"
         }
-      }, [h("label", [data.label])]), data.label && (!this.selfVariableName || data.value !== this.selfVariableName) && h("label", [data.label]), data.tag ? h("span", {
+      }, [h("label", [data.label])]), data.label && (!this.selfVariableName || data.value !== this.selfVariableName) && h("label", [data.label]), data.label && data.tag ? h("span", {
         "class": this.classPrefix + "-item-tag"
       }, [data.tag]) : null]);
     },
@@ -991,30 +992,10 @@ var utils = __webpack_require__(19);
   }
 });
 // CONCATENATED MODULE: ./src/components/formula/src/plugin.js
-/**
- * @file 扩展 codemirror
- */
 
 /**
- * 遍历树
- * @param tree
- * @param iterator
+ * @file 扩展 codemirror
  */
-function eachTree(tree, iterator, level, paths) {
-  if (level === void 0) {
-    level = 1;
-  }
-  if (paths === void 0) {
-    paths = [];
-  }
-  tree.map(function (item, index) {
-    var currentPath = paths.concat(item);
-    iterator(item, index, level, currentPath);
-    if (item.children && item.children.splice) {
-      eachTree(item.children, iterator, level + 1, currentPath);
-    }
-  });
-}
 function replaceStrByIndex(str, idx, key, replaceKey) {
   var from = str.slice(0, idx);
   var left = str.slice(idx);
@@ -1032,20 +1013,29 @@ function plugin_editorFactory(dom, cm, props) {
     mode: props && props.evalMode ? 'text/formula' : 'text/formula-template'
   });
 }
-var FormulaPlugin = /*#__PURE__*/function () {
+var plugin_FormulaPlugin = /*#__PURE__*/function () {
   function FormulaPlugin(editor, cm, getProps) {
+    var _this = this;
     this.editor = editor;
     this.cm = cm;
     this.getProps = getProps;
-    // editor.on('change', this.autoMarkText);
+    editor.on('change', function (editorDom) {
+      //处理第一次初始化
+      var val = editorDom.getDoc().getValue();
+      var _this$getProps = _this.getProps(),
+        value = _this$getProps.value;
+      if (val == value) {
+        _this.autoMarkText();
+      }
+    });
     this.autoMarkText();
   }
   var _proto = FormulaPlugin.prototype;
   _proto.autoMarkText = function autoMarkText() {
-    var _this$getProps = this.getProps(),
-      functions = _this$getProps.functions,
-      variables = _this$getProps.variables,
-      value = _this$getProps.value;
+    var _this$getProps2 = this.getProps(),
+      functions = _this$getProps2.functions,
+      variables = _this$getProps2.variables,
+      value = _this$getProps2.value;
     if (value) {
       // todo functions 也需要自动替换
       this.autoMark(variables);
@@ -1115,8 +1105,8 @@ var FormulaPlugin = /*#__PURE__*/function () {
   };
   _proto.insertContent = function insertContent(value, type) {
     var from = this.editor.getCursor();
-    var _this$getProps2 = this.getProps(),
-      evalMode = _this$getProps2.evalMode;
+    var _this$getProps3 = this.getProps(),
+      evalMode = _this$getProps3.evalMode;
     if (type === 'variable') {
       this.editor.replaceSelection(value.key);
       var to = this.editor.getCursor();
@@ -1158,12 +1148,12 @@ var FormulaPlugin = /*#__PURE__*/function () {
     });
   };
   _proto.autoMark = function autoMark(variables) {
-    var _this = this;
+    var _this2 = this;
     if (!Array.isArray(variables) || !variables.length) {
       return;
     }
     var varMap = {};
-    eachTree(variables, function (item) {
+    Object(utils["a" /* eachTree */])(variables, function (item) {
       if (item.value) {
         varMap[item.value] = item.label;
       }
@@ -1173,14 +1163,14 @@ var FormulaPlugin = /*#__PURE__*/function () {
     });
     var editor = this.editor;
     var lines = editor.lineCount();
-    var _this$getProps3 = this.getProps(),
-      _this$getProps3$evalM = _this$getProps3.evalMode,
-      evalMode = _this$getProps3$evalM === void 0 ? true : _this$getProps3$evalM;
+    var _this$getProps4 = this.getProps(),
+      _this$getProps4$evalM = _this$getProps4.evalMode,
+      evalMode = _this$getProps4$evalM === void 0 ? true : _this$getProps4$evalM;
     var _loop = function _loop(line) {
       var content = editor.getLine(line);
       // 标记方法调用
       content.replace(/([A-Z]+)\s*\(/g, function (_, func, pos) {
-        _this.markText({
+        _this2.markText({
           line: line,
           ch: pos
         }, {
@@ -1198,7 +1188,7 @@ var FormulaPlugin = /*#__PURE__*/function () {
           var encode = replaceStrByIndex(content, idx, v, REPLACE_KEY);
           var reg = getRegExpByMode(evalMode, REPLACE_KEY);
           if (reg.test(encode)) {
-            _this.markText({
+            _this2.markText({
               line: line,
               ch: idx
             }, {
@@ -1236,7 +1226,6 @@ function registerLaunguageMode(cm) {
   cm.defineMode('formula', function (config, parserConfig) {
     var formula = cm.getMode(config, 'javascript');
     if (!parserConfig || !parserConfig.base) return formula;
-    debugger;
     return cm.multiplexingMode(cm.getMode(config, parserConfig.base), {
       open: '${',
       close: '}',
@@ -2795,9 +2784,12 @@ function registerLaunguageMode(cm) {
   namespace: "其他"
 }]);
 // EXTERNAL MODULE: external "element-ui/lib/message"
-var message_ = __webpack_require__(61);
+var message_ = __webpack_require__(64);
 var message_default = /*#__PURE__*/__webpack_require__.n(message_);
 
+// EXTERNAL MODULE: external "@panpanzhao/component-ui/lib/utils/formula"
+var formula_ = __webpack_require__(3);
+
 // CONCATENATED MODULE: ./src/components/formula/src/index.js
 
 
@@ -2808,6 +2800,8 @@ var message_default = /*#__PURE__*/__webpack_require__.n(message_);
 
 
 
+
+
 /* harmony default export */ var src = ({
   name: "Formula",
   componentName: "Formula",
@@ -2873,7 +2867,7 @@ var message_default = /*#__PURE__*/__webpack_require__.n(message_);
     },
     handleEditorMounted: function handleEditorMounted(cm, editor) {
       var _this = this;
-      this.editorPlugin = new FormulaPlugin(editor, cm, function () {
+      this.editorPlugin = new plugin_FormulaPlugin(editor, cm, function () {
         return _this.$props;
       });
     },
@@ -2907,6 +2901,7 @@ var message_default = /*#__PURE__*/__webpack_require__.n(message_);
       }, 'variable');
     },
     handleChange: function handleChange(value) {
+      this.$emit("input", value);
       this.$emit("change", value);
     },
     handleFocus: function handleFocus() {
@@ -2920,6 +2915,74 @@ var message_default = /*#__PURE__*/__webpack_require__.n(message_);
         value: "name",
         label: "名称"
       });
+    },
+    validate: function validate() {
+      var value = this.value;
+      try {
+        value ? Object(formula_["parse"])(value, {
+          evalMode: this.evalMode
+        }) : null;
+      } catch (e) {
+        return "\u516C\u5F0F\u503C\u6821\u9A8C\u9519\u8BEF\uFF0C\u9519\u8BEF\u7684\u4F4D\u7F6E/\u539F\u56E0\u662F " + e.message;
+      }
+      return;
+    },
+    replaceStrByIndex: function replaceStrByIndex(str, idx, key, replaceKey) {
+      var from = str.slice(0, idx);
+      var left = str.slice(idx);
+      return from + left.replace(key, replaceKey);
+    },
+    getRegExpByMode: function getRegExpByMode(evalMode, key) {
+      var reg = evalMode ? "\\b" + key + "\\b" : "\\$\\{[^\\{\\}]*\\b" + key + "\\b[^\\{\\}]*\\}";
+      return new RegExp(reg);
+    },
+    highlightValue: function highlightValue(value, variables, evalMode) {
+      var _this2 = this;
+      if (evalMode === void 0) {
+        evalMode = true;
+      }
+      if (!Array.isArray(variables) || !variables.length || !value) {
+        return;
+      }
+      var varMap = {};
+      Object(utils["a" /* eachTree */])(variables, function (item) {
+        if (item.value) {
+          var key = item.value;
+          varMap[key] = item.label;
+        }
+      });
+      var vars = Object.keys(varMap).filter(function (item) {
+        return item;
+      }).sort(function (a, b) {
+        return b.length - a.length;
+      });
+      var content = value || '';
+      var html = '';
+
+      // 标记方法调用
+      html = content.replace(/([A-Z]+)\s*\(/g, function (_, func, pos) {
+        return _ && _.replace(func, "<span class=\"c-func\">" + func + "</span>");
+      });
+      var REPLACE_KEY = 'AMIS_FORMULA_REPLACE_KEY';
+      vars.forEach(function (v) {
+        var from = 0;
+        var idx = -1;
+        while (~(idx = content.indexOf(v, from))) {
+          var encodeHtml = _this2.replaceStrByIndex(html, idx, v, REPLACE_KEY);
+          var reg = _this2.getRegExpByMode(evalMode, REPLACE_KEY);
+
+          // 如果匹配到则高亮，没有匹配到替换成原值
+          if (reg.test(encodeHtml)) {
+            html = encodeHtml.replace(REPLACE_KEY, "<span class=\"c-field\">" + varMap[v] + "</span>");
+          } else {
+            html = encodeHtml.replace(REPLACE_KEY, v);
+          }
+          from = idx + v.length;
+        }
+      });
+      return {
+        html: html
+      };
     }
   },
   beforeDestroy: function beforeDestroy() {
@@ -2994,6 +3057,13 @@ src.install = function (Vue) {
 /***/ 8:
 /***/ (function(module, exports) {
 
+module.exports = require("element-ui/lib/collapse");
+
+/***/ }),
+
+/***/ 9:
+/***/ (function(module, exports) {
+
 module.exports = require("element-ui/lib/collapse-item");
 
 /***/ })