Merge branch 'master' of http://47.110.251.215:3000/web/saber

src/views/formula/component/funComponent/datasGetlist.vue

@@ -23,7 +23,7 @@
 
 <script>
 export default {
-  name: "dateFormat",
+  name: "datasGetlist",
   props: {
     formulainfo: {
       type: Object,
@@ -41,15 +41,16 @@ export default {
   data(){
     return{
       radio:1,
-      input:'0'
+      input:'1'
     }
   },
   mounted(){
     //console.log(this.formulainfo.arguments[0])
     //console.log(this.formulainfo.arguments[1])
     let arg1 = this.formulainfo.arguments[1];
-    if(arg1 == '0' || arg1 == undefined){
+    if(arg1 == 'first' || arg1 == undefined){
       this.radio = 1;
+      this.formulainfo.arguments[1] = 'first';
     }else if(arg1 == 'last'){
       this.radio = 3;
     }else{
@@ -65,7 +66,7 @@ export default {
 
     radioChange(value){
       if(value == 1){
-        this.formulainfo.arguments[1] = '0';
+        this.formulainfo.arguments[1] = 'first';
       }else if(value == 3){
         this.formulainfo.arguments[1] = 'last';
       }else if(value == 2){

src/views/formula/component/funComponent/datasJoin.vue

@@ -17,7 +17,7 @@
 
 <script>
 export default {
-  name: "dateFormat",
+  name: "datasJoin",
   props: {
     formulainfo: {
       type: Object,

src/views/formula/component/funComponent/datasReme.vue

@@ -17,7 +17,7 @@
 
 <script>
 export default {
-  name: "dateFormat",
+  name: "datasReme",
   props: {
     formulainfo: {
       type: Object,

src/views/formula/component/funComponent/datasRepeat.vue

@@ -17,7 +17,7 @@
 
 <script>
 export default {
-  name: "dateFormat",
+  name: "datasRepeat",
   props: {
     formulainfo: {
       type: Object,

src/views/formula/component/funComponent/ifelse.vue

@@ -123,7 +123,7 @@ import VueTagsInput from '@johmun/vue-tags-input';
 import formulaItem from "../formulaItem";
 import draggable from 'vuedraggable';
 export default {
-  name: "dateFormat",
+  name: "ifelse",
   components: {
     draggable,
 

src/views/formula/edit.vue

@@ -477,7 +477,7 @@ export default {
     },
     fromcurNode:{
       type:Object,
-      default:{}
+      default:() => ({})
     }
   },
   data() {
@@ -531,7 +531,7 @@ export default {
 
       symbolReg:/(\+|-|\*|\/)（.+）/,
       operatorReg : /^\+|-|\*|%/,//加减乘除
-      startFCRegExp : /^FC\.([a-zA-Z]+)\(/,// 匹配开始的FC.xxx(
+      startFCRegExp : /^FC\.([a-zA-Z0-9]+)\(/,// 匹配开始的FC.xxx(
 
       componentMap:{
         '日期偏移':'date-deviation',

src/views/formula/formulaStringToArray.js

@@ -173,7 +173,7 @@ function getRootElement(children,rootObj){
 export const formulaStringToArray = (text,elemap,formulaMap) => {
 
   // 匹配开始的FC.xxx(
-  const startFCRegExp = /^FC\.([a-zA-Z]+)\(/;
+  const startFCRegExp = /^FC\.([a-zA-Z0-9]+)\(/;
   const startBracketsReg = /^\(/;//左括号
   const endBracketsReg = /^\)/;//右括号
   const elementReg = /^E\[(.[^\]]+_.[^\]]+)\]/;//元素