centaline-data-driven 1.2.63 → 1.2.64

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "centaline-data-driven",
-  "version": "1.2.63",
+  "version": "1.2.64",
   "description": "ccai",
   "author": "hjc <3226136347@qq.com>",
   "private": false,
@@ -16,10 +16,12 @@
     "babel-polyfill": "^6.26.0",
     "compression-webpack-plugin": "^2.0.0",
     "element-ui": "^2.15.7",
+    "module": "^1.2.5",
     "sass": "^1.34.0",
     "save": "^2.4.0",
-    "vue": "2.5.17",
     "v-viewer": "^1.6.4",
+    "vue": "2.5.17",
+    "vue-ueditor-wrap": "^2.5.6",
     "vuedraggable": "^2.24.3"
   },
   "peerDependencies": {

package/src/centaline/dynamicContact/src/dynamicContact.vue

@@ -1,5 +1,5 @@
 <template>
-  <div v-if="apiRouter!=={} && model && model.listData.length>0"
+  <div ref="contact" v-if="apiRouter!=={} && model && model.listData.length>0"
     style="border: 1px solid #ECEFF2;box-shadow: 0 2px 4px 0 rgba(0,0,0,0.06);border-radius: 6px;
     padding-bottom: 10px;padding-top: 10px;padding-left: 10px;display: flex;font-size: 12px;width:100%">
     <div class="ct-so" style="width:auto;margin-right: 10px;">        
@@ -7,10 +7,11 @@
         <div>
           <ctSelectOptionVertical :model="model" @click="selectOption($event)"></ctSelectOptionVertical>
         </div>
-        <input slot="reference" readonly="readonly" ref="ct-input" style="font-weight: Bold;color:#333333 !important;"
-        :style="{height:inputHeight + 'px','line-height':inputLineHeight + 'px'}"
-        @focus="focusHandle" @blur="blurHandle" @click="clickHandle" @input="inputHandler($event)" v-model="model.text" 
-        @change="changeHandler($event)" :disabled="model.lock" :class="model.lock ? 'ct-is-disabled' : 'ct-input_inner'" />
+        <div slot="reference" readonly="readonly" ref="ct-input"
+        style="font-weight: Bold;color:#333333 !important;white-space: nowrap;overflow: hidden;text-overflow: ellipsis;"
+        :style="{height:inputHeight + 'px','line-height':inputLineHeight + 'px',width:inputLinewidth+'px'}"
+        @focus="focusHandle" @blur="blurHandle" @click="clickHandle" @input="inputHandler($event)" v-html="model.text"
+        @change="changeHandler($event)" :disabled="model.lock" :class="model.lock ? 'ct-is-disabled' : 'ct-input_inner'"></div>
       </el-popover>
       <span class="el-input__suffix" @click="clickHandle" :class="[model.attrs.size?'el-input--'+model.attrs.size:'']">
         <span class="el-input__suffix-inner">
@@ -18,7 +19,7 @@
         </span>
       </span>
     </div>
-    <div style="margin-left: 5px;display: flex;">
+    <div ref="routers" style="margin-left: 5px;display: flex;">
       <component v-for="(router, index) in model.rowRouter" :key="index" :ref="'router'+router.id"
       v-if="!router.rightField || model.listData[model.value][router.rightField] == 1" 
       :is="router.is" :vmodel="router" :api="model.optionApi" @click="fieldClickHandler(router)">
@@ -53,6 +54,7 @@
         showDrop: false,
         inputHeight: 26,
         inputLineHeight: 26,
+        inputLinewidth: 150,
       }
     },
     created() {
@@ -69,7 +71,10 @@
         }
       });   
     },
-    activated() {      
+    activated() {
+      this.$nextTick(() => {
+        this.setCss();
+      })
     },
     methods: {
       load(data) {
@@ -79,6 +84,12 @@
           this.model.text=data.listData[0][data.columns[0].id];
           this.model.value=0;
         }
+        this.setCss();
+        this.$nextTick(() => {
+          window.addEventListener("resize", (ev) => {
+            self.setCss();
+          });
+        });
       },
       focusHandle: function () {
         this.$refs['ct-input'].focus();
@@ -286,6 +297,15 @@
           clickAcion(field,submitData);
         }
       },
+      setCss() {
+        this.$nextTick(() => {
+          if (this.$refs.contact) {
+            var w1 = this.$refs.contact.clientWidth | 0;
+            var w2 = this.$refs.routers.clientWidth | 0;
+            this.inputLinewidth=w1-w2-50;
+          }
+        });
+      }, 
     }
   }
 </script>

package/src/centaline/dynamicRepeat/src/dynamicRepeat.vue

@@ -97,7 +97,6 @@
       fieldsValidExcute() {
         var self = this;
         var rtnBool = true;
-        debugger
         if (typeof self.$refs.Fields !== 'undefined') {
           self.$refs.Fields.forEach((f) => {
             if (typeof f.validExcute !== 'undefined') {

package/src/centaline/dynamicRichText/index.js

@@ -1,11 +1,11 @@
-import dynamic from './src/dynamicRichText';
+import dynamicRichText from './src/dynamicRichText';
 
-dynamic.install = function (Vue) {
-  Vue.component(dynamic.name, dynamic);
+dynamicRichText.install = function (Vue) {
+  Vue.component(dynamicRichText.name, dynamicRichText);
 }
 
 if (typeof window !== 'undefined' && window.Vue) {
-  window.Vue.use(dynamic);
+  window.Vue.use(dynamicRichText);
 }
 
-export default dynamic;
+export default dynamicRichText;

package/src/centaline/dynamicRichText/src/dynamicRichText.vue

@@ -1,31 +1,267 @@
 <template>
   <div class="field-top">
-    <div class="ct-rich-text" style="width:100%;display:flex" v-if="model !== null">
-      <p v-html="model.value"></p>
+    <div class="ct-rich-text"
+         style="width: 100%;"
+         v-if="model !== null">
+      <vue-ueditor-wrap ref="editor" v-model="model.value" :config="config"></vue-ueditor-wrap>
     </div>
   </div>
 </template>
 <script>
-  import dynamicElement from '../../mixins/dynamicElement';
+
+  import VueUeditorWrap from 'vue-ueditor-wrap'
+
+  import dynamicElement from "../../mixins/dynamicElement";
+  import Enum from "../../loader/src/ctl/lib/Enum";
+
   export default {
-    name: 'ct-rich-text',
+    name: "ct-rich-text",
     mixins: [dynamicElement],
+    components: {
+      VueUeditorWrap,
+    },
     props: {
-      vmodel: Object
+      vmodel: Object,
     },
     data() {
-      return {
+      const that = this;
+      return {  
+        editor: {},
+        config: {
+          serverUrl: "",
+          UEDITOR_HOME_URL: '/static/UEditor/',
+          readonly: false,
+          initialFrameHeight: 300,
+          initialFrameWidth: '100%',
+          autoFloatEnabled: true,
+          maximumWords: 5000,
+          toolbars: [[
+            'fullscreen',
+            'source',
+            '|',
+            'undo',
+            'redo',
+            '|',
+            'bold',
+            'italic',
+            'underline',
+            'fontborder',
+            'strikethrough',
+            'superscript',
+            'subscript',
+            'removeformat',
+            'formatmatch',
+            'autotypeset',
+            'blockquote',
+            'pasteplain',
+            '|',
+            'forecolor',
+            'backcolor',
+            'insertorderedlist',
+            'insertunorderedlist',
+            'selectall',
+            'cleardoc',
+            '|',
+            'rowspacingtop',
+            'rowspacingbottom',
+            'lineheight',
+            '|',
+            'customstyle',
+            'paragraph',
+            'fontfamily',
+            'fontsize',
+            '|',
+            'directionalityltr',
+            'directionalityrtl',
+            'indent',
+            '|',
+            'justifyleft',
+            'justifycenter',
+            'justifyright',
+            'justifyjustify',
+            '|',
+            'touppercase',
+            'tolowercase',
+            '|',
+            'link',
+            'unlink',
+            'anchor',
+            '|',
+            'imagenone',
+            'imageleft',
+            'imageright',
+            'imagecenter',
+            '|',
+            //'simpleupload',
+            'insertimage',
+            'emotion',
+            'scrawl',
+            'insertvideo',
+            'music',
+            'attachment',
+            'map',
+            'gmap',
+            'insertframe',
+            'insertcode',
+            'webapp',
+            'pagebreak',
+            'template',
+            'background',
+            '|',
+            'horizontal',
+            'date',
+            'time',
+            'spechars',
+            'wordimage',
+            '|',
+            'inserttable',
+            'deletetable',
+            'insertparagraphbeforetable',
+            'insertrow',
+            'deleterow',
+            'insertcol',
+            'deletecol',
+            'mergecells',
+            'mergeright',
+            'mergedown',
+            'splittocells',
+            'splittorows',
+            'splittocols',
+            'charts',
+            '|',
+            'print',
+            'preview',
+            'searchreplace',
+            'drafts',
+            'help'
+          ]],
+          zIndex: 16777271,
+          /* 上传图片配置项 */
+          "imageActionName": "uploadimage222", /* 执行上传图片的action名称 */
+          "imageFieldName": "file", /* 提交的图片表单名称 */
+          "imageMaxSize": 2048000, /* 上传大小限制，单位B */
+          "imageAllowFiles": [".png", ".jpg", ".jpeg", ".gif", ".bmp"], /* 上传图片格式显示 */
+          "imageCompressEnable": true, /* 是否压缩图片,默认是true */
+          "imageCompressBorder": 1600, /* 图片压缩最长边限制 */
+          "imageInsertAlign": "none", /* 插入的图片浮动方式 */
+          "imageUrlPrefix": "", /* 图片访问路径前缀 */
+          "imagePathFormat": "/ueditor/jsp/upload/image/{yyyy}{mm}{dd}/{time}{rand:6}", /* 上传保存路径,可以自定义保存路径和文件名格式 */
+          /* {filename} 会替换成原文件名,配置这项需要注意中文乱码问题 */
+          /* {rand:6} 会替换成随机数,后面的数字是随机数的位数 */
+          /* {time} 会替换成时间戳 */
+          /* {yyyy} 会替换成四位年份 */
+          /* {yy} 会替换成两位年份 */
+          /* {mm} 会替换成两位月份 */
+          /* {dd} 会替换成两位日期 */
+          /* {hh} 会替换成两位小时 */
+          /* {ii} 会替换成两位分钟 */
+          /* {ss} 会替换成两位秒 */
+          /* 非法字符 \ : * ? " < > | */
+          /* 具请体看线上文档: fex.baidu.com/ueditor/#use-format_upload_filename */
+
+          /* 涂鸦图片上传配置项 */
+          "scrawlActionName": "uploadscrawl", /* 执行上传涂鸦的action名称 */
+          "scrawlFieldName": "file", /* 提交的图片表单名称 */
+          "scrawlPathFormat": "/ueditor/jsp/upload/image/{yyyy}{mm}{dd}/{time}{rand:6}", /* 上传保存路径,可以自定义保存路径和文件名格式 */
+          "scrawlMaxSize": 2048000, /* 上传大小限制，单位B */
+          "scrawlUrlPrefix": "", /* 图片访问路径前缀 */
+          "scrawlInsertAlign": "none",
+
+          /* 截图工具上传 */
+          "snapscreenActionName": "uploadimage", /* 执行上传截图的action名称 */
+          "snapscreenPathFormat": "/ueditor/jsp/upload/image/{yyyy}{mm}{dd}/{time}{rand:6}", /* 上传保存路径,可以自定义保存路径和文件名格式 */
+          "snapscreenUrlPrefix": "", /* 图片访问路径前缀 */
+          "snapscreenInsertAlign": "none", /* 插入的图片浮动方式 */
+
+          /* 抓取远程图片配置 */
+          "catcherLocalDomain": ["127.0.0.1", "localhost", "img.baidu.com"],
+          "catcherActionName": "catchimage", /* 执行抓取远程图片的action名称 */
+          "catcherFieldName": "source", /* 提交的图片列表表单名称 */
+          "catcherPathFormat": "/ueditor/jsp/upload/image/{yyyy}{mm}{dd}/{time}{rand:6}", /* 上传保存路径,可以自定义保存路径和文件名格式 */
+          "catcherUrlPrefix": "", /* 图片访问路径前缀 */
+          "catcherMaxSize": 2048000, /* 上传大小限制，单位B */
+          "catcherAllowFiles": [".png", ".jpg", ".jpeg", ".gif", ".bmp"], /* 抓取图片格式显示 */
+
+          /* 上传视频配置 */
+          "videoActionName": "uploadvideo", /* 执行上传视频的action名称 */
+          "videoFieldName": "file", /* 提交的视频表单名称 */
+          "videoPathFormat": "/ueditor/jsp/upload/video/{yyyy}{mm}{dd}/{time}{rand:6}", /* 上传保存路径,可以自定义保存路径和文件名格式 */
+          "videoUrlPrefix": "", /* 视频访问路径前缀 */
+          "videoMaxSize": 102400000, /* 上传大小限制，单位B，默认100MB */
+          "videoAllowFiles": [
+            ".flv", ".swf", ".mkv", ".avi", ".rm", ".rmvb", ".mpeg", ".mpg",
+            ".ogg", ".ogv", ".mov", ".wmv", ".mp4", ".webm", ".mp3", ".wav", ".mid"], /* 上传视频格式显示 */
+
+          /* 上传文件配置 */
+          "fileActionName": "uploadfile", /* controller里,执行上传视频的action名称 */
+          "fileFieldName": "file", /* 提交的文件表单名称 */
+          "filePathFormat": "/ueditor/jsp/upload/file/{yyyy}{mm}{dd}/{time}{rand:6}", /* 上传保存路径,可以自定义保存路径和文件名格式 */
+          "fileUrlPrefix": "", /* 文件访问路径前缀 */
+          "fileMaxSize": 51200000, /* 上传大小限制，单位B，默认50MB */
+          "fileAllowFiles": [
+            ".png", ".jpg", ".jpeg", ".gif", ".bmp",
+            ".flv", ".swf", ".mkv", ".avi", ".rm", ".rmvb", ".mpeg", ".mpg",
+            ".ogg", ".ogv", ".mov", ".wmv", ".mp4", ".webm", ".mp3", ".wav", ".mid",
+            ".rar", ".zip", ".tar", ".gz", ".7z", ".bz2", ".cab", ".iso",
+            ".doc", ".docx", ".xls", ".xlsx", ".ppt", ".pptx", ".pdf", ".txt", ".md", ".xml"
+          ], /* 上传文件格式显示 */
+
+          /* 列出指定目录下的图片 */
+          "imageManagerActionName": "listimage", /* 执行图片管理的action名称 */
+          "imageManagerListPath": "/ueditor/jsp/upload/image/", /* 指定要列出图片的目录 */
+          "imageManagerListSize": 20, /* 每次列出文件数量 */
+          "imageManagerUrlPrefix": "", /* 图片访问路径前缀 */
+          "imageManagerInsertAlign": "none", /* 插入的图片浮动方式 */
+          "imageManagerAllowFiles": [".png", ".jpg", ".jpeg", ".gif", ".bmp"], /* 列出的文件类型 */
+
+          /* 列出指定目录下的文件 */
+          "fileManagerActionName": "listfile", /* 执行文件管理的action名称 */
+          "fileManagerListPath": "/ueditor/jsp/upload/file/", /* 指定要列出文件的目录 */
+          "fileManagerUrlPrefix": "", /* 文件访问路径前缀 */
+          "fileManagerListSize": 20, /* 每次列出文件数量 */
+          "fileManagerAllowFiles": [
+            ".png", ".jpg", ".jpeg", ".gif", ".bmp",
+            ".flv", ".swf", ".mkv", ".avi", ".rm", ".rmvb", ".mpeg", ".mpg",
+            ".ogg", ".ogv", ".mov", ".wmv", ".mp4", ".webm", ".mp3", ".wav", ".mid",
+            ".rar", ".zip", ".tar", ".gz", ".7z", ".bz2", ".cab", ".iso",
+            ".doc", ".docx", ".xls", ".xlsx", ".ppt", ".pptx", ".pdf", ".txt", ".md", ".xml"
+          ] /* 列出的文件类型 */
+        },/* 前后端通信相关的配置,注释只允许使用多行方式 */
+
       }
     },
     created() {
-      if (typeof this.vmodel === 'undefined') {
+      if (typeof this.vmodel === "undefined") {
         this.model = this.loaderObj.Base(this.source);
-      }
-      else {
+      } else {
         this.model = this.vmodel;
       }
-    }
-}</script>
+
+      if (this.model.action == "") {
+        this.$message.warning("请配置Action！");
+        this.config.toolbars = [['help']];
+        return;
+      }
+      this.config.maximumWords = this.model && this.model.maxValue1 ? parseFloat(this.model.maxValue1) : 5000;
+      this.config.serverUrl = this.model.moreActionRouter;
+    },
+    computed: {
+
+    },
+    mounted() {
+
+    },
+    beforeDestroy: function () {
+
+    },
+    methods: {
+
+    },
+    watch: {
+
+    },
+  };
+</script>
 <style>
   .ct-rich-text {
     min-height: 28px;

package/src/centaline/loader/src/ctl/RichText.js

@@ -0,0 +1,24 @@
+import base from '../../index';
+import Base from './Base';
+import valid from '../../../validate/index';
+import Axios from 'axios';
+import common from '../../../common'; 
+import Vue from 'vue';
+const RichText = function (source, router) {
+  var rtn = {
+    options: [{ code: source.code1, name: source.name1 }],
+    get value() {
+      return source.code1;
+    },
+    set value(v) {
+      source.code1 = v;
+    },
+    get action() {
+      return router &&router.action ? router.action : "";//上传完整地址
+    },
+  };
+  rtn = base.copy(Base(source), rtn);
+  rtn = base.copy(rtn, valid.Init(rtn));
+  return rtn;
+}
+export default RichText;

package/src/centaline/loader/src/ctl/Router.js

@@ -149,7 +149,7 @@ const Router = function (source) {
       return source.imgUrl;
     },
     get rightField() {
-      return source.rightField;
+      return common.initialsToUpperCase(source.rightField);
     },
     get submitFormField() {
      

package/src/centaline/loader/src/ctl/lib/LibFunction.js

@@ -34,12 +34,13 @@ import Cb from '../Cb';
 import PhotoSelect from '../PhotoSelect';
 import Repeat from '../Repeat';
 import Compound from '../Compound';
+import RichText from '../RichText';
 
 const LibFunction = {
   install(Vue) {
   },
   GetControl(field, source, showLabel, isList) {
-    
+
     let item;
     field.isList = isList;
     if (typeof field.required === 'undefined') {
@@ -80,7 +81,7 @@ const LibFunction = {
         field.width = field.width || 280;
       }
       else if (field.controlType === Enum.ControlType.RadioButton) {
-        if(!field.displayLabelAfterSelected){
+        if (!field.displayLabelAfterSelected) {
           showLabel = false;
         }
         field.width = field.width || 300;
@@ -175,9 +176,9 @@ const LibFunction = {
         item.is = 'ct-date';
         break;
       case Enum.ControlType.DateYearMonth://年份-月份
-      item = D(field, 'month');
-      item.is = 'ct-date';
-      break;
+        item = D(field, 'month');
+        item.is = 'ct-date';
+        break;
       case Enum.ControlType.DateTime://日期时间
         item = D(field, 'datetime');
         item.is = 'ct-date';
@@ -256,22 +257,22 @@ const LibFunction = {
         item = Button(field);
         item.is = 'ct-btn';
         item.action = 'search';
-        item.attrs.class=item.attrs.class+' max-search-btn ';
+        item.attrs.class = item.attrs.class + ' max-search-btn ';
         break;
       case Enum.ControlType.ButtonAdvancedSearch://高级查询按钮
         item = Button(field);
         item.is = 'ct-btn';
         item.action = 'showHigh';
-        item.attrs.class=item.attrs.class+' max-search-btn ';
-        item.icon='max-open';
+        item.attrs.class = item.attrs.class + ' max-search-btn ';
+        item.icon = 'max-open';
         break;
       case Enum.ControlType.ButtonReset://重置查询按钮
         item = Button(field);
         item.is = 'ct-btn';
         item.action = 'reset';
-        item.bgColor='#519DA6';
-        item.borderColor='#519DA6';
-        item.attrs.class=item.attrs.class+' max-reset-btn ';
+        item.bgColor = '#519DA6';
+        item.borderColor = '#519DA6';
+        item.attrs.class = item.attrs.class + ' max-reset-btn ';
         break;
       case Enum.ControlType.File://文件
         var router = source.actionRouters.find((v1) => {
@@ -314,7 +315,10 @@ const LibFunction = {
         item.is = 'ct-text';
         break;
       case Enum.ControlType.RichText://富文本框
-        item = Base(field);
+        var router = source.actionRouters.find((v1) => {
+          return v1.key === field.fieldName1;
+        });
+        item = RichText(field, router);
         item.is = 'ct-rich-text';
         break;
       case Enum.ControlType.MultiComboBoxWithTextBox://多个下拉框后面带1个文本框，下拉框最多支持3个
@@ -341,9 +345,9 @@ const LibFunction = {
         item.is = 'ct-hyperLink';
         break;
       case Enum.ControlType.HyperlinkListWithLabel://带标签的超链接列表
-          item = HyperLinkList(field);
-          item.is = 'ct-hyperLinkList';
-          break;
+        item = HyperLinkList(field);
+        item.is = 'ct-hyperLinkList';
+        break;
       case Enum.ControlType.PlaceHolder://占位控件
         item = PlaceHolder(field);
         item.is = 'ct-ph';
@@ -369,7 +373,7 @@ const LibFunction = {
           var num;
           var colNum = source.colSpan ? source.colSpan : 3;
           if (item1.excLine) {
-            num =  24;
+            num = 24;
           }
           else if (field.spanCols > 0) {
             num = field.spanCols * (24 / colNum);

package/src/centaline/selectOption/src/selectOptionVertical.vue

@@ -2,7 +2,7 @@
   <div class="ct-selectOptionVertical" style="">
     <ul>
       <li v-for="(op, index) in model.options" :key="index" :class="[getOptionSelect(op[model.optionAttrs.value])?'select':'']" @click="selectOption(op[model.optionAttrs.value])">
-        <span>{{op[model.optionAttrs.displayLabel]||op[model.optionAttrs.label]}}</span>
+        <div v-html="op[model.optionAttrs.displayLabel]||op[model.optionAttrs.label]"></div>
       </li>
     </ul>
   </div>

package/static/UEditor/dialogs/anchor/anchor.html

@@ -0,0 +1,40 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
+    "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+    <head>
+        <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+        <title></title>
+        <style type="text/css">
+            *{color: #838383;margin: 0;padding: 0}
+            html,body {font-size: 12px;overflow: hidden; }
+            .content{padding:5px 0 0 15px;}
+            input{width:210px;height:21px;line-height:21px;margin-left: 4px;}
+        </style>
+    </head>
+    <body>
+        <div class="content">
+            <span><var id="lang_input_anchorName"></var></span><input id="anchorName"  value="" />
+        </div>
+        <script type="text/javascript" src="../internal.js"></script>
+        <script type="text/javascript">
+            var anchorInput = $G('anchorName'),
+                node = editor.selection.getRange().getClosedNode();
+            if(node && node.tagName == 'IMG' && (node = node.getAttribute('anchorname'))){
+                anchorInput.value = node;
+            }
+            anchorInput.onkeydown = function(evt){
+                evt = evt || window.event;
+                if(evt.keyCode == 13){
+                    editor.execCommand('anchor', anchorInput.value);
+                    dialog.close();
+                    domUtils.preventDefault(evt)
+                }
+            };
+            dialog.onok = function (){
+                editor.execCommand('anchor', anchorInput.value);
+                dialog.close();
+            };
+            $focus(anchorInput);
+        </script>
+    </body>
+</html>