sync

Site/fic/css/codemirror.min.css

@@ -0,0 +1,618 @@
+.CodeMirror {
+    font-family: monospace;
+    height: 300px;
+    color: #000;
+    direction: ltr
+}
+
+.CodeMirror-lines {
+    padding: 4px 0
+}
+
+.CodeMirror pre.CodeMirror-line, .CodeMirror pre.CodeMirror-line-like {
+    padding: 0 4px
+}
+
+.CodeMirror-gutter-filler, .CodeMirror-scrollbar-filler {
+    background-color: #fff
+}
+
+.CodeMirror-gutters {
+    border-right: 1px solid #ddd;
+    background-color: #f7f7f7;
+    white-space: nowrap
+}
+
+.CodeMirror-linenumber {
+    padding: 0 3px 0 5px;
+    min-width: 20px;
+    text-align: right;
+    color: #999;
+    white-space: nowrap
+}
+
+.CodeMirror-guttermarker {
+    color: #000
+}
+
+.CodeMirror-guttermarker-subtle {
+    color: #999
+}
+
+.CodeMirror-cursor {
+    border-left: 1px solid #000;
+    border-right: none;
+    width: 0
+}
+
+.CodeMirror div.CodeMirror-secondarycursor {
+    border-left: 1px solid silver
+}
+
+.cm-fat-cursor .CodeMirror-cursor {
+    width: auto;
+    border: 0 !important;
+    background: #7e7
+}
+
+.cm-fat-cursor div.CodeMirror-cursors {
+    z-index: 1
+}
+
+.cm-fat-cursor-mark {
+    background-color: rgba(20,255,20,.5);
+    -webkit-animation: blink 1.06s steps(1) infinite;
+    -moz-animation: blink 1.06s steps(1) infinite;
+    animation: blink 1.06s steps(1) infinite
+}
+
+.cm-animate-fat-cursor {
+    width: auto;
+    border: 0;
+    -webkit-animation: blink 1.06s steps(1) infinite;
+    -moz-animation: blink 1.06s steps(1) infinite;
+    animation: blink 1.06s steps(1) infinite;
+    background-color: #7e7
+}
+
+@-moz-keyframes blink {
+    50% {
+        background-color: transparent
+    }
+}
+
+@-webkit-keyframes blink {
+    50% {
+        background-color: transparent
+    }
+}
+
+@keyframes blink {
+    50% {
+        background-color: transparent
+    }
+}
+
+.cm-tab {
+    display: inline-block;
+    text-decoration: inherit
+}
+
+.CodeMirror-rulers {
+    position: absolute;
+    left: 0;
+    right: 0;
+    top: -50px;
+    bottom: 0;
+    overflow: hidden
+}
+
+.CodeMirror-ruler {
+    border-left: 1px solid #ccc;
+    top: 0;
+    bottom: 0;
+    position: absolute
+}
+
+.cm-s-default .cm-header {
+    color: #00f
+}
+
+.cm-s-default .cm-quote {
+    color: #090
+}
+
+.cm-negative {
+    color: #d44
+}
+
+.cm-positive {
+    color: #292
+}
+
+.cm-header, .cm-strong {
+    font-weight: 700
+}
+
+.cm-em {
+    font-style: italic
+}
+
+.cm-link {
+    text-decoration: underline
+}
+
+.cm-strikethrough {
+    text-decoration: line-through
+}
+
+.cm-s-default .cm-keyword {
+    color: #708
+}
+
+.cm-s-default .cm-atom {
+    color: #219
+}
+
+.cm-s-default .cm-number {
+    color: #164
+}
+
+.cm-s-default .cm-def {
+    color: #00f
+}
+
+.cm-s-default .cm-variable-2 {
+    color: #05a
+}
+
+.cm-s-default .cm-type, .cm-s-default .cm-variable-3 {
+    color: #085
+}
+
+.cm-s-default .cm-comment {
+    color: #a50
+}
+
+.cm-s-default .cm-string {
+    color: #a11
+}
+
+.cm-s-default .cm-string-2 {
+    color: #f50
+}
+
+.cm-s-default .cm-meta {
+    color: #555
+}
+
+.cm-s-default .cm-qualifier {
+    color: #555
+}
+
+.cm-s-default .cm-builtin {
+    color: #30a
+}
+
+.cm-s-default .cm-bracket {
+    color: #997
+}
+
+.cm-s-default .cm-tag {
+    color: #170
+}
+
+.cm-s-default .cm-attribute {
+    color: #00c
+}
+
+.cm-s-default .cm-hr {
+    color: #999
+}
+
+.cm-s-default .cm-link {
+    color: #00c
+}
+
+.cm-s-default .cm-error {
+    color: red
+}
+
+.cm-invalidchar {
+    color: red
+}
+
+.CodeMirror-composing {
+    border-bottom: 2px solid
+}
+
+div.CodeMirror span.CodeMirror-matchingbracket {
+    color: #0b0
+}
+
+div.CodeMirror span.CodeMirror-nonmatchingbracket {
+    color: #a22
+}
+
+.CodeMirror-matchingtag {
+    background: rgba(255,150,0,.3)
+}
+
+.CodeMirror-activeline-background {
+    background: #e8f2ff
+}
+
+.CodeMirror {
+    position: relative;
+    overflow: hidden;
+    background: #fff
+}
+
+.CodeMirror-scroll {
+    overflow: scroll !important;
+    margin-bottom: -50px;
+    margin-right: -50px;
+    padding-bottom: 50px;
+    height: 100%;
+    outline: 0;
+    position: relative
+}
+
+.CodeMirror-sizer {
+    position: relative;
+    border-right: 50px solid transparent
+}
+
+.CodeMirror-gutter-filler, .CodeMirror-hscrollbar, .CodeMirror-scrollbar-filler, .CodeMirror-vscrollbar {
+    position: absolute;
+    z-index: 6;
+    display: none;
+    outline: 0
+}
+
+.CodeMirror-vscrollbar {
+    right: 0;
+    top: 0;
+    overflow-x: hidden;
+    overflow-y: scroll
+}
+
+.CodeMirror-hscrollbar {
+    bottom: 0;
+    left: 0;
+    overflow-y: hidden;
+    overflow-x: scroll
+}
+
+.CodeMirror-scrollbar-filler {
+    right: 0;
+    bottom: 0
+}
+
+.CodeMirror-gutter-filler {
+    left: 0;
+    bottom: 0
+}
+
+.CodeMirror-gutters {
+    position: absolute;
+    left: 0;
+    top: 0;
+    min-height: 100%;
+    z-index: 3
+}
+
+.CodeMirror-gutter {
+    white-space: normal;
+    height: 100%;
+    display: inline-block;
+    vertical-align: top;
+    margin-bottom: -50px
+}
+
+.CodeMirror-gutter-wrapper {
+    position: absolute;
+    z-index: 4;
+    background: 0 0 !important;
+    border: none !important
+}
+
+.CodeMirror-gutter-background {
+    position: absolute;
+    top: 0;
+    bottom: 0;
+    z-index: 4
+}
+
+.CodeMirror-gutter-elt {
+    position: absolute;
+    cursor: default;
+    z-index: 4
+}
+
+.CodeMirror-gutter-wrapper ::selection {
+    background-color: transparent
+}
+
+.CodeMirror-gutter-wrapper ::-moz-selection {
+    background-color: transparent
+}
+
+.CodeMirror-lines {
+    cursor: text;
+    min-height: 1px
+}
+
+.CodeMirror pre.CodeMirror-line, .CodeMirror pre.CodeMirror-line-like {
+    -moz-border-radius: 0;
+    -webkit-border-radius: 0;
+    border-radius: 0;
+    border-width: 0;
+    background: 0 0;
+    font-family: inherit;
+    font-size: inherit;
+    margin: 0;
+    white-space: pre;
+    word-wrap: normal;
+    line-height: inherit;
+    color: inherit;
+    z-index: 2;
+    position: relative;
+    overflow: visible;
+    -webkit-tap-highlight-color: transparent;
+    -webkit-font-variant-ligatures: contextual;
+    font-variant-ligatures: contextual
+}
+
+.CodeMirror-wrap pre.CodeMirror-line, .CodeMirror-wrap pre.CodeMirror-line-like {
+    word-wrap: break-word;
+    white-space: pre-wrap;
+    word-break: normal
+}
+
+.CodeMirror-linebackground {
+    position: absolute;
+    left: 0;
+    right: 0;
+    top: 0;
+    bottom: 0;
+    z-index: 0
+}
+
+.CodeMirror-linewidget {
+    position: relative;
+    z-index: 2;
+    padding: .1px
+}
+
+.CodeMirror-rtl pre {
+    direction: rtl
+}
+
+.CodeMirror-code {
+    outline: 0
+}
+
+.CodeMirror-gutter, .CodeMirror-gutters, .CodeMirror-linenumber, .CodeMirror-scroll, .CodeMirror-sizer {
+    -moz-box-sizing: content-box;
+    box-sizing: content-box
+}
+
+.CodeMirror-measure {
+    position: absolute;
+    width: 100%;
+    height: 0;
+    overflow: hidden;
+    visibility: hidden
+}
+
+.CodeMirror-cursor {
+    position: absolute;
+    pointer-events: none
+}
+
+.CodeMirror-measure pre {
+    position: static
+}
+
+div.CodeMirror-cursors {
+    visibility: hidden;
+    position: relative;
+    z-index: 3
+}
+
+div.CodeMirror-dragcursors {
+    visibility: visible
+}
+
+.CodeMirror-focused div.CodeMirror-cursors {
+    visibility: visible
+}
+
+.CodeMirror-selected {
+    background: #d9d9d9
+}
+
+.CodeMirror-focused .CodeMirror-selected {
+    background: #d7d4f0
+}
+
+.CodeMirror-crosshair {
+    cursor: crosshair
+}
+
+.CodeMirror-line::selection, .CodeMirror-line > span::selection, .CodeMirror-line > span > span::selection {
+    background: #d7d4f0
+}
+
+.CodeMirror-line::-moz-selection, .CodeMirror-line > span::-moz-selection, .CodeMirror-line > span > span::-moz-selection {
+    background: #d7d4f0
+}
+
+.cm-searching {
+    background-color: #ffa;
+    background-color: rgba(255,255,0,.4)
+}
+
+.cm-force-border {
+    padding-right: .1px
+}
+
+@media print {
+    .CodeMirror div.CodeMirror-cursors {
+        visibility: hidden
+    }
+}
+
+.cm-tab-wrap-hack:after {
+    content: ''
+}
+
+span.CodeMirror-selectedtext {
+    background: 0 0
+}
+/*
+  MDN-LIKE Theme - Mozilla
+  Ported to CodeMirror by Peter Kroon <plakroon@gmail.com>
+  Report bugs/issues here: https://github.com/codemirror/CodeMirror/issues
+  GitHub: @peterkroon
+
+  The mdn-like theme is inspired on the displayed code examples at: https://developer.mozilla.org/en-US/docs/Web/CSS/animation
+
+*/
+.cm-s-mdn-like.CodeMirror {
+    color: #999;
+    background-color: #fff;
+}
+
+.cm-s-mdn-like div.CodeMirror-selected {
+    background: #cfc;
+}
+
+.cm-s-mdn-like .CodeMirror-line::selection, .cm-s-mdn-like .CodeMirror-line > span::selection, .cm-s-mdn-like .CodeMirror-line > span > span::selection {
+    background: #cfc;
+}
+
+.cm-s-mdn-like .CodeMirror-line::-moz-selection, .cm-s-mdn-like .CodeMirror-line > span::-moz-selection, .cm-s-mdn-like .CodeMirror-line > span > span::-moz-selection {
+    background: #cfc;
+}
+
+.cm-s-mdn-like .CodeMirror-gutters {
+    background: #f8f8f8;
+    border-left: 6px solid rgba(0,83,159,0.65);
+    color: #333;
+}
+
+.cm-s-mdn-like .CodeMirror-linenumber {
+    color: #aaa;
+    padding-left: 8px;
+}
+
+.cm-s-mdn-like .CodeMirror-cursor {
+    border-left: 2px solid #222;
+}
+
+.cm-s-mdn-like .cm-keyword {
+    color: #6262FF;
+}
+
+.cm-s-mdn-like .cm-atom {
+    color: #F90;
+}
+
+.cm-s-mdn-like .cm-number {
+    color: #ca7841;
+}
+
+.cm-s-mdn-like .cm-def {
+    color: #8DA6CE;
+}
+
+.cm-s-mdn-like span.cm-variable-2, .cm-s-mdn-like span.cm-tag {
+    color: #690;
+}
+
+.cm-s-mdn-like span.cm-variable-3, .cm-s-mdn-like span.cm-def, .cm-s-mdn-like span.cm-type {
+    color: #07a;
+}
+
+.cm-s-mdn-like .cm-variable {
+    color: #07a;
+}
+
+.cm-s-mdn-like .cm-property {
+    color: #905;
+}
+
+.cm-s-mdn-like .cm-qualifier {
+    color: #690;
+}
+
+.cm-s-mdn-like .cm-operator {
+    color: #cda869;
+}
+
+.cm-s-mdn-like .cm-comment {
+    color: #777;
+    font-weight: normal;
+}
+
+.cm-s-mdn-like .cm-string {
+    color: #07a;
+    font-style: italic;
+}
+
+.cm-s-mdn-like .cm-string-2 {
+    color: #bd6b18;
+}
+
+/*?*/
+.cm-s-mdn-like .cm-meta {
+    color: #000;
+}
+
+/*?*/
+.cm-s-mdn-like .cm-builtin {
+    color: #9B7536;
+}
+
+/*?*/
+.cm-s-mdn-like .cm-tag {
+    color: #997643;
+}
+
+.cm-s-mdn-like .cm-attribute {
+    color: #d6bb6d;
+}
+
+/*?*/
+.cm-s-mdn-like .cm-header {
+    color: #FF6400;
+}
+
+.cm-s-mdn-like .cm-hr {
+    color: #AEAEAE;
+}
+
+.cm-s-mdn-like .cm-link {
+    color: #ad9361;
+    font-style: italic;
+    text-decoration: none;
+}
+
+.cm-s-mdn-like .cm-error {
+    border-bottom: 1px solid red;
+}
+
+div.cm-s-mdn-like .CodeMirror-activeline-background {
+    background: #efefff;
+}
+
+div.cm-s-mdn-like span.CodeMirror-matchingbracket {
+    outline: 1px solid grey;
+    color: inherit;
+}
+
+.cm-s-mdn-like.CodeMirror {
+    background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAFcAAAAyCAYAAAAp8UeFAAAHvklEQVR42s2b63bcNgyEQZCSHCdt2vd/0tWF7I+Q6XgMXiTtuvU5Pl57ZQKkKHzEAOtF5KeIJBGJ8uvL599FRFREZhFx8DeXv8trn68RuGaC8TRfo3SNp9dlDDHedyLyTUTeRWStXKPZrjtpZxaRw5hPqozRs1N8/enzIiQRWcCgy4MUA0f+XWliDhyL8Lfyvx7ei/Ae3iQFHyw7U/59pQVIMEEPEz0G7XiwdRjzSfC3UTtz9vchIntxvry5iMgfIhJoEflOz2CQr3F5h/HfeFe+GTdLaKcu9L8LTeQb/R/7GgbsfKedyNdoHsN31uRPWrfZ5wsj/NzzRQHuToIdU3ahwnsKPxXCjJITuOsi7XLc7SG/v5GdALs7wf8JjTFiB5+QvTEfRyGOfX3Lrx8wxyQi3sNq46O7QahQiCsRFgqddjBouVEHOKDgXAQHD9gJCr5sMKkEdjwsarG/ww3BMHBU7OBjXnzdyY7SfCxf5/z6ATccrwlKuwC/jhznnPF4CgVzhhVf4xp2EixcBActO75iZ8/fM9zAs2OMzKdslgXWJ9XG8PQoOAMA5fGcsvORgv0doBXyHrCwfLJAOwo71QLNkb8n2Pl6EWiR7OCibtkPaz4Kc/0NNAze2gju3zOwekALDaCFPI5vjPFmgGY5AZqyGEvH1x7QfIb8YtxMnA/b+QQ0aQDAwc6JMFg8CbQZ4qoYEEHbRwNojuK3EHwd7VALSgq+MNDKzfT58T8qdpADrgW0GmgcAS1lhzztJmkAzcPNOQbsWEALBDSlMKUG0Eq4CLAQWvEVQ9WU57gZJwZtgPO3r9oBTQ9WO8TjqXINx8R0EYpiZEUWOF3FxkbJkgU9B2f41YBrIj5ZfsQa0M5kTgiAAqM3ShXLgu8XMqcrQBvJ0CL5pnTsfMB13oB8athpAq2XOQmcGmoACCLydx7nToa23ATaSIY2ichfOdPTGxlasXMLaL0MLZAOwAKIM+y8CmicobGdCcbbK9DzN+yYGVoNNI5iUKTMyYOjPse4A8SM1MmcXgU0toOq1yO/v8FOxlASyc7TgeYaAMBJHcY1CcCwGI/TK4AmDbDyKYBBtFUkRwto8gygiQEaByFgJ00BH2M8JWwQS1nafDXQCidWyOI8AcjDCSjCLk8ngObuAm3JAHAdubAmOaK06V8MNEsKPJOhobSprwQa6gD7DclRQdqcwL4zxqgBrQcabUiBLclRDKAlWp+etPkBaNMA0AKlrHwTdEByZAA4GM+SNluSY6wAzcMNewxmgig5Ks0nkrSpBvSaQHMdKTBAnLojOdYyGpQ254602ZILPdTD1hdlggdIm74jbTp8vDwF5ZYUeLWGJpWsh6XNyXgcYwVoJQTEhhTYkxzZjiU5npU2TaB979TQehlaAVq4kaGpiPwwwLkYUuBbQwocyQTv1tA0+1UFWoJF3iv1oq+qoSk8EQdJmwHkziIF7oOZk14EGitibAdjLYYK78H5vZOhtWpoI0ATGHs0Q8OMb4Ey+2bU2UYztCtA0wFAs7TplGLRVQCcqaFdGSPCeTI1QNIC52iWNzof6Uib7xjEp07mNNoUYmVosVItHrHzRlLgBn9LFyRHaQCtVUMbtTNhoXWiTOO9k/V8BdAc1Oq0ArSQs6/5SU0hckNy9NnXqQY0PGYo5dWJ7nINaN6o958FWin27aBaWRka1r5myvLOAm0j30eBJqCxHLReVclxhxOEN2JfDWjxBtAC7MIH1fVaGdoOp4qJYDgKtKPSFNID2gSnGldrCqkFZ+5UeQXQBIRrSwocbdZYQT/2LwRahBPBXoHrB8nxaGROST62DKUbQOMMzZIC9abkuELfQzQALWTnDNAm8KHWFOJgJ5+SHIvTPcmx1xQyZRhNL5Qci689aXMEaN/uNIWkEwDAvFpOZmgsBaaGnbs1NPa1Jm32gBZAIh1pCtG7TSH4aE0y1uVY4uqoFPisGlpP2rSA5qTecWn5agK6BzSpgAyD+wFaqhnYoSZ1Vwr8CmlTQbrcO3ZaX0NAEyMbYaAlyquFoLKK3SPby9CeVUPThrSJmkCAE0CrKUQadi4DrdSlWhmah0YL9z9vClH59YGbHx1J8VZTyAjQepJjmXwAKTDQI3omc3p1U4gDUf6RfcdYfrUp5ClAi2J3Ba6UOXGo+K+bQrjjssitG2SJzshaLwMtXgRagUNpYYoVkMSBLM+9GGiJZMvduG6DRZ4qc04DMPtQQxOjEtACmhO7K1AbNbQDEggZyJwscFpAGwENhoBeUwh3bWolhe8BTYVKxQEWrSUn/uhcM5KhvUu/+eQu0Lzhi+VrK0PrZZNDQKs9cpYUuFYgMVpD4/NxenJTiMCNqdUEUf1qZWjppLT5qSkkUZbCwkbZMSuVnu80hfSkzRbQeqCZSAh6huR4VtoM2gHAlLf72smuWgE+VV7XpE25Ab2WFDgyhnSuKbs4GuGzCjR+tIoUuMFg3kgcWKLTwRqanJQ2W00hAsenfaApRC42hbCvK1SlE0HtE9BGgneJO+ELamitD1YjjOYnNYVcraGhtKkW0EqVVeDx733I2NH581k1NNxNLG0i0IJ8/NjVaOZ0tYZ2Vtr0Xv7tPV3hkWp9EFkgS/J0vosngTaSoaG06WHi+xObQkaAdlbanP8B2+2l0f90LmUAAAAASUVORK5CYII=);
+}

Site/fic/fic/FIBasePage.master

@@ -110,14 +110,14 @@
     <link type="text/css" href="<%=Common.GenerateUrl("fic/css/workspace.css") %>" rel="stylesheet" />
     <link type="text/css" href="<%=Common.GenerateUrl("fic/js/components/css/gridview.css") %>" rel="stylesheet" />
     <style type="text/css">
-        .data-grid { height: 100% }
-        .data-grid .data-grid-table-header th div { font-weight: normal; }
+        .data-grid-old { height: 100% }
+        .data-grid-old .data-grid-table-header th div { font-weight: normal; }
     </style>
 
     <script type="text/javascript">
         var appPath = "<%=this.ResolveUrl("~/") %>";
         var sitePath = "<%=this.ResolveUrl("~/fic/") %>";
-        var GridView = window.GridView || window['g5-gridview'];
+        var GridView = window['g5-gridview'];
 
         //获取登录用户的信息
         function getUserInfo() {

Site/fic/fic/FIC.aspx

@@ -133,6 +133,7 @@
     <script type="text/javascript">
         if (typeof _utility === 'object') {
             _utility.currentLang = _fleet.currentLang;
+            _utility.currentTimezone = '<%=_timezone%>';
         }
     </script>
 
@@ -140,113 +141,22 @@
     <script type="text/javascript" src="<%=Common.GenerateUrl("fic/js/controls/dialog.js") %>"></script>
     <script type="text/javascript" src="<%=Common.GenerateUrl("fic/js/controls/additionalFilter.js") %>"></script>
     <script type="text/javascript" src="<%=Common.GenerateUrl("fic/js/controls/editGridCtrl.js") %>"></script>
-    <%--<script type="text/javascript" src="<%=GenerateUrl("fic/js/controls/changepassword.js") %>"></script>--%>
     <script type="text/javascript" src="<%=Common.GenerateUrl("fic/js/workspace.js") %>"></script>
-
     <script type="text/javascript" src="<%=Common.GenerateUrl("js/echarts.min.js")%>"></script>
-    <%--<script type="text/javascript" src="//cdn.jsdelivr.net/npm/echarts@4.8.0/dist/echarts.js"></script>--%>
     <script type="text/javascript" src="<%=Common.GenerateUrl("js/datepicker.min.js")%>"></script>
     <script type="text/javascript" src="<%=Common.GenerateUrl("js/lib/vue-color.min.js")%>"></script>
     <script type="text/javascript" src="<%=Common.GenerateUrl("fic/js/components/gridview.js")%>"></script>
-    <script type="text/javascript" src="<%=Common.GenerateUrl("fic/js/controls/about.js")%>"></script>
-    <script type="text/javascript" src="<%=Common.GenerateUrl("fic/js/menu.js")%>"></script>
-    <script type="text/javascript" src="<%=Common.GenerateUrl("fic/js/pivot.js")%>"></script>
-    <script type="text/javascript" src="<%=Common.GenerateUrl("fic/js/Management/func.js") %>"></script>
-    <script type="text/javascript" src="<%=Common.GenerateUrl("fic/js/controls/controls.js") %>"></script>
-    <%--<script type="text/javascript" src="<%=Common.GenerateUrl("fic/js/controls/editGridCtrl.js") %>"></script>--%>
     <script type="text/javascript" src="<%=Common.GenerateUrl("fic/js/components/datagrid.js")%>"></script>
     <script type="text/javascript" src="<%=Common.GenerateUrl("fic/js/components/vue-ctrls.js")%>"></script>
     <script type="text/javascript" src="<%=Common.GenerateUrl("fic/js/components/design-grid.min.js")%>"></script>
-    <script type="text/javascript" src="<%=Common.GenerateUrl("fic/js/controls/form.js") %>"></script>
-    <script type="text/javascript" src="<%=Common.GenerateUrl("fic/js/controls/wizardctrl.js") %>"></script>
 
     <%-- 覆盖fic定义 --%>
-    <script type="text/javascript" src="<%=Common.GenerateUrl("fic/override.js")%>"></script>
     <script type="text/javascript" src="<%=Common.GenerateUrl("fic/g5masterjs.js")%>"></script>
-
-    <script type="text/javascript" src="<%=Common.GenerateUrl("fic/js/controls/wsp_pivot.js")%>"></script>
-    <script type="text/javascript" src="<%=Common.GenerateUrl("fic/js/Management/languageform.js")%>"></script>
-    <script type="text/javascript" src="<%=Common.GenerateUrl("fic/js/chartManage/chartWizardOptions/ColumnColorSetting.js")%>"></script>
-    <script type="text/javascript" src="<%=Common.GenerateUrl("fic/js/Management/UserAlertFilter.js")%>"></script>
-    <script type="text/javascript" src="<%=Common.GenerateUrl("fic/js/board.js")%>"></script>
-    <script type="text/javascript" src="<%=Common.GenerateUrl("fic/js/chart.js")%>"></script>
-    <script type="text/javascript" src="<%=Common.GenerateUrl("fic/js/charts/gauge.js")%>"></script>
-    <script type="text/javascript" src="<%=Common.GenerateUrl("fic/js/charts/scorecard.js")%>"></script>
-    <script type="text/javascript" src="<%=Common.GenerateUrl("fic/js/controls/gridctrl.js")%>"></script>
-    <script type="text/javascript" src="<%=Common.GenerateUrl("fic/js/charts/grid.js")%>"></script>
-    <script type="text/javascript" src="<%=Common.GenerateUrl("fic/js/charts/graph.js")%>"></script>
-    <script type="text/javascript" src="<%=Common.GenerateUrl("fic/js/charts/simplechart.js")%>"></script>
-    <script type="text/javascript" src="<%=Common.GenerateUrl("fic/js/charts/favorites.js")%>"></script>
-    <script type="text/javascript" src="<%=Common.GenerateUrl("fic/js/charts/fifrs.js")%>"></script>
     <script type="text/javascript" src="<%=Common.GenerateUrl("fic/js/controls/jstree.min.js")%>"></script>
-
-    <script type="text/javascript" src="<%=Common.GenerateUrl("fic/js/chartManage/chartTypeWizard.js") %>"></script>
-    <script type="text/javascript" src="<%=Common.GenerateUrl("fic/js/chartManage/chartWizardOptions/selectChartType.js") %>"></script>
-    <script type="text/javascript" src="<%=Common.GenerateUrl("fic/js/chartManage/chartWizardOptions/selectChartSubType.js") %>"></script>
-
-    <script type="text/javascript" src="<%=Common.GenerateUrl("fic/js/chartManage/DimWizard.js") %>"></script>
-    <script type="text/javascript" src="<%=Common.GenerateUrl("fic/js/chartManage/ListWizard.js") %>"></script>
-    <script type="text/javascript" src="<%=Common.GenerateUrl("fic/js/chartManage/Grid2DWizard.js") %>"></script>
-    <script type="text/javascript" src="<%=Common.GenerateUrl("fic/js/chartManage/Grid3DWizard.js") %>"></script>
-    <script type="text/javascript" src="<%=Common.GenerateUrl("fic/js/chartManage/RssWizard.js") %>"></script>
-    <script type="text/javascript" src="<%=Common.GenerateUrl("fic/js/chartManage/WebWizard.js") %>"></script>
-    <script type="text/javascript" src="<%=Common.GenerateUrl("fic/js/chartManage/MapViewWizard.js") %>"></script>
-    <script type="text/javascript" src="<%=Common.GenerateUrl("fic/js/chartManage/StockWizard.js") %>"></script>
-    <script type="text/javascript" src="<%=Common.GenerateUrl("fic/js/chartManage/VideoWizard.js") %>"></script>
-    <script type="text/javascript" src="<%=Common.GenerateUrl("fic/js/chartManage/FavoriteWizard.js") %>"></script>
-    <script type="text/javascript" src="<%=Common.GenerateUrl("fic/js/chartManage/AlertWizard.js") %>"></script>
-    <script type="text/javascript" src="<%=Common.GenerateUrl("fic/js/Management/alertMessageWizard.js") %>"></script>
-    <script type="text/javascript" src="<%=Common.GenerateUrl("fic/js/chartManage/Graph2DWizard.js") %>"></script>
-    <script type="text/javascript" src="<%=Common.GenerateUrl("fic/js/chartManage/Graph3DWizard.js") %>"></script>
-    <script type="text/javascript" src="<%=Common.GenerateUrl("fic/js/chartManage/ColumnLineWizard.js") %>"></script>
-    <script type="text/javascript" src="<%=Common.GenerateUrl("fic/js/chartManage/PieWizard.js") %>"></script>
-    <script type="text/javascript" src="<%=Common.GenerateUrl("fic/js/chartManage/GaugeWizard.js") %>"></script>
-    <script type="text/javascript" src="<%=Common.GenerateUrl("fic/js/chartManage/ScatterPlotWizard.js") %>"></script>
-    <script type="text/javascript" src="<%=Common.GenerateUrl("fic/js/chartManage/FifrsWizard.js") %>"></script>
-    <script type="text/javascript" src="<%=Common.GenerateUrl("fic/js/chartManage/ScorecardWizard.js") %>"></script>
-    <script type="text/javascript" src="<%=Common.GenerateUrl("fic/js/chartManage/commonOp.js") %>"></script>
-
-    <script type="text/javascript" src="<%=Common.GenerateUrl("fic/js/chartManage/chartWizardOptions/selectDTOption.js") %>"></script>
-    <script type="text/javascript" src="<%=Common.GenerateUrl("fic/js/chartManage/chartWizardOptions/chartFilter.js") %>"></script>
-    <script type="text/javascript" src="<%=Common.GenerateUrl("fic/js/chartManage/chartWizardOptions/BaseXYPivotCtrl.js") %>"></script>
-    <script type="text/javascript" src="<%=Common.GenerateUrl("fic/js/chartManage/chartWizardOptions/D1YPivotCtrl.js") %>"></script>
-    <script type="text/javascript" src="<%=Common.GenerateUrl("fic/js/chartManage/chartWizardOptions/D2XYPivotCtrl.js") %>"></script>
-    <script type="text/javascript" src="<%=Common.GenerateUrl("fic/js/chartManage/chartWizardOptions/D3XYPivotCtrl.js") %>"></script>
-    <script type="text/javascript" src="<%=Common.GenerateUrl("fic/js/chartManage/chartWizardOptions/PointSetXYPivotCtrl.js") %>"></script>
-    <script type="text/javascript" src="<%=Common.GenerateUrl("fic/js/chartManage/chartWizardOptions/xCtrl.js") %>"></script>
-    <script type="text/javascript" src="<%=Common.GenerateUrl("fic/js/chartManage/chartWizardOptions/zCtrl.js") %>"></script>
-    <script type="text/javascript" src="<%=Common.GenerateUrl("fic/js/chartManage/chartWizardOptions/parameterInitValueOption.js") %>"></script>
-    <script type="text/javascript" src="<%=Common.GenerateUrl("fic/js/chartManage/chartWizardOptions/shapeAndColorSetting.js") %>"></script>
-    <script type="text/javascript" src="<%=Common.GenerateUrl("fic/js/chartManage/chartWizardOptions/yCtrl.js") %>"></script>
-    <script type="text/javascript" src="<%=Common.GenerateUrl("fic/js/chartManage/chartWizardOptions/pivotCtrl.js") %>"></script>
-    <script type="text/javascript" src="<%=Common.GenerateUrl("fic/js/chartManage/chartWizardOptions/subctrls/webPivotCtrl.js") %>"></script>
-    <script type="text/javascript" src="<%=Common.GenerateUrl("fic/js/chartManage/chartWizardOptions/aggregatesCtrl.js") %>"></script>
-    <script type="text/javascript" src="<%=Common.GenerateUrl("fic/js/chartManage/chartWizardOptions/targetInputDataCtrl.js") %>"></script>
-    <script type="text/javascript" src="<%=Common.GenerateUrl("fic/js/chartManage/chartWizardOptions/chartNoteCtrl.js") %>"></script>
-    <script type="text/javascript" src="<%=Common.GenerateUrl("fic/js/chartManage/chartWizardOptions/chartInformationCtrl.js") %>"></script>
-    <script type="text/javascript" src="<%=Common.GenerateUrl("fic/js/chartManage/chartWizardOptions/setuprssurlCtrl.js") %>"></script>
-    <script type="text/javascript" src="<%=Common.GenerateUrl("fic/js/chartManage/chartWizardOptions/stockSymbolsCtrl.js") %>"></script>
-    <script type="text/javascript" src="<%=Common.GenerateUrl("fic/js/chartManage/chartWizardOptions/typeCtrl.js") %>"></script>
-    <script type="text/javascript" src="<%=Common.GenerateUrl("fic/js/chartManage/chartWizardOptions/setupFavoriteUrlCtrl.js") %>"></script>
-    <script type="text/javascript" src="<%=Common.GenerateUrl("fic/js/chartManage/chartWizardOptions/subscribetoAMessageCtrl.js") %>"></script>
-    <script type="text/javascript" src="<%=Common.GenerateUrl("fic/js/chartManage/chartWizardOptions/TargetRelation.js") %>"></script>
-    <script type="text/javascript" src="<%=Common.GenerateUrl("fic/js/chartManage/chartWizardOptions/SortByCtrl.js") %>"></script>
-    <script type="text/javascript" src="<%=Common.GenerateUrl("fic/js/chartManage/chartWizardOptions/gaugeInformationCtrl.js") %>"></script>
-    <script type="text/javascript" src="<%=Common.GenerateUrl("fic/js/chartManage/chartWizardOptions/drilldownselect.js") %>"></script>
-    <script type="text/javascript" src="<%=Common.GenerateUrl("fic/js/chartManage/chartWizardOptions/drilldownurl.js") %>"></script>
-    <script type="text/javascript" src="<%=Common.GenerateUrl("fic/js/chartManage/chartWizardOptions/webSetup.js") %>"></script>
-    <script type="text/javascript" src="<%=Common.GenerateUrl("fic/js/chartManage/chartWizardOptions/drilldownchart.js") %>"></script>
-    <script type="text/javascript" src="<%=Common.GenerateUrl("fic/js/chartManage/chartWizardOptions/drilldownCell.js") %>"></script>
-    <script type="text/javascript" src="<%=Common.GenerateUrl("fic/js/chartManage/chartWizardOptions/frptSelectReportCtrl.js") %>"></script>
-    <script type="text/javascript" src="<%=Common.GenerateUrl("fic/js/chartManage/chartWizardOptions/frptSetPivot.js") %>"></script>
-    <script type="text/javascript" src="<%=Common.GenerateUrl("fic/js/chartManage/chartWizardOptions/freeReportSetCells.js") %>"></script>
-    <script type="text/javascript" src="<%=Common.GenerateUrl("fic/js/chartManage/chartWizardOptions/freeReportSetPivots.js") %>"></script>
-    <script type="text/javascript" src="<%=Common.GenerateUrl("fic/js/chartManage/chartWizardOptions/subctrls/targetMappingHeader.js") %>"></script>
-    <script type="text/javascript" src="<%=Common.GenerateUrl("fic/js/chartManage/chartWizardOptions/subctrls/cellDialog.js") %>"></script>
-
-    <script type="text/javascript" src="<%=Common.GenerateUrl("fic/js/Management/boardFilters.js") %>"></script>
-    <script type="text/javascript" src="<%=Common.GenerateUrl("fic/js/Management/workspaceFilters.js") %>"></script>
-    <script type="text/javascript" src="<%=Common.GenerateUrl("fic/js/Management/filtersSelector.js") %>"></script>
+    <script type="text/javascript" src="<%=Common.GenerateUrl("fic/js/ShowBundler.min.js")%>"></script>
+    <script type="text/javascript" src="<%=Common.GenerateUrl("fic/js/chartManage/ChartBundler.min.js") %>"></script>
+    <script type="text/javascript" src="<%=Common.GenerateUrl("fic/js/Management/ManagementBundler.min.js") %>"></script>
+    <script type="text/javascript" src="<%=Common.GenerateUrl("fic/override.js")%>"></script>
 
     <script>
         //必须放在地图js之前
@@ -254,7 +164,7 @@
             async: true,//这个参数一定要设置，必须要设置true;
             parseOnLoad: true,
             paths: {
-                extras1: location.pathname.replace(/\/[^/]+$/, "") + "/js/mapview"
+                extras: location.pathname.replace(/\/[^/]+$/, "") + "/js/mapview"
             },
             cacheBust: true
         };
@@ -267,6 +177,7 @@
     <script type="text/javascript">
         var LinkIcons = new Array();
         var frsInstalled = false;
+        var GridView1 = window['lib-ui'].Grid;
 
         _utility.rootPath = "<%=this.ResolveUrl("~/") %>";
         _utility.loginedUser = {};
@@ -278,6 +189,22 @@
             _utility.showMessage(text, DEFAULT_LANG.FIC);
         }
 
+        function showmaskbg(flag, noanimation) {//覆盖FIC的showmaskbg
+            if (window.parent && typeof window.parent.onmaskbg == 'function') {
+                window.parent.onmaskbg(flag, noanimation);
+            }
+            $('#mask_bg').children().hide();
+            if (noanimation) {
+                $('#mask_bg').css('display', flag ? '' : 'none');
+            } else {
+                if (flag) {
+                    $('#mask_bg').fadeIn(100);
+                } else {
+                    $('#mask_bg').fadeOut(100);
+                }
+            }
+        }
+
         $(function () {
 
             new Promise(getThemes)
@@ -289,7 +216,7 @@
                 return new Promise(function (resolve, reject) {
                     _network.query('GetWorkspaces', [], function (data) {
                         if (!data.Result && data.ErrorMessage) {
-                            writelog("getWorkspaces", data.ErrorMessage, data.ErrorMessage);
+                            //writelog("getWorkspaces", data.ErrorMessage, data.ErrorMessage);
                         } else {
                             _utility.workspaces = data.Result;
                             //var tcontainer = $('<ul></ul>').appendTo($('#host_header').children('.workspace_menu').empty());
@@ -395,7 +322,7 @@
         function changeWorkspace(iid, name, level, Creater, secrettype, IsMyCreate, WSPDescription) {
             _network.query('GetWorkspacePersonalCheck', [iid], function (data) {
                 if (!data.Result && data.ErrorMessage) {
-                    writelog("changeWorkspace", data.ErrorMessage, data.ErrorMessage);
+                    //writelog("changeWorkspace", data.ErrorMessage, data.ErrorMessage);
                 } else {
                     var personalChecked = data.Result;
                     if (_workspace.changed && _utility.CanSaveAccessByPersonalIsVisableWhenLogout()) {

Site/fic/fic/FIC.aspx.cs

@@ -1,4 +1,5 @@
 using FI.FIC;
+using Foresight.Fleet.Services.Customer;
 using IronIntel.Contractor;
 using IronIntel.Contractor.Site;
 using System;
@@ -13,6 +14,7 @@ public partial class FIC : WorkspaceBasePage
     protected string _sessionID;
     protected string _userID;
     protected string _userIID;
+    protected string _timezone;
 
     protected string _wspIID;
 
@@ -33,8 +35,19 @@ public partial class FIC : WorkspaceBasePage
             {
                 _userID = session.User.ID;
                 _userIID = session.User.UID;
+                var name = CreateClient<CustomerProvider>().GetCustomerTimeZone(SystemParams.CompanyID);
+                if (string.IsNullOrEmpty(name))
+                {
+                    name = TimeZoneInfo.Local.Id;
+                }
+                var tz = TimeZoneInfo.FindSystemTimeZoneById(name);
+                var offset = tz.BaseUtcOffset;
+                _timezone = string.Format("({0}{1:00}:{2:00}) {3}",
+                    offset.Hours >= 0 ? "+" : "",
+                    offset.Hours,
+                    Math.Abs(offset.Minutes),
+                    name);
             }
-
             _wspIID = Request.QueryString["IID"];
 
             this.Title = PageTitle;

Site/fic/fic/FIManagement.aspx

@@ -19,6 +19,7 @@
     <link href="<%=Common.GenerateUrl("fic/css/JsTreeCss/style.min.css")%>" rel="stylesheet" />
     <link href="<%=Common.GenerateUrl("fic/css/tabcontrol.css") %>" rel="stylesheet" />
     <link href="<%=Common.GenerateUrl("fic/css/theme.css") %>" rel="stylesheet" />
+    <link href="<%=Common.GenerateUrl("css/codemirror.min.css") %>" rel="stylesheet" />
     <style type="text/css">
         body {
             font-size: 12px;
@@ -30,7 +31,7 @@
 
         #content {
             width: unset;
-            top:60px;
+            top: 60px;
             right: 0;
             bottom: 0;
             margin: 0;
@@ -121,26 +122,23 @@
             cursor: pointer;
             line-height: 80px;
         }
-
-            #splitter:hover {
-                background: #ccc;
-            }
-
-            #splitter em:before {
-                content: '\f053';
-            }
-
-            #splitter em.expand:before {
-                content: '\f054';
-            }
-
-        #showshare_list .data-grid {
+        #splitter:hover {
+            background: #ccc;
+        }
+        #splitter em:before {
+            content: '\f053';
+        }
+        #splitter em.expand:before {
+            content: '\f054';
+        }
+        #showshare_list .data-grid-old {
             height: 100%
         }
-
-        .tab_models .data-grid {
+        .tab_models .data-grid-old {
             height: 100%
         }
+		
+        .CodeMirror {margin-top: 10px; margin-bottom: 10px; border: 1px solid black;}
     </style>
 
     <script type="text/javascript">
@@ -179,7 +177,8 @@
 
 
     <script type="text/javascript">
-        //$("title").html("Management of Foresight Inteligence Center");
+        //$("title").html("Management of Foresight Intelligence Center");
+        var GridView1 = window['lib-ui'].Grid;
         _workspace.setDisplayLevel = function () { };
         _workspace.RunRotaBoards = function () { };
         var ApplicationPath = "<%=Request.ApplicationPath.EndsWith("/") ? Request.ApplicationPath : Request.ApplicationPath + "/" %>";
@@ -385,29 +384,29 @@
                     }
 
                     var table = $('<table></table>').css('width', '100%').appendTo("#div_Menu")
-                                .mousedown(function (e) {
-                                    if ((' ' + e.target.className + ' ').indexOf(' fa ') >= 0) {
-                                        var tr = $(e.target.parentNode.parentNode);
-                                        if (!tr.data('hasChild'))
-                                            return;
+                        .mousedown(function (e) {
+                            if ((' ' + e.target.className + ' ').indexOf(' fa ') >= 0) {
+                                var tr = $(e.target.parentNode.parentNode);
+                                if (!tr.data('hasChild'))
+                                    return;
 
-                                        var child = tr.children('.pcontent').children('.child');
+                                var child = tr.children('.pcontent').children('.child');
 
-                                        if (child.css('display') == 'none') {
-                                            // 展开
-                                            tr.children('.level').removeClass('collapse').addClass('expand');
-                                            child.stop();
-                                            child.css('display', '');
-                                            child.animate({ 'opacity': '1' }, ANIMATE_FAST_SPEED);
-                                        } else {
-                                            tr.children('.level').removeClass('expand').addClass('collapse');
-                                            child.stop();
-                                            child.animate({ 'opacity': '0' }, ANIMATE_FAST_SPEED, function () {
-                                                child.css('display', 'none');
-                                            });
-                                        }
-                                    }
-                                });
+                                if (child.css('display') == 'none') {
+                                    // 展开
+                                    tr.children('.level').removeClass('collapse').addClass('expand');
+                                    child.stop();
+                                    child.css('display', '');
+                                    child.animate({ 'opacity': '1' }, ANIMATE_FAST_SPEED);
+                                } else {
+                                    tr.children('.level').removeClass('expand').addClass('collapse');
+                                    child.stop();
+                                    child.animate({ 'opacity': '0' }, ANIMATE_FAST_SPEED, function () {
+                                        child.css('display', 'none');
+                                    });
+                                }
+                            }
+                        });
 
                     addChildPivot(table, data.Result.Nodes);
 
@@ -658,7 +657,7 @@
             InitProductContent();
 
             ClearUserMenu();
-            
+
             $(".helpicon").attr("PageName", "ManagementMenu");
             $(".helpicon").attr("About", "0");
         });

Site/fic/fic/Management/AlertMessageManage.aspx

@@ -44,6 +44,85 @@
     <script type="text/javascript" src="<%=Common.GenerateUrl("fic/js/chartManage/chartWizardOptions/drilldownselect.js") %>"></script>
     <script type="text/javascript" src="<%=Common.GenerateUrl("fic/js/chartManage/chartWizardOptions/subctrls/targetMappingHeader.js") %>"></script>
     
+    <script type="text/javascript">
+        if (typeof $messageCopyForm !== 'object') {
+
+            $messageCopyForm = $form.extend({
+
+            });
+
+            (function () {
+                'use strict';
+
+                $messageCopyForm.prototype.showOpen = function (_ParentDom, messageIID, callBack) {
+                    //创建基础窗体
+                    this.createForm(GetLanguageByKey('LHBIS_FIC_CLIENT_MODULES_MESSAGECOPYDIALOG_A001', 'Save Message As'), _ParentDom, 400, 200);
+                    //填充内容
+                    var _content = $("<div></div>").css({ "margin-top": "45px", "margin-left": "10px", "margin-right": "10px" });
+                    var tbDom = $("<tale style='margin-top:15px;'></tale>").appendTo(_content);
+                    var trDom = $("<tr></tr>").appendTo(tbDom);
+                    trDom.append("<td>" + GetLanguageByKey('LHBIS_FIC_CLIENT_MODULES_MESSAGECOPYDIALOG_A002', 'Message Name:') + "<td>");
+                    trDom.append("<td><input type='text' id='dtCopy_NewName' maxlength='100' style='width:230px;' /></td>");
+
+                    _content.append($("<hr/>").css({ "margin-top": "65px" }));
+
+                    $("<input type='button' id='dtCopy_btCancel' />")
+                        .val(GetLanguageByKey('LHBIS_FIC_CLIENT_MODULES_DATATABLECOPYDIALOG_A003', 'Cancel'))
+                        .css({ "float": "right" })
+                        .appendTo(_content)
+                        .click(this, function (e) {
+                            e.data.close();
+                        });
+
+                    $("<input type='button' id='dtCopy_btOK' />")
+                        .val(GetLanguageByKey('LHBIS_FIC_CLIENT_MODULES_DATATABLECOPYDIALOG_A006', 'Save'))
+                        .css({ "float": "right", "margin-right": "15px" })
+                        .appendTo(_content)
+                        .click(this, function (e) {
+                            var _this = e.data;
+                            if (strIsNullorEmpty($("#dtCopy_NewName").val())) {
+                                var msg = new $msgdialog();
+                                msg.title = DEFAULT_LANG.FICManagement;
+                                msg.message = GetLanguageByKey("LHBIS_FIC_CLIENT_MODULES_MESSAGECOPYDIALOG_A003", "The Message Name is required.");
+                                msg.showMessage(500, 175);
+                                return;
+                            }
+
+                            _this.ShowProgressBar();
+                            _network.management('SaveAsMessageByName', [messageIID, $("#dtCopy_NewName").val()],
+                                function (ret) {
+                                    _this.HideProgressBar();
+                                    if (ret.ErrorCode !== 0) {
+                                        $alertdialog.showError(DEFAULT_LANG.FICManagement, ret.ErrorMessage, undefined, "info", 530);
+                                        return;
+                                    }
+
+                                    if (typeof callBack === 'function')
+                                        callBack();
+                                    _this.close();
+                                });
+                        });
+
+                    this.bodyCtrlAppend(_content);
+
+                    //显示
+                    this.show();
+
+
+                };
+
+                //窗体大小发生改变时的回调函数
+                $messageCopyForm.prototype.onSizeChange = function (left, top, width, height) {
+
+                };
+
+
+            }());
+
+        }
+    </script>
+
+
     <script type="text/javascript">
 
         function childPageInitLanguage() {
@@ -54,6 +133,7 @@
             $("#btAdd").val(GetLanguageByKey("LHBIS_FIC_CLIENT_MODULES_ALERTMESSAGEMANAGER_A003", "Add"));
             $("#btEdit").val(GetLanguageByKey("LHBIS_FIC_CLIENT_MODULES_ALERTMESSAGEMANAGER_A004", "Edit"));
             $("#btDelete").val(GetLanguageByKey("LHBIS_FIC_CLIENT_MODULES_ALERTMESSAGEMANAGER_A005", "Delete"));
+            $("#btSaveAs").val(GetLanguageByKey("LHBIS_FIC_CLIENT_MODULES_DATATABLECOPYDIALOG_A002", "Save As"));
             $("#btRefresh").val(GetLanguageByKey("LHBIS_FIC_CLIENT_MODULES_DATATABLEWIZARD_A082", "Refresh"));
             $("#btReset").val(GetLanguageByKey("LHBIS_FIC_CLIENT_MODULES_DATATABLEWIZARD_A049", "Reset Layout"));
         }
@@ -191,12 +271,12 @@
                 if (rowdata) {
                     selectIID = rowdata.Values.IID.Value;
 
-                    var canDelete = false;
-                    var canEdit = false;
-
-                    if (f_canDelete(rowdata))
+                    if (f_canDelete(rowdata)) {
                         $("#btDelete").removeAttr("disabled");
-
+                    }
+                    if (f_canSaveAs(rowdata)) {
+                        $("#btSaveAs").removeAttr("disabled");
+                    }
                     if (f_canEdit(rowdata))
                         $("#btEdit").removeAttr("disabled");
                 }
@@ -229,7 +309,33 @@
             }
             return false;
         }
+        function f_canSaveAs(rowdata) {
+            if (rowdata) {
+                selectIID = rowdata.Values.IID.Value;
+                if (!_utility.loginedUser.UserParameters.CanAccessSave) {
+                    return false;
+                }
+                var cansaveas = false;
+                var levelNumber = rowdata.Values.LevelNumber.Value;
 
+                if (levelNumber == 2 || levelNumber == 3) {
+                    if (levelNumber == 3 && rowdata.Values.IsMyCreate.Value != 1) {
+                        cansaveas = false;
+                    } else {
+                        if (!_utility.loginedUser.UserParameters.CanAccessPublic) {
+                            cansaveas = false;
+                        } else {
+                            cansaveas = true;
+                        }
+                    }
+                } else {
+                    cansaveas = false;
+                }
+                return cansaveas;
+            }
+            return false;
+        }
+        
         function f_canDelete(rowdata) {
             if (rowdata) {
                 selectIID = rowdata.Values.IID.Value;
@@ -258,7 +364,7 @@
         function setButtonDisabled() {
             $("#btEdit").attr("disabled", "disabled");
             $("#btDelete").attr("disabled", "disabled");
-
+            $("#btSaveAs").attr("disabled", "disabled");
             if (!_utility.loginedUser.UserParameters.CanAccessSave)
                 $("#btAdd").attr("disabled", "disabled");
         }
@@ -374,6 +480,27 @@
             });
         };
 
+        function getLastSelectIndex() {
+            var selectIndexs = grid_dt.selectedIndexes;
+            return parseInt(selectIndexs[selectIndexs.length - 1]);
+        }
+
+        var InitCallBack = undefined;
+        function btSaveAs_click() {
+            var selectIndex = getLastSelectIndex();
+            if (isNaN(selectIndex)) {
+                return;
+            }
+            var form = new $messageCopyForm();
+            form.showOpen($("body"), grid_dt.source[selectIndex].Values.IID.Value, function () {
+                var st = $($("#dt_Table").find(".gridchartdatacontainer")).scrollTop();
+                InitCallBack = function () {
+                    $($("#dt_Table").find(".gridchartdatacontainer")).scrollTop(st);
+                }
+                InitGridCtrl();
+            });
+        }
+
     </script>
 
 </asp:Content>
@@ -404,6 +531,7 @@
             <input type="button" id="btAdd" class="" value="Add" onclick="btAdd_click()"/>
             <input type="button" id="btEdit" class="" value="Edit" onclick="btEdit_click();" disabled="disabled"/>
             <input type="button" id="btDelete" class="" value="Delete" onclick="btDelete_click();" />
+            <input type="button" id="btSaveAs" class="" value="Save As" onclick="btSaveAs_click()" />
             <input type="button" id="btRefresh" class="" value="Refresh" onclick="ShowLoadingMask(); InitGridCtrl();" />
             <input type="button" id="btReset" class="" value="Reset Layout" onclick="ClearGridLayOut();" />
         </div>

Site/fic/fic/Management/ChartColorSchemeManage.aspx

@@ -46,7 +46,7 @@
     <script src="<%=Common.GenerateUrl("fic/js/components/vue-ctrls.js") %>"></script>
     <script type="text/javascript">
         var DataGrid = window.DataGrid || window['g5-datagrid'];
-        var GridView = window.GridView || window['g5-gridview'];
+        var GridView = window['g5-gridview'];
         
         var grid_dt;
         var cadd;

Site/fic/fic/Management/ChartManage.aspx

@@ -39,7 +39,6 @@
     <script type="text/javascript" src="<%=Common.GenerateUrl("fic/js/controls/wizardctrl.js") %>"></script>
     <script type="text/javascript" src="<%=Common.GenerateUrl("fic/js/Management/func.js") %>"></script>
     <script type="text/javascript" src="<%=Common.GenerateUrl("fic/js/Management/languageform.js")%>"></script>
-    <script type="text/javascript" src="<%=Common.GenerateUrl("fic/js/chartManage/chartWizardOptions/ColumnColorSetting.js")%>"></script>
 
     <script type="text/javascript" src="<%=Common.GenerateUrl("fic/js/charts/grid.js") %>"></script>
     <script type="text/javascript" src="<%=Common.GenerateUrl("fic/js/charts/gauge.js")%>"></script>
@@ -50,70 +49,8 @@
     <script type="text/javascript" src="<%=Common.GenerateUrl("fic/js/charts/fifrs.js")%>"></script>
     <script type="text/javascript" src="<%=Common.GenerateUrl("fic/js/controls/jstree.min.js")%>"></script>
 
-    <script type="text/javascript" src="<%=Common.GenerateUrl("fic/js/chartManage/chartTypeWizard.js") %>"></script>
-    <script type="text/javascript" src="<%=Common.GenerateUrl("fic/js/chartManage/chartWizardOptions/selectChartType.js") %>"></script>
-    <script type="text/javascript" src="<%=Common.GenerateUrl("fic/js/chartManage/chartWizardOptions/selectChartSubType.js") %>"></script>
-
-    <script type="text/javascript" src="<%=Common.GenerateUrl("fic/js/chartManage/DimWizard.js") %>"></script>
-    <script type="text/javascript" src="<%=Common.GenerateUrl("fic/js/chartManage/ListWizard.js") %>"></script>
-    <script type="text/javascript" src="<%=Common.GenerateUrl("fic/js/chartManage/Grid2DWizard.js") %>"></script>
-    <script type="text/javascript" src="<%=Common.GenerateUrl("fic/js/chartManage/Grid3DWizard.js") %>"></script>
-    <script type="text/javascript" src="<%=Common.GenerateUrl("fic/js/chartManage/RssWizard.js") %>"></script>
-    <script type="text/javascript" src="<%=Common.GenerateUrl("fic/js/chartManage/WebWizard.js") %>"></script>
-    <script type="text/javascript" src="<%=Common.GenerateUrl("fic/js/chartManage/MapViewWizard.js") %>"></script>
-    <script type="text/javascript" src="<%=Common.GenerateUrl("fic/js/chartManage/StockWizard.js") %>"></script>
-    <script type="text/javascript" src="<%=Common.GenerateUrl("fic/js/chartManage/VideoWizard.js") %>"></script>
-    <script type="text/javascript" src="<%=Common.GenerateUrl("fic/js/chartManage/FavoriteWizard.js") %>"></script>
-    <script type="text/javascript" src="<%=Common.GenerateUrl("fic/js/chartManage/AlertWizard.js") %>"></script>
+    <script type="text/javascript" src="<%=Common.GenerateUrl("fic/js/chartManage/ChartBundler.min.js") %>"></script>
     <script type="text/javascript" src="<%=Common.GenerateUrl("fic/js/Management/alertMessageWizard.js") %>"></script>
-    <script type="text/javascript" src="<%=Common.GenerateUrl("fic/js/chartManage/Graph2DWizard.js") %>"></script>
-    <script type="text/javascript" src="<%=Common.GenerateUrl("fic/js/chartManage/Graph3DWizard.js") %>"></script>
-    <script type="text/javascript" src="<%=Common.GenerateUrl("fic/js/chartManage/ColumnLineWizard.js") %>"></script>
-    <script type="text/javascript" src="<%=Common.GenerateUrl("fic/js/chartManage/PieWizard.js") %>"></script>
-    <script type="text/javascript" src="<%=Common.GenerateUrl("fic/js/chartManage/GaugeWizard.js") %>"></script>
-    <script type="text/javascript" src="<%=Common.GenerateUrl("fic/js/chartManage/ScatterPlotWizard.js") %>"></script>
-    <script type="text/javascript" src="<%=Common.GenerateUrl("fic/js/chartManage/FifrsWizard.js") %>"></script>
-    <script type="text/javascript" src="<%=Common.GenerateUrl("fic/js/chartManage/ScorecardWizard.js") %>"></script>
-    <script type="text/javascript" src="<%=Common.GenerateUrl("fic/js/chartManage/commonOp.js") %>"></script>
-
-    <script type="text/javascript" src="<%=Common.GenerateUrl("fic/js/chartManage/chartWizardOptions/selectDTOption.js") %>"></script>
-    <script type="text/javascript" src="<%=Common.GenerateUrl("fic/js/chartManage/chartWizardOptions/chartFilter.js") %>"></script>
-    <script type="text/javascript" src="<%=Common.GenerateUrl("fic/js/chartManage/chartWizardOptions/BaseXYPivotCtrl.js") %>"></script>
-    <script type="text/javascript" src="<%=Common.GenerateUrl("fic/js/chartManage/chartWizardOptions/D1YPivotCtrl.js") %>"></script>
-    <script type="text/javascript" src="<%=Common.GenerateUrl("fic/js/chartManage/chartWizardOptions/D2XYPivotCtrl.js") %>"></script>
-    <script type="text/javascript" src="<%=Common.GenerateUrl("fic/js/chartManage/chartWizardOptions/D3XYPivotCtrl.js") %>"></script>
-    <script type="text/javascript" src="<%=Common.GenerateUrl("fic/js/chartManage/chartWizardOptions/PointSetXYPivotCtrl.js") %>"></script>
-    <script type="text/javascript" src="<%=Common.GenerateUrl("fic/js/chartManage/chartWizardOptions/xCtrl.js") %>"></script>
-    <script type="text/javascript" src="<%=Common.GenerateUrl("fic/js/chartManage/chartWizardOptions/zCtrl.js") %>"></script>
-    <script type="text/javascript" src="<%=Common.GenerateUrl("fic/js/chartManage/chartWizardOptions/parameterInitValueOption.js") %>"></script>
-    <script type="text/javascript" src="<%=Common.GenerateUrl("fic/js/chartManage/chartWizardOptions/shapeAndColorSetting.js") %>"></script>
-    <script type="text/javascript" src="<%=Common.GenerateUrl("fic/js/chartManage/chartWizardOptions/yCtrl.js") %>"></script>
-    <script type="text/javascript" src="<%=Common.GenerateUrl("fic/js/chartManage/chartWizardOptions/pivotCtrl.js") %>"></script>
-    <script type="text/javascript" src="<%=Common.GenerateUrl("fic/js/chartManage/chartWizardOptions/subctrls/webPivotCtrl.js") %>"></script>
-    <script type="text/javascript" src="<%=Common.GenerateUrl("fic/js/chartManage/chartWizardOptions/aggregatesCtrl.js") %>"></script>
-    <script type="text/javascript" src="<%=Common.GenerateUrl("fic/js/chartManage/chartWizardOptions/targetInputDataCtrl.js") %>"></script>
-    <script type="text/javascript" src="<%=Common.GenerateUrl("fic/js/chartManage/chartWizardOptions/chartNoteCtrl.js") %>"></script>
-    <script type="text/javascript" src="<%=Common.GenerateUrl("fic/js/chartManage/chartWizardOptions/chartInformationCtrl.js") %>"></script>
-    <script type="text/javascript" src="<%=Common.GenerateUrl("fic/js/chartManage/chartWizardOptions/setuprssurlCtrl.js") %>"></script>
-    <script type="text/javascript" src="<%=Common.GenerateUrl("fic/js/chartManage/chartWizardOptions/stockSymbolsCtrl.js") %>"></script>
-    <script type="text/javascript" src="<%=Common.GenerateUrl("fic/js/chartManage/chartWizardOptions/typeCtrl.js") %>"></script>
-    <script type="text/javascript" src="<%=Common.GenerateUrl("fic/js/chartManage/chartWizardOptions/setupFavoriteUrlCtrl.js") %>"></script>
-    <script type="text/javascript" src="<%=Common.GenerateUrl("fic/js/chartManage/chartWizardOptions/subscribetoAMessageCtrl.js") %>"></script>
-    <script type="text/javascript" src="<%=Common.GenerateUrl("fic/js/chartManage/chartWizardOptions/TargetRelation.js") %>"></script>
-    <script type="text/javascript" src="<%=Common.GenerateUrl("fic/js/chartManage/chartWizardOptions/SortByCtrl.js") %>"></script>
-    <script type="text/javascript" src="<%=Common.GenerateUrl("fic/js/chartManage/chartWizardOptions/gaugeInformationCtrl.js") %>"></script>
-    <script type="text/javascript" src="<%=Common.GenerateUrl("fic/js/chartManage/chartWizardOptions/drilldownselect.js") %>"></script>
-    <script type="text/javascript" src="<%=Common.GenerateUrl("fic/js/chartManage/chartWizardOptions/drilldownurl.js") %>"></script>
-    <script type="text/javascript" src="<%=Common.GenerateUrl("fic/js/chartManage/chartWizardOptions/webSetup.js") %>"></script>
-    <script type="text/javascript" src="<%=Common.GenerateUrl("fic/js/chartManage/chartWizardOptions/drilldownchart.js") %>"></script>
-    <script type="text/javascript" src="<%=Common.GenerateUrl("fic/js/chartManage/chartWizardOptions/drilldownCell.js") %>"></script>
-    <script type="text/javascript" src="<%=Common.GenerateUrl("fic/js/chartManage/chartWizardOptions/frptSelectReportCtrl.js") %>"></script>
-    <script type="text/javascript" src="<%=Common.GenerateUrl("fic/js/chartManage/chartWizardOptions/frptSetPivot.js") %>"></script>
-    <script type="text/javascript" src="<%=Common.GenerateUrl("fic/js/chartManage/chartWizardOptions/freeReportSetCells.js") %>"></script>
-    <script type="text/javascript" src="<%=Common.GenerateUrl("fic/js/chartManage/chartWizardOptions/freeReportSetPivots.js") %>"></script>
-    <script type="text/javascript" src="<%=Common.GenerateUrl("fic/js/chartManage/chartWizardOptions/subctrls/targetMappingHeader.js") %>"></script>
-    <script type="text/javascript" src="<%=Common.GenerateUrl("fic/js/chartManage/chartWizardOptions/subctrls/cellDialog.js") %>"></script>
-
     <script type="text/javascript">
         var ApplicationPath = "<%=Request.ApplicationPath.EndsWith("/") ? Request.ApplicationPath : Request.ApplicationPath + "/" %>";
         var frsInstalled = false;

Site/fic/fic/Management/Community.aspx

@@ -142,19 +142,35 @@
                 if (loginUserType != READONLY_USER) {
                     if ($("#selShare").val() == '0') {
                         //判断为Objects I shared       Stop sharing，取消排序canSort: false,
-                        list_columns[list_columns.length] = {
+                        var ss = {
                             name: '',
-                            text: $("#selShare").val() == '0' ? GetLanguageByKey('LHBIS_FIC_Client_Modules_CommunityCtrl_A015', 'Stop sharing') : "",
+                            text: GetLanguageByKey('LHBIS_FIC_Client_Modules_CommunityCtrl_A015', 'Stop sharing'),
                             type: 1,
                             canSort: false,
-                            css: { 'width': 80, 'text-align': 'left' }
+                            css: { 'width': _utility.NeedModifyUI() ? 100 : 90, 'text-align': 'left' },
+                            events: {
+                                onclick: function () {
+                                    StopSharingClick(this);
+                                }
+                            }
                         }
+
+                        ss.filter = function () {
+                            return ss.text;
+                        };
+                        ss.classFilter = function () {
+                            var cls = 'link-col';
+                            return cls;
+                        };
+
+                        ss.isurl = true;
+                        list_columns[list_columns.length] = ss;
                     }
                     if ($("#selShare").val() == '1') {
                         //判断为Shared from others     Copy，取消排序canSort: false,
                         var c = {
                             name: '',
-                            text: $("#selShare").val() == '1' ? GetLanguageByKey('LHBIS_FIC_Client_Modules_CommunityCtrl_A012', 'Copy') : "",
+                            text: GetLanguageByKey('LHBIS_FIC_Client_Modules_CommunityCtrl_A012', 'Copy'),
                             type: 1,
                             canSort: false,
                             css: { 'width': 80, 'text-align': 'left' },
@@ -214,19 +230,35 @@
                 ];
                 if (loginUserType != READONLY_USER) {
                     if ($("#selShare").val() == '0') {
-                        list_columns[list_columns.length] = {
+                        var ss = {
                             name: '',
-                            text: $("#selShare").val() == '0' ? GetLanguageByKey('LHBIS_FIC_Client_Modules_CommunityCtrl_A015', 'Stop sharing') : "",
+                            text: GetLanguageByKey('LHBIS_FIC_Client_Modules_CommunityCtrl_A015', 'Stop sharing'),
                             type: 1,
                             canSort: false,
-                            css: { 'width': 80, 'text-align': 'left' }
+                            css: { 'width': _utility.NeedModifyUI() ? 100 : 90, 'text-align': 'left' },
+                            events: {
+                                onclick: function () {
+                                    StopSharingClick(this);
+                                }
+                            }
                         }
+
+                        ss.filter = function () {
+                            return ss.text;
+                        };
+                        ss.classFilter = function () {
+                            var cls = 'link-col';
+                            return cls;
+                        };
+
+                        ss.isurl = true;
+                        list_columns[list_columns.length] = ss;
                     }
                     if ($("#selShare").val() == '1') {
                         //判断为Shared from others     Copy，取消排序canSort: false,
                         var c  = {
                             name: '',
-                            text: $("#selShare").val() == '1' ? GetLanguageByKey('LHBIS_FIC_Client_Modules_CommunityCtrl_A012', 'Copy') : "",
+                            text: GetLanguageByKey('LHBIS_FIC_Client_Modules_CommunityCtrl_A012', 'Copy'),
                             type: 1,
                             canSort: false,
                             css: { 'width': 80, 'text-align': 'left' },
@@ -257,7 +289,7 @@
                 col.name = list_columns[hd].name;
                 col.caption = list_columns[hd].text;
                 col.visible = true;
-                col.sortable = true;
+                col.sortable = list_columns[hd].canSort;
                 col.events = list_columns[hd].events;
                 col.width = list_columns[hd].css.width;
                 col.align = list_columns[hd].css["text-align"];
@@ -335,7 +367,7 @@
                     td = $("<td colspan=\"2\" style=\"text-align:right;\"></td>").appendTo(tr);
                     //tr = $("<hr noshade=\"noshade\"></tr>").appendTo(td);
                     $("<button id=\"BtnCopy\" value=\"Copy\" style=\"margin-right:10px;\" onclick=\"CopyCommunity();\" ></button>").text(GetLanguageByKey('LHBIS_FIC_Client_Modules_CopyDialog_A005', "Copy")).appendTo(td);
-                    $("<button id=\"BtnCancel\" value=\"Cancel\" onclick=\"CancelClick();\" ></button></td></tr></table>").text(GetLanguageByKey('LHBIS_FIC_Client_Modules_FunctionalGroupAddDialog_A004', "Cancel")).appendTo(td);
+                    $("<button id=\"BtnCancel\" value=\"Cancel\" onclick=\"CancelClick();\" ></button>").text(GetLanguageByKey('LHBIS_FIC_Client_Modules_FunctionalGroupAddDialog_A004', "Cancel")).appendTo(td);
 
                     //给下拉分组赋值
                     _network.query('GetGroupList', [], function (e) {
@@ -442,7 +474,7 @@
                                 });
                       }
                       else if ($("#selObject").find("option:selected").val() == 'Board') {//已完成
-                          _network.management('SaveBoardAs', [e.Result[0].IID, $('#CopyCommunityName').val(), $("#CopyCommunityDesc").val(), $("#CopyGroupNameList").val(), "00000000-0000-0000-0000-000000000000", IsPublic, _utility.currentLang, false],
+                          _network.management('SaveBoardAsByIID', [e.Result[0].IID, $('#CopyCommunityName').val(), $("#CopyCommunityDesc").val(), $("#CopyGroupNameList").val(), "00000000-0000-0000-0000-000000000000", IsPublic, _utility.currentLang, false],
                                 function (e) {
                                     if (e.ErrorCode !== 0) {
                                         $alertdialog.showError(
@@ -550,7 +582,7 @@
 
         //停止共享
         function StopSharingClick(e) {
-            _network.management("StopOrAddSharing", ["0", $("#selObject").val(), e.data.rowData.Values.IID.Value],
+            _network.management("StopOrAddSharing", ["0", $("#selObject").val(), e.IID.Value],
                 function (data) {
                     RefreshData();
                 }, function (ex) {

Site/fic/fic/Management/CreatePackage.aspx

@@ -185,6 +185,7 @@
                     <li data-href="tab_filters" data-lgid="LHBIS_FIC_CLIENT_PACKAGE_CREATE_A082">Global Filters</li>
                     <li data-href="tab_snapshots" data-lgid="LHBIS_FIC_CLIENT_PACKAGE_CREATE_A087">Snapshot</li>
                     <li data-href="tab_datatablecaches" data-lgid="LHBIS_FIC_CLIENT_MANAGEMENT_MAINPAGE_A123">SQL Queries</li>
+                    <li data-href="tab_schedules" data-lgid="LHBIS_FIC_CLIENT_PACKAGE_CREATE_A098">Schedules</li>
                     <li data-href="tab_colors" data-lgid="LHBIS_FIC_CLIENT_PACKAGE_CREATE_A096">Chart Color Scheme</li>
                     <li style="clear: both;"></li>
                 </ul>
@@ -221,7 +222,7 @@
                         <dt data-name="IsProtect" data-coltype="3" data-checkall="yes" data-enableidx="IsChecked" data-text="LHBIS.FIC.Client.Package.Create.A035" style="width: 100px;">Protect</dt>
                         <dt data-name="IsCoverRefreshTime" data-coltype="3" data-checkall="yes" data-enableidx="IsChecked" data-text="LHBIS.FIC.Client.Package.Create.A089" style="width: 200px;">Overwrite Refresh Time</dt>
                         <dt data-name="IsCoverTargetData" data-coltype="3" data-checkall="yes" data-enableidx="IsChecked" data-text="LHBIS.FIC.Client.Package.Create.A093" style="width: 200px;">Overwrite Target Data</dt>
-                        <dt data-name="IsCoverMaxRecCount" data-coltype="3" data-checkall="yes" data-enableidx="IsChecked" data-text="LHBIS.FIC.Client.Package.Create.A094" style="width: 200px;">Overwrite Top Records</dt>
+                        <dt data-name="IsCoverMaxRecCount" data-coltype="3" data-checkall="yes" data-enableidx="IsChecked" data-text="LHBIS.FIC.Client.Package.Create.A094" style="width: 250px;">Overwrite Top Records</dt>
                     </dl>
                 </div>
                 <div id="tab_msgs" data-page="tab_msgs">
@@ -243,8 +244,8 @@
                         <dt data-name="Description" data-text="LHBIS.FIC.Client.Package.Create.A050" style="width: 250px;">Description</dt>
                         <dt data-name="IsUserCanPublish" data-coltype="3" data-checkall="yes" data-enableidx="IsChecked" data-text="LHBIS.FIC.Client.Package.Create.A034" style="width: 200px;">User Can Publish</dt>
                         <dt data-name="IsProtect" data-coltype="3" data-checkall="yes" data-enableidx="IsChecked" data-text="LHBIS.FIC.Client.Package.Create.A035" style="width: 100px;">Protect</dt>
-                        <dt data-name="IsCoverRefreshTime" data-coltype="3" data-checkall="yes" data-enableidx="IsChecked" data-text="LHBIS.FIC.Client.Package.Create.A089" style="width: 200px;">Overwrite Refresh Time</dt>
-                        <dt data-name="IsOverwriteTableFilter" data-coltype="3" data-checkall="yes" data-enableidx="IsChecked" data-text="LHBIS.FIC.Client.Package.Create.A092" style="width: 200px;">Overwrite Table Filter</dt>
+                        <dt data-name="IsCoverRefreshTime" data-coltype="3" data-checkall="yes" data-enableidx="IsChecked" data-text="LHBIS.FIC.Client.Package.Create.A089" style="width: 210px;">Overwrite Refresh Time</dt>
+                        <dt data-name="IsOverwriteTableFilter" data-coltype="3" data-checkall="yes" data-enableidx="IsChecked" data-text="LHBIS.FIC.Client.Package.Create.A092" style="width: 210px;">Overwrite Table Filter</dt>
                     </dl>
                 </div>
                 <div id="tab_dcs" data-page="tab_dcs">
@@ -280,6 +281,12 @@
                         <dt data-name="Name" data-text="LHBIS.FIC.Client.Package.Create.A097" style="width: 200px;">SQL Query</dt>
                     </dl>
                 </div>
+                <div id="tab_schedules" data-page="tab_schedules">
+                    <dl class="grid-columns" style="display: none;">
+                        <dt data-name="IsChecked" data-coltype="3" data-checkall="yes"></dt>
+                        <dt data-name="Name" data-text="LHBIS_FIC_CLIENT_MODULES_JOBLISTMODULE_LIST_A001" style="width: 200px;">Job Name</dt>
+                    </dl>
+                </div>
                 <div id="tab_snapshots" data-page="tab_snapshots">
                     <dl class="grid-columns" style="display: none;">
                         <dt data-name="IsChecked" data-coltype="3" data-checkall="yes"></dt>
@@ -291,7 +298,7 @@
                 <div id="tab_colors" data-page="tab_colors">
                     <dl class="grid-columns" style="display: none;">
                         <dt data-name="IsChecked" data-coltype="3" data-checkall="yes"></dt>
-                        <dt data-name="Name" data-text="LHBIS.FIC.Client.Package.Create.A095" style="width: 200px;">Chart Color Scheme Name</dt>
+                        <dt data-name="Name" data-text="LHBIS.FIC.Client.Package.Create.A095" style="width: 250px;">Chart Color Scheme Name</dt>
                     </dl>
                 </div>
             </div>
@@ -403,11 +410,11 @@
                                 <dt data-name="Type" data-text="LHBIS.FIC.Client.Package.Create.A060" style="width: 150px;">Type</dt>
                                 <dt data-name="Name" data-text="LHBIS.FIC.Client.Package.Create.A020" style="width: 300px;">Name</dt>
                                 <dt data-name="IsVirtualDisplay" data-text="LHBIS.FIC.Client.Package.Create.A036" style="width: 80px;">Virtual</dt>
-                                <dt data-name="IsUserCanPublish" data-text="LHBIS.FIC.Client.Package.Create.A034" style="width: 120px;">User Can Publish</dt>
+                                <dt data-name="IsUserCanPublish" data-text="LHBIS.FIC.Client.Package.Create.A034" style="width: 170px;">User Can Publish</dt>
                                 <dt data-name="IsProtect" data-text="LHBIS.FIC.Client.Package.Create.A035" style="width: 80px;">Project</dt>
                                 <dt data-name="IsCoverRefreshTime" data-text="LHBIS.FIC.Client.Package.Create.A089" style="width: 180px;">Overwrite Refresh Time</dt>
                                 <dt data-name="IsCoverTargetData" data-text="LHBIS.FIC.Client.Package.Create.A093" style="width: 180px;">Overwrite Taget Data</dt>
-                                <dt data-name="IsCoverMaxRecCount" data-text="LHBIS.FIC.Client.Package.Create.A094" style="width: 180px;">Overwrite Top Records</dt>
+                                <dt data-name="IsCoverMaxRecCount" data-text="LHBIS.FIC.Client.Package.Create.A094" style="width: 250px;">Overwrite Top Records</dt>
                                 <dt data-name="IsOverwriteTableFilter" data-text="LHBIS.FIC.Client.Package.Create.A092" style="width: 180px;">Overwrite Table Filter</dt>
                             </dl>
                         </div>
@@ -422,7 +429,7 @@
             <input id="button_next" type="button" data-lgid="LHBIS_MULTILANGUAGE_COMMON_A005" value="Next" onclick="nextclick()" />
             <input id="button_create" type="button" data-lgid="LHBIS_FIC_CLIENT_PACKAGE_CREATE_A053" value="Create" style="display: none;" onclick="createPackage();" />
         </div>
-        <div id="mask_bg" class="maskbg" style="display: none; z-index: 550;"><div class="loading c-spin"></div></div>
+        <div id="mask_bg" class="maskbg" style="display: none; z-index: 550;"><%--<div class="loading c-spin"></div>--%></div>
     </div>
 </asp:Content>
 

Site/fic/fic/Management/DataConnections.aspx

@@ -26,7 +26,7 @@
         var gridCtrl;
         var selectIID;
         var selectData;
-        var DataGriew = window.GridView || window['g5-gridview'];
+        var DataGriew = window['g5-gridview'];
         var DcVuelist;
 
         function initDatatable() {

Site/fic/fic/Management/DataSourceManagement.aspx

@@ -32,7 +32,7 @@
 
     <script type="text/javascript">
 
-        var DataGriew = window.GridView || window['g5-gridview'];
+        var DataGriew = window['g5-gridview'];
 
         function childPageInitLanguage() {
             $(".topTools").applyLanguageText();

Site/fic/fic/Management/DataTableManage.aspx

@@ -10,7 +10,6 @@
     <link href="<%=Common.GenerateUrl("fic/css/tabcontrol.css") %>" rel="stylesheet" />
     <link type="text/css" href="<%=Common.GenerateUrl("fic/js/components/css/gridview.css") %>" rel="stylesheet" />
     <link href="<%=Common.GenerateUrl("fic/js/components/css/datagrid.css") %>" rel="stylesheet" />
-
     <style type="text/css">
         .FloatLeft {
             float: left;
@@ -37,9 +36,11 @@
     <script type="text/javascript" src="<%=Common.GenerateUrl("fic/js/Management/dependenciesDialog.js") %>"></script>
     <script type="text/javascript" src="<%=Common.GenerateUrl("fic/js/Management/DataTableWizard.js") %>"></script>
     <script type="text/javascript" src="<%=Common.GenerateUrl("fic/js/charts/grid.js") %>"></script>
-      <script type="text/javascript" src="<%=Common.GenerateUrl("fic/js/components/datagrid.js")%>"></script>
+    <script type="text/javascript" src="<%=Common.GenerateUrl("fic/js/components/datagrid.js")%>"></script>
     <script type="text/javascript" src="<%=Common.GenerateUrl("fic/js/components/gridview.js")%>"></script>
     <script type="text/javascript" src="<%=Common.GenerateUrl("fic/js/Management/SQLGenerator.js")%>"></script>
+    <script type="text/javascript" src="<%=Common.GenerateUrl("js/codemirror.min.js")%>"></script>
+    <script type="text/javascript" src="<%=Common.GenerateUrl("js/active-line.js")%>"></script>
     <script type="text/javascript">
 
         function childPageInitLanguage() {

Site/fic/fic/Management/DataTableTaskSchedules.aspx

@@ -464,7 +464,7 @@
                         width = 610;
                         height =530;
                     }
-                    if (_utility.currentLang == "fr-fr") {
+                    if (_utility.NeedModifyUI()) {
                         width = 610;
                         height = 532;
                     }

Site/fic/fic/Management/DrilldownURLProvider.aspx

@@ -19,7 +19,7 @@
     <script src="<%=Common.GenerateUrl("fic/js/controls/form.js") %>"></script>
     <script type="text/javascript" src="<%=Common.GenerateUrl("fic/js/components/gridview.js")%>"></script>
     <script type="text/javascript">
-        var GridView = window.GridView || window['g5-gridview'];
+        var GridView = window['g5-gridview'];
         var Drilldownlsit;
         function childPageInitLanguage() {
             $('#module_main').parent().applyLanguageText();

Site/fic/fic/Management/ExportDataConnections.aspx

@@ -46,7 +46,7 @@
     
     <script type="text/javascript">
         var confiDataGrid;
-        var GridView = window.GridView || window['g5-gridview'];
+        var GridView = window['g5-gridview'];
         var DataGrid = window.DataGrid || window['g5-datagrid'];
         var selectGrid;
         var selectDatalist;

Site/fic/fic/Management/FiltersManagement.aspx

@@ -39,11 +39,11 @@
             overflow-y: auto;
         }
 
-        .data-grid .autoHeightBody {
+        .data-grid-old .autoHeightBody {
             position: static;
             /*max-height: 260px;*/
         }
-        .data-grid .autoGlobal {
+        .data-grid-old .autoGlobal {
             max-height: 270px;
         }
 

Site/fic/fic/Management/GlobalFilter.aspx

@@ -245,7 +245,7 @@
                     }
                     var width = 410;
                     var height = 200;
-                    if (_utility.currentLang == "fr-fr") {
+                    if (_utility.NeedModifyUI()) {
                         width = 505;
                         height = 205;
                     }

Site/fic/fic/Management/ImportDataConnections.aspx

@@ -85,7 +85,7 @@
     <script src="<%=Common.GenerateUrl("fic/js/Management/func.js") %>"></script>
     <script type="text/javascript" src="<%=Common.GenerateUrl("fic/js/components/datagrid.js")%>"></script>
     <script type="text/javascript">
-        var GridView = window.GridView || window['g5-gridview'];
+        var GridView = window['g5-gridview'];
         var selectGrid;
         var EMPackageValidateType = {
             'Password': 2,
@@ -460,7 +460,7 @@
             <input id="button_next" type="button" data-lgid="LHBIS_MULTILANGUAGE_COMMON_A005" disabled="disabled" onclick="buttonnext();" value="Next" />
             <input id="button_import" type="button" data-lgid="LHBIS_FIC_CLIENT_PACKAGE_IMPORT_A041" value="Import" onclick="buttonimport();" style="display: none;" />
         </div>
-        <div id="mask_bg" class="maskbg" style="display: none; z-index: 550;"><div class="loading c-spin"></div></div>
+        <div id="mask_bg" class="maskbg" style="display: none; z-index: 550;"><%--<div class="loading c-spin"></div>--%></div>
     </div>
     
     

Site/fic/fic/Management/ImportPackage.aspx

@@ -230,7 +230,7 @@
                             <dt data-name="ObjectTypeName" data-text="LHBIS.FIC.Client.Package.Import.A026" data-sort="no" style="width: 150px;">Type</dt>
                             <dt data-name="Name" data-text="LHBIS.FIC.Client.Package.Import.A027" style="width: 300px;">Name</dt>
                             <dt data-name="IsVirtualDisplay" data-text="LHBIS.FIC.Client.Package.Import.A029" data-sort="no" style="width: 80px;">Virtual</dt>
-                            <dt data-name="IsUserCanPublishDisplay" data-text="LHBIS.FIC.Client.Package.Import.A030" data-sort="no" style="width: 120px;">User Can Publish</dt>
+                            <dt data-name="IsUserCanPublishDisplay" data-text="LHBIS.FIC.Client.Package.Import.A030" data-sort="no" style="width: 150px;">User Can Publish</dt>
                             <dt data-name="IsProtectDisplay" data-text="LHBIS.FIC.Client.Package.Import.A031" data-sort="no" style="width: 80px;">Protect</dt>
                             <dt data-name="IsCoverRefreshTimeDisplay" data-text="LHBIS.FIC.Client.Package.Import.A100" data-sort="no" style="width: 155px;">Overwrite Refresh Time</dt>
                             <dt data-name="IsCoverTargetDataDisplay" data-text="LHBIS.FIC.Client.Package.Import.A102" data-sort="no" style="width: 155px;">Overwrite Target Data</dt>
@@ -266,7 +266,7 @@
             <input id="button_next" type="button" data-lgid="LHBIS_MULTILANGUAGE_COMMON_A005" value="Next" disabled="disabled" />
             <input id="button_import" type="button" data-lgid="LHBIS_FIC_CLIENT_PACKAGE_IMPORT_A041" value="Import" style="display: none;" />
         </div>
-        <div id="mask_bg" class="maskbg" style="display: none; z-index: 550;"><div class="loading c-spin"></div></div>
+        <div id="mask_bg" class="maskbg" style="display: none; z-index: 550;"><%--<div class="loading c-spin"></div>--%></div>
     </div>
 </asp:Content>
 

Site/fic/fic/Management/PurgePackage.aspx

@@ -127,6 +127,7 @@
                     <li data-href="tab_filters" data-lgid="LHBIS_FIC_CLIENT_PACKAGE_CREATE_A082">Global Filters</li>
                     <li data-href="tab_snapshots" data-lgid="LHBIS_FIC_CLIENT_PACKAGE_CREATE_A087">Snapshot</li>
                     <li data-href="tab_datatablecaches" data-lgid="LHBIS_FIC_CLIENT_MANAGEMENT_MAINPAGE_A123">SQL Queries</li>
+                    <li data-href="tab_schedules" data-lgid="LHBIS_FIC_CLIENT_PACKAGE_CREATE_A098">Schedules</li>
                     <li data-href="tab_colors" data-lgid="LHBIS_FIC_CLIENT_PACKAGE_CREATE_A096">Chart Color Scheme</li>
                     <li style="clear: both;"></li>
                 </ul>
@@ -135,7 +136,7 @@
                         <dt data-name="IsChecked" data-events="wspCheck" data-coltype="3" data-checkall="yes"></dt>
                         <dt data-name="Name" data-text="LHBIS.FIC.Client.Package.Create.A043" style="width: 150px;">Workspace</dt>
                         <dt data-name="Description" data-text="LHBIS.FIC.Client.Package.Create.A050" style="width: 350px;">Description</dt>
-                        <dt data-name="IsUserCanPublishDisplay" data-text="LHBIS.FIC.Client.Package.Create.A034" style="width: 120px;">User Can Publish</dt>
+                        <dt data-name="IsUserCanPublishDisplay" data-text="LHBIS.FIC.Client.Package.Create.A034" style="width: 150px;">User Can Publish</dt>
                         <dt data-name="IsProtectDisplay" data-text="LHBIS.FIC.Client.Package.Create.A035" style="width: 80px;">Protect</dt>
                     </dl>
                 </div>
@@ -144,7 +145,7 @@
                         <dt data-name="IsChecked" data-events="Board" data-coltype="3" data-checkall="yes"></dt>
                         <dt data-name="Name" data-text="LHBIS.FIC.Client.Package.Create.A044" style="width: 150px;">Board</dt>
                         <dt data-name="Description" data-text="LHBIS.FIC.Client.Package.Create.A050" style="width: 350px;">Description</dt>
-                        <dt data-name="IsUserCanPublishDisplay" data-text="LHBIS.FIC.Client.Package.Create.A034" style="width: 120px;">User Can Publish</dt>
+                        <dt data-name="IsUserCanPublishDisplay" data-text="LHBIS.FIC.Client.Package.Create.A034" style="width: 150px;">User Can Publish</dt>
                         <dt data-name="IsProtectDisplay" data-text="LHBIS.FIC.Client.Package.Create.A035" style="width: 80px;">Protect</dt>
                     </dl>
                 </div>
@@ -153,7 +154,7 @@
                         <dt data-name="IsChecked" data-coltype="3" data-events="Chart" data-checkall="yes"></dt>
                         <dt data-name="Name" data-text="LHBIS.FIC.Client.Package.Create.A045" style="width: 150px;">Chart</dt>
                         <dt data-name="Description" data-text="LHBIS.FIC.Client.Package.Create.A050" style="width: 350px;">Description</dt>
-                        <dt data-name="IsUserCanPublishDisplay" data-text="LHBIS.FIC.Client.Package.Create.A034" style="width: 120px;">User Can Publish</dt>
+                        <dt data-name="IsUserCanPublishDisplay" data-text="LHBIS.FIC.Client.Package.Create.A034" style="width: 150px;">User Can Publish</dt>
                         <dt data-name="IsProtectDisplay" data-text="LHBIS.FIC.Client.Package.Create.A035" style="width: 80px;">Protect</dt>
                     </dl>
                 </div>
@@ -162,7 +163,7 @@
                         <dt data-name="IsChecked"  data-events="Message"  data-coltype="3" data-checkall="yes"></dt>
                         <dt data-name="Name" data-text="LHBIS.FIC.Client.Package.Create.A046" style="width: 150px;">Message</dt>
                         <dt data-name="Description" data-text="LHBIS.FIC.Client.Package.Create.A050" style="width: 350px;">Description</dt>
-                        <dt data-name="IsUserCanPublishDisplay" data-text="LHBIS.FIC.Client.Package.Create.A034" style="width: 120px;">User Can Publish</dt>
+                        <dt data-name="IsUserCanPublishDisplay" data-text="LHBIS.FIC.Client.Package.Create.A034" style="width: 150px;">User Can Publish</dt>
                         <dt data-name="IsProtectDisplay" data-text="LHBIS.FIC.Client.Package.Create.A035" style="width: 80px;">Protect</dt>
                     </dl>
                 </div>
@@ -171,7 +172,7 @@
                         <dt data-name="IsChecked" data-coltype="3" data-events="DataTable"  data-checkall="yes"></dt>
                         <dt data-name="Name" data-text="LHBIS.FIC.Client.Package.Create.A047" style="width: 150px;">Data Table</dt>
                         <dt data-name="Description" data-text="LHBIS.FIC.Client.Package.Create.A050" style="width: 350px;">Description</dt>
-                        <dt data-name="IsUserCanPublishDisplay" data-text="LHBIS.FIC.Client.Package.Create.A034" style="width: 120px;">User Can Publish</dt>
+                        <dt data-name="IsUserCanPublishDisplay" data-text="LHBIS.FIC.Client.Package.Create.A034" style="width: 150px;">User Can Publish</dt>
                         <dt data-name="IsProtectDisplay" data-text="LHBIS.FIC.Client.Package.Create.A035" style="width: 80px;">Protect</dt>
                     </dl>
                 </div>
@@ -181,7 +182,7 @@
                         <dt data-name="Name" data-text="LHBIS.FIC.Client.Package.Create.A048" style="width: 150px;">Data Connection</dt>
                         <dt data-name="Description" data-text="LHBIS.FIC.Client.Package.Create.A050" style="width: 350px;">Description</dt>
                         <dt data-name="IsVirtualDisplay" data-text="LHBIS.FIC.Client.Package.Create.A036" style="width: 80px;">Virtual</dt>
-                        <dt data-name="IsUserCanPublishDisplay" data-text="LHBIS.FIC.Client.Package.Create.A034" style="width: 120px;">User Can Publish</dt>
+                        <dt data-name="IsUserCanPublishDisplay" data-text="LHBIS.FIC.Client.Package.Create.A034" style="width: 150px;">User Can Publish</dt>
                         <dt data-name="IsProtectDisplay" data-text="LHBIS.FIC.Client.Package.Create.A035" style="width: 80px;">Protect</dt>
                     </dl>
                 </div>
@@ -204,7 +205,7 @@
                         <dt data-name="IsChecked" data-coltype="3" data-events="Snapshot" data-checkall="yes"></dt>
                         <dt data-name="Name" data-text="LHBIS.FIC.Client.Package.Create.A087" style="width: 150px;">Snapshot</dt>
                         <dt data-name="Description" data-text="LHBIS.FIC.Client.Package.Create.A050" style="width: 350px;">Description</dt>
-                        <dt data-name="IsUserCanPublishDisplay" data-text="LHBIS.FIC.Client.Package.Create.A034" style="width: 120px;">User Can Publish</dt>
+                        <dt data-name="IsUserCanPublishDisplay" data-text="LHBIS.FIC.Client.Package.Create.A034" style="width: 150px;">User Can Publish</dt>
                         <dt data-name="IsProtectDisplay" data-text="LHBIS.FIC.Client.Package.Create.A035" style="width: 80px;">Protect</dt>
                     </dl>
                 </div>
@@ -214,10 +215,16 @@
                         <dt data-name="Name" data-text="LHBIS.FIC.Client.Package.Create.A097" style="width: 200px;">SQL Query</dt>
                     </dl>
                 </div>
+                <div id="tab_schedules" data-page="tab_schedules">
+                    <dl class="grid-columns" style="display: none;">
+                        <dt data-name="IsChecked" data-coltype="3" data-checkall="yes"></dt>
+                        <dt data-name="Name" data-text="LHBIS_FIC_CLIENT_MODULES_JOBLISTMODULE_LIST_A001" style="width: 200px;">Job Name</dt>
+                    </dl>
+                </div>
                 <div id="tab_colors" data-page="tab_colors">
                     <dl class="grid-columns" style="display: none;">
                         <dt data-name="IsChecked" data-coltype="3" data-checkall="yes"></dt>
-                        <dt data-name="Name" data-text="LHBIS.FIC.Client.Package.Create.A095" style="width: 150px;">Chart Color Scheme Name</dt>
+                        <dt data-name="Name" data-text="LHBIS.FIC.Client.Package.Create.A095" style="width: 250px;">Chart Color Scheme Name</dt>
                     </dl>
                 </div>
             </div>
@@ -226,7 +233,7 @@
         <div class="topTools stepFuncs">
             <input id="button_purge" type="button" data-lgid="LHBIS_FIC_CLIENT_PACKAGE_PURGE_A004" value="Purge" />
         </div>
-        <div id="mask_bg" class="maskbg" style="display: none; z-index: 550;"><div class="loading c-spin"></div></div>
+        <div id="mask_bg" class="maskbg" style="display: none; z-index: 550;"><%--<div class="loading c-spin"></div>--%></div>
     </div>
 </asp:Content>
 

Site/fic/fic/Management/SnapshotsManage.aspx

@@ -431,7 +431,7 @@
                 var frm = new $GlobalFilterEdit();
                
                 frm.showOpen($("body"), FilterTypes, datainfo, checkFrs, namearr, initGridLayOut);
-                if (_utility.currentLang == "fr-fr") {
+                if (_utility.NeedModifyUI()) {
                     if (isFireFox) {
                         frm.formCtrl.css({ "min-width": "610px", "min-height": "540px" });
                         frm.bodyCtrl.css({ "min-width": "610px", "min-height": "540px" });
@@ -665,7 +665,7 @@
             var frm = new $GlobalFilterEdit();
             frm.showOpen($("body"), FilterTypes, undefined, checkFrs, Snapshotsname, initGridLayOut);
 
-            if (_utility.currentLang == "fr-fr") {
+            if (_utility.NeedModifyUI()) {
                 if (isFireFox) {
                     frm.formCtrl.css({ "min-width": "610px", "min-height": "540px" });
                     frm.bodyCtrl.css({ "min-width": "610px", "min-height": "540px" });
@@ -710,7 +710,7 @@
 
                     var width = 720;
                     var height = 480;
-                    if (_utility.currentLang == "fr-fr") {
+                    if (_utility.NeedModifyUI()) {
                         if (isFireFox) {
                             width = 720;
                             height = 537;
@@ -759,7 +759,7 @@
                     var lisc = $('<li style="clear:both;"></li>').appendTo(ul);
                     //基本信息
                   
-                    if (_utility.currentLang == "fr-fr" && isFireFox) {
+                    if (_utility.NeedModifyUI() && isFireFox) {
                         var divjob = $('<div id="JobSchedule" class="dataJob"  ></div>').css({ "height":"" }).appendTo(div);
                     } else {
                         var divjob = $('<div id="JobSchedule" class="dataJob" ></div>').css({ "height": "370px" }).appendTo(div);
@@ -1141,7 +1141,7 @@
                     if (checkFrs){
                     //FRS 映射
                      
-                        if (_utility.currentLang == "fr-fr" && isFireFox) {
+                        if (_utility.NeedModifyUI() && isFireFox) {
                             var divsnaps = $('<div id="Snapshots" class="dataJob" style="display:none;"></div>').css({ "height": "428px" }).appendTo(div);
                         } else {
                             var divsnaps = $('<div id="Snapshots" class="dataJob" style="display:none;"></div>').css({ "height": "370px" }).appendTo(div);

Site/fic/fic/Management/SystemOptions.aspx

@@ -51,8 +51,10 @@
             $("#col_MaxRecordsDataText").text(GetLanguageByKey("LHBIS_FIC_CLIENT_MODULES_SYSTEMOPTIONSCTRL_A031", "Max count of data table records"));
             //$("#col_ConnectorServer").text(GetLanguageByKey("LHBIS_FIC_CLIENT_MODULES_SYSTEMOPTIONSCTRL_A040", "Connector Server"));
             //$("#col_ConnectorToken").text(GetLanguageByKey("LHBIS_FIC_CLIENT_MODULES_SYSTEMOPTIONSCTRL_A041", "Connector Token"));
-            $("#col_CustomerTimeZone").text(GetLanguageByKey("LHBIS_FIC_CLIENT_MODULES_SYSTEMOPTIONSCTRL_A056", "Time Zone"));
+            //$("#col_CustomerTimeZone").text(GetLanguageByKey("LHBIS_FIC_CLIENT_MODULES_SYSTEMOPTIONSCTRL_A056", "Time Zone"));
             $("#col_PublisherText").text(GetLanguageByKey("LHBIS_FIC_CLIENT_MODULES_SYSTEMOPTIONSCTRL_A025", "Publisher name"));
+            $("#<%=col_TextSender.ClientID%>").text(GetLanguageByKey("LHBIS_FIC_CLIENT_MODULES_SYSTEMOPTIONSCTRL_A077", "SMS Sender Numbers"));
+            $("#textSender1").attr("placeholder", GetLanguageByKey('LHBIS_FIC_CLIENT_MODULES_SYSTEMOPTIONSCTRL_A078', "Please use ';' for multiple numbers."));
             //$("#up_languageFileText").text(GetLanguageByKey("LHBIS_FIC_CLIENT_MODULES_SYSTEMOPTIONSCTRL_A016", "Upload language file"));
             $("#up_systemLogo").text(GetLanguageByKey("LHBIS_FIC_CLIENT_MODULES_SYSTEMOPTIONSCTRL_A007", "Upload system logo file"));
             var tipStr = GetLanguageByKey("LHBIS_FIC_CLIENT_MODULES_SYSTEMOPTIONSCTRL_A035", "Changing this value to a large number might cause serious performance issue.");
@@ -131,6 +133,7 @@
             //ShowLoadingMask();
             $('#maxConcurrentText1').val(decodeURIComponent($('#<%=maxConcurrentText.ClientID%>').val()));
             $('#publisherText1').val(decodeURIComponent($('#<%=publisherText.ClientID%>').val()));
+            $('#textSender1').val(decodeURIComponent($('#<%=textSender.ClientID%>').val()));
             <%--$('#Terms1').val(decodeURIComponent($('#<%=Terms.ClientID%>').val()));--%>
             <%--$('#txtConnectorServer1').val(decodeURIComponent($('#<%=txtConnectorServer.ClientID%>').val()));
             $('#txtConnectorToken1').val(decodeURIComponent($('#<%=txtConnectorToken.ClientID%>').val()));--%>
@@ -139,6 +142,7 @@
         function onSave() {
             $('#<%=maxConcurrentText.ClientID%>').val(encodeURIComponent($('#maxConcurrentText1').val()));
             $('#<%=publisherText.ClientID%>').val(encodeURIComponent($('#publisherText1').val()));
+            $('#<%=textSender.ClientID%>').val(encodeURIComponent($('#textSender1').val()));
             <%--$('#<%=Terms.ClientID%>').val(encodeURIComponent($('#Terms1').val()));--%>
             <%--$('#<%=txtConnectorServer.ClientID%>').val(encodeURIComponent($('#txtConnectorServer1').val()));
             $('#<%=txtConnectorToken.ClientID%>').val(encodeURIComponent($('#txtConnectorToken1').val()));--%>
@@ -257,6 +261,19 @@
                     <asp:TextBox runat="server" ID="publisherText" style="display: none;" />
                 </td>
             </tr>
+            <%--<tr>
+                <td id="col_CustomerTimeZone">Time Zone</td>
+                <td>
+                    <asp:DropDownList ID="selTimeZone" runat="server"></asp:DropDownList>
+                </td>
+            </tr>--%>
+            <tr id="rowTextSender" runat="server">
+                <td id="col_TextSender">Text Sender</td>
+                <td>
+                    <input type="text" id="textSender1" placeholder="Please use ';' for multiple numbers. " />
+                    <asp:TextBox runat="server" ID="textSender"  style="display: none;" />
+                </td>
+            </tr>
             <%--<tr>
                 <td id="up_languageFileText">Upload language file</td>
                 <td>
@@ -280,8 +297,8 @@
                     <img id="upImg" height="130" /></td>
             </tr>
         </table>
-        <hr style="display: none;" />
-        <table style="min-width: 550px; display: none;">
+        <hr />
+        <table style="min-width: 550px;">
             <tr>
                 <td id="col_areaunits">Area Units</td>
                 <td>

Site/fic/fic/Management/SystemOptions.aspx.cs

@@ -3,6 +3,7 @@ using FI.FIC.Contracts.DataObjects.Enumeration;
 using FI.FIC.Models;
 using FI.FIC.Models.Management;
 using Foresight.ServiceModel;
+using Foresight.Standard;
 using Foresight.Standard.Units;
 using System;
 using System.Collections.Generic;
@@ -99,6 +100,32 @@ public partial class _Default : FIManagementBasePage
 
         publisherText.Text = string.IsNullOrEmpty(FICParams.Publisher) ? FICLicense.CompanyID : FICParams.Publisher;
 
+        string sender = FICParams.TextSender;
+        if (!string.IsNullOrEmpty(sender))
+        {
+            if (sender.IndexOf(";") >= 0)
+            {
+                string[] ss = sender.Split(';');
+                if (ss != null && ss.Length > 0)
+                {
+                    List<string> list = new List<string>();
+                    foreach (var item in ss)
+                    {
+                        string s = PhoneNumber.FormatPhoneNumber(item);
+                        if (!string.IsNullOrEmpty(s))
+                        {
+                            list.Add(s);
+                        }
+                    }
+                    textSender.Text = string.Join(";", list);
+                }
+            }
+            else
+            {
+                textSender.Text = PhoneNumber.FormatPhoneNumber(sender);
+            }
+        }
+
         if (userItem != null && IsHostAdmin(userItem.IID))
         {
             maxRecordsDataText.Text = FICParams.MAX_RECORDS_DT_ALLOWED.ToString();
@@ -348,6 +375,35 @@ public partial class _Default : FIManagementBasePage
             //FICParams.SetStringParameter("ConnectorServer", Server.UrlDecode(txtConnectorServer.Text));
             //FICParams.SetStringParameter("ConnectorToken", Server.UrlDecode(txtConnectorToken.Text));
             FICParams.SetStringParameter("Publisher", Server.UrlDecode(publisherText.Text).Trim());
+            string textsender = Server.UrlDecode(textSender.Text).Trim();
+            if (!string.IsNullOrEmpty(textsender))
+            {
+                if (textsender.IndexOf(";") >= 0)
+                {
+                    string[] ss = textsender.Split(';');
+                    if (ss != null && ss.Length > 0)
+                    {
+                        List<string> list = new List<string>();
+                        foreach (var item in ss)
+                        {
+                            string s = PhoneNumber.PreparePhonenumber(item);
+                            if (!string.IsNullOrEmpty(s))
+                            {
+                                list.Add(s);
+                            }
+                        }
+                        FICParams.SetStringParameter("TextSender", string.Join(";", list));
+                    }
+                }
+                else
+                {
+                    FICParams.SetStringParameter("TextSender", PhoneNumber.PreparePhonenumber(textsender));
+                }
+            }
+            else
+            {
+                FICParams.SetStringParameter("TextSender", "");
+            }
             if (userItem != null && IsHostAdmin(userItem.IID))
             {
                 FICParams.SetStringParameter("MAX_RECORDS_DT_ALLOWED", maxRecordsDataTmp.ToString());

Site/fic/fic/Management/TaskSchedule.aspx

@@ -565,7 +565,7 @@
                         width = 610;
                         height =450;
                     }
-                    if (_utility.currentLang == "fr-fr") {
+                    if (_utility.NeedModifyUI()) {
                         width = 610;
                         height = 452;
                     }

Site/fic/fic/Management/UserManagement.aspx

@@ -8,6 +8,7 @@
     <link href="<%=Common.GenerateUrl("fic/css/tabcontrol.css") %>" rel="stylesheet" />
     <link href="<%=Common.GenerateUrl("fic/css/theme.css") %>" rel="stylesheet" />
     <link href="<%=Common.GenerateUrl("fic/css/schedule.css") %>" rel="stylesheet" />
+    <link type="text/css" href="<%=Common.GenerateUrl("fic/js/components/css/datagrid.css") %>" rel="stylesheet" />
     <style type="text/css">
         .no_wrap th {
             white-space: nowrap;
@@ -52,6 +53,15 @@
                     vertical-align: top;
                 }
 
+                .dialog-content table td.label1 {
+                    width: 150px;
+                    text-align: right;
+                    padding-right: 10px;
+                    line-height: 24px;
+                    height: 24px;
+                    vertical-align: top;
+                }
+
                 .dialog-content table td input,
                 .dialog-content table td textarea,
                 .dialog-content table td select {
@@ -62,19 +72,23 @@
                     padding: 1px;
                 }
 
-                /*.dialog-content table td select {
+        #schedule-customization-grid table td input[type="checkbox"] {
+            width: auto;
+        }
+
+        /*.dialog-content table td select {
                     height: 24px;
                     width: 344px;
                 }*/
 
-                .dialog-content table td input[type="checkbox"] {
-                    border: none;
-                }
+        .dialog-content table td input[type="checkbox"] {
+            border: none;
+        }
 
-                .dialog-content table td textarea {
-                    height: 100px;
-                    max-width: 340px;
-                }
+        .dialog-content table td textarea {
+            height: 100px;
+            max-width: 340px;
+        }
 
         #dialog_user_manualpass,
         #dialog_user_randompass,
@@ -90,7 +104,7 @@
         }
 
         #SubMSG_leftTD .gridchartcontainer,
-        #SubMSG_rightTD .gridchartcontainer{
+        #SubMSG_rightTD .gridchartcontainer {
             border: none;
         }
 
@@ -99,13 +113,20 @@
         }
     </style>
     <script src="<%=Common.GenerateUrl("fic/js/controls/gridctrl.js") %>"></script>
+    <script type="text/javascript" src="<%=Common.GenerateUrl("fic/js/controls/editGridCtrl.js") %>"></script>
     <script src="<%=Common.GenerateUrl("fic/js/controls/controls.js") %>"></script>
+    <script type="text/javascript" src="<%=Common.GenerateUrl("fic/js/components/datagrid.js")%>"></script>
     <script src="<%=Common.GenerateUrl("fic/js/pivot.js")%>"></script>
     <script src="<%=Common.GenerateUrl("fic/js/chart.js") %>"></script>
     <script src="<%=Common.GenerateUrl("fic/js/controls/form.js") %>"></script>
     <script src="<%=Common.GenerateUrl("js/datepicker.min.js")%>"></script>
     <script src="<%=Common.GenerateUrl("fic/js/Management/func.js") %>"></script>
     <script src="<%=Common.GenerateUrl("fic/js/Management/UserManagement.js") %>"></script>
+    <script type="text/javascript" src="<%=Common.GenerateUrl("fic/js/controls/wizardctrl.js") %>"></script>
+    <script type="text/javascript" src="<%=Common.GenerateUrl("fic/js/Management/UserAlertFilter.js")%>"></script>
+    <script type="text/javascript" src="<%=Common.GenerateUrl("fic/js/chartManage/chartTypeWizard.js") %>"></script>
+    <script type="text/javascript" src="<%=Common.GenerateUrl("fic/js/Management/filtersSelector.js") %>"></script>
+    <script type="text/javascript" src="<%=Common.GenerateUrl("fic/js/controls/DropDown.js") %>"></script>
     <script type="text/javascript">
         var ldapConnector = false;
         var gridCtrl;
@@ -179,9 +200,9 @@
             $alertdialog.showConfirm(
                 title || DEFAULT_LANG.FICManagement,
                 msg, [
-                    [DEFAULT_LANG.cancel],
-                    [DEFAULT_LANG.ok, onok]
-                ]);
+                [DEFAULT_LANG.cancel],
+                [DEFAULT_LANG.ok, onok]
+            ]);
         }
 
         function showAlert(message, title, icon, next) {
@@ -255,7 +276,7 @@
         var scriber = null;
 
         function OnAdd() {
-          
+
             if (showPasswordSettings == false) {
                 $('#show_addpassword_settings').hide();
             }
@@ -335,7 +356,7 @@
             var page_subscribe = $('#dialog_user div[data-page="tab_subscribe"]');
             page_subscribe.empty().hide();
             var subscribe = new $subscribeMSGpanel();
-            subscribe.append(page_subscribe, useritem.IID.Value, useritem.UserType.Value);
+            subscribe.append(page_subscribe, useritem.IID.Value, useritem.UserType.Value, null, false, 340);
             scriber = subscribe;
             if (loginedParameter('EmailSubscribe')) {
                 $('#dialog_user .tab_header li[data-href="tab_email"]').show();
@@ -389,7 +410,8 @@
             $('#dialog_mobile').valv(useritem.Mobile);
             $('#dialog_business_phone').valv(useritem.BusinessPhone);
             $('#dialog_email').valv(useritem.Email);
-            $('#dialog_user_type').valv(useritem.UserType);
+            $('#dialog_usertimezone').valv(useritem.UserTimeZone),
+                $('#dialog_user_type').valv(useritem.UserType);
             $('#dialog_default_wsp').valv(useritem.DefaultWspIID);
             $('#dialog_default_wsp_mobile').valv(useritem.DefaultMobileWspIID);
             $('#dialog_active').propv('checked', useritem.Enabled);
@@ -553,6 +575,12 @@
                 col.width = list_columns[hd].css.width;
                 col.align = list_columns[hd].css["text-align"]
                 col.key = list_columns[hd].valueIndex;
+                if (list_columns[hd].name == "UserGroups") {
+                    col.allowFilter = true;
+                    col.filterSource = gridficgroup;
+                    col.filterMode = 'in';
+                    col.filterCustom = true;
+                }
                 columns.push(col);
             }
 
@@ -636,6 +664,7 @@
                 'Mobile': $('#dialog_mobile').val(),
                 'BusinessPhone': $('#dialog_business_phone').val(),
                 'Email': $('#dialog_email').val(),
+                'UserTimeZone': $('#dialog_usertimezone').val(),
                 'UserType': $('#dialog_user_type').val(),
                 'DefaultWspIID': $('#dialog_default_wsp').val(),
                 'DefaultMobileWspIID': $('#dialog_default_wsp_mobile').val(),
@@ -927,24 +956,24 @@
         function initGroupsGrid() {
             var columns = [];
             var list_columns = [
-            {
-                name: 'GroupID',
-                text: GetLanguageByKey('LHBIS_FIC_Client_Modules_UserManagerCtrl_B016', 'User Group Name'),
-                valueIndex: 'UserGroupName',
-                css: {
-                    width: 160,
-                    'text-align': 'left'
+                {
+                    name: 'GroupID',
+                    text: GetLanguageByKey('LHBIS_FIC_Client_Modules_UserManagerCtrl_B016', 'User Group Name'),
+                    valueIndex: 'UserGroupName',
+                    css: {
+                        width: 160,
+                        'text-align': 'left'
+                    }
+                },
+                {
+                    name: 'Description',
+                    text: GetLanguageByKey('LHBIS_FIC_Client_Modules_UserManagerCtrl_B017', 'Description'),
+                    valueIndex: 'Description',
+                    css: {
+                        width: 180,
+                        'text-align': 'left'
+                    }
                 }
-            },
-            {
-                name: 'Description',
-                text: GetLanguageByKey('LHBIS_FIC_Client_Modules_UserManagerCtrl_B017', 'Description'),
-                valueIndex: 'Description',
-                css: {
-                    width: 180,
-                    'text-align': 'left'
-                }
-            }
             ];
             // head
             for (var hd in list_columns) {
@@ -1018,12 +1047,201 @@
             });
         }
 
+        function OnCopy() {
+            isSelect = false;
+            $('#mask_bg').show();
+            $('#tr_copyuser').show();
+            var source = [];
+            if (isalluser) {
+                if (users != null && users.length > 0) {
+                    for (var i = 0; i < users.length; i++) {
+                        var u = { ID: users[i].IID, Name: users[i].ID };
+                        source.push(u);
+                    }
+                }
+                $('#dialog_copyuser').dropdownSource(source);
+                $('#dialog_copy_user')
+                    .css({
+                        'top': (document.documentElement.clientHeight - $('#dialog_copy_user').height()) / 3,
+                        'left': (document.documentElement.clientWidth - $('#dialog_copy_user').width()) / 2
+                    })
+                    .showDialog();
+            }
+            else {
+                _network.hostquery('GetUsers', [''], function (data) {
+                    var allusers = data.Result;
+                    if (allusers != null && allusers.length > 0) {
+                        for (var i = 0; i < allusers.length; i++) {
+                            var u = { ID: allusers[i].IID, Name: allusers[i].ID };
+                            source.push(u);
+                        }
+                    }
+                    $('#dialog_copyuser').dropdownSource(source);
+                    $('#dialog_copy_user')
+                        .css({
+                            'top': (document.documentElement.clientHeight - $('#dialog_copy_user').height()) / 3,
+                            'left': (document.documentElement.clientWidth - $('#dialog_copy_user').width()) / 2
+                        })
+                        .showDialog();
+                }, function (err) {
+                    $('#dialog_copyuser').dropdownSource([]);
+                });
+            }
+        }
+
+        var isalluser = false;
+        var isSelect = false;
+        var copyuseriid = '';
+        var newuseriid = '';
+        var incopy = false;
+        function OnCopyUser() {
+            if (incopy) {
+                return;
+            }
+            incopy = true;
+            var userID = $('#dialog_user_id1').val();
+            var email = $('#dialog_user_email1').val();
+            var name = $('#dialog_user_name1').val();
+            var pwd = $('#dialog_user_password2').val();
+            var title = GetLanguageByKey("FI_HOST_MANAGEMENT_USER_A116", 'Copy User');
+            if (!userID || userID.trim().length == 0) {
+                showAlert(GetLanguageByKey("FI_FRS_M0020", 'Please enter a user ID.'), title, undefined, function () { $('#dialog_user_id1').focus(); });
+                incopy = false;
+                return;
+            }
+            if ($('#dialog_user_randompass1').prop('checked')) {
+                if (!email || email.trim().length == 0) {
+                    showAlert(GetLanguageByKey("FI_FRS_C0040", 'The email address cannot be empty when you need to cenerat temp password.'), title, undefined, function () { $('#dialog_user_email1').focus(); });
+                    incopy = false;
+                    return;
+                }
+                if (!isEmail(email)) {
+                    showAlert(GetLanguageByKey("FI_FRS_C0041", 'The email address is invalid.'), title, undefined, function () { $('#dialog_user_email1').focus(); });
+                    incopy = false;
+                    return;
+                }
+            }
+
+            if (!name || name.trim().length == 0) {
+                showAlert(GetLanguageByKey("FI_FRS_M0021", 'Please enter a user name.'), title, undefined, function () { $('#dialog_user_name1').focus(); });
+                incopy = false;
+                return;
+            }
+            if (!$('#dialog_user_randompass1').prop('checked')) {
+                if (pwd.length < 8) {
+                    showAlert({
+                        LGID: 'USERMANAGERCTRL_B019',
+                        Default: 'A password must contain at least 8 characters with a mix of uppercase letters, lowercase letters and numbers.'
+                    }, undefined, undefined, function () { $('#dialog_user_password2').focus(); });
+                    incopy = false;
+                    return;
+                }
+                if (getStrength(pwd) < 2) {
+                    showAlert({
+                        LGID: 'USERMANAGERCTRL_B019',
+                        Default: 'A password must contain at least 8 characters with a mix of uppercase letters, lowercase letters and numbers.'
+                    }, undefined, undefined, function () { $('#dialog_user_password2').focus(); });
+                    incopy = false;
+                    return;
+                }
+                var pass2 = $('#dialog_user_password3').val();
+                if (pwd !== pass2) {
+                    showAlert({
+                        LGID: 'UserManagerCtrl_A028',
+                        Default: 'Password inconsistent.'
+                    }, undefined, undefined, function () { $('#dialog_user_password3').focus(); });
+                    incopy = false;
+                    return;
+                }
+
+            } else {
+                pwd = "";
+            }
+
+            if (!isSelect) {
+                var tmp = $('#dialog_copyuser').dropdownVal();
+                if (tmp !== undefined) {
+                    copyuseriid = tmp;
+                }
+                else {
+                    var s = GetLanguageByKey("FI_HOST_MANAGEMENT_USER_A117", "Please select a copy user.");
+                    showAlert(s, title);
+                    incopy = false;
+                    return;
+                }
+            }
+            enableUI(false);
+            _network.hostquery('CopyFICUser', [userID, name, email, pwd, copyuseriid], function (data) {
+                incopy = false;
+                if (data.Result !== 'OK') {
+
+                    showAlert(GetLanguageByKey('LHBIS_EXCEPTION_SCENE_A016', 'An error occurred in user management.') + '<br/>' + (data.Result || data.ErrorMessage));
+                    enableUI(true, true);
+                } else {
+                    if (typeof (data) === "string" && data.indexOf("@error@") >= 0) {
+                        var msg = data.replace("@error@", "");
+                        showAlert(msg, title);
+                        enableUI(true);
+                    } else {
+                        $('#dialog_user_id1').val('');
+                        $('#dialog_user_name1').val('');
+                        $('#dialog_user_email1').val('');
+                        $('#dialog_user_randompass1').prop('checked', false);
+                        $('#dialog_user_password2').prop('disabled', false);
+                        $('#dialog_user_password3').prop('disabled', false);
+                        $('#dialog_user_password2').val('');
+                        $('#dialog_user_password3').val('');
+                        $('#dialog_copyuser').dropdownVal('-1');
+                        $('#dialog_copy_user').hideDialog();
+                        OnRefresh();
+                    }
+
+                    $('#dialog_user').hideDialog();
+                    enableUI(true);
+                    OnRefresh();
+                }
+            }, function (err) {
+                if (err && err.ErrorMessage) {
+                    showAlert(GetLanguageByKey('LHBIS_EXCEPTION_SCENE_A016', 'An error occurred in user management.') + '<br/>' + err.ErrorMessage);
+                } else {
+                    console.log(err);
+                    showAlert({
+                        LGID: 'LHBIS_EXCEPTION_E0X65027020',
+                        Default: 'Failed to save the user.'
+                    });
+                }
+                enableUI(true, true);
+            });
+
+        }
+
+        var gridficgroup = [];
+        function GetAllFICGroup() {
+            _network.hostquery('GetAllGroups', '', function (e) {
+                if (!e || e.ErrorCode != 0) {
+                    showAlert(e.ErrorMessage);
+                    return;
+                }
+                if (e.Result.length > 0) {
+                    gridficgroup.push({ DisplayValue: '', Value: '' });
+                }
+
+                for (var i = 0; i < e.Result.length; i++) {
+                    var r = e.Result[i];
+                    var fr = { DisplayValue: r['UserGroupName'] + '', Value: r['UserGroupName'] };
+                    gridficgroup.push(fr);
+                }
+            }, function (err) {
+                console.log(err);
+            });
+        }
+
         $(function () {
             $(window).resize(function () {
                 $('#Users_list').css('height', $(window).height() - 38);
                 gridCtrl && gridCtrl.resize();
             }).resize();
-
+            GetAllFICGroup();
             initDatatable();
 
             // dialog user
@@ -1074,15 +1292,16 @@
             });
 
             initGridLayOut();
-            
-            if(showPhone==false)
-            {
+
+            if (showPhone == false) {
                 $('.tr_phone').hide();
             }
 
 
             // groups
             initGroupsGrid();
+
+            initSelectorGrids();
             $('#ctl_groups_add').click(function () {
                 var gridavas = $('#group_avas').data('grid');
                 var gridusers = $('#group_users').data('grid');
@@ -1148,6 +1367,35 @@
                     $('li[data-href="tab_email"]').css('display', 'none');
                 }
             });
+
+            $('#dialog_copy_user').dialog(function () {
+                $('#dialog_user_id1').val('');
+                $('#dialog_user_name1').val('');
+                $('#dialog_user_email1').val('');
+                $('#dialog_user_randompass1').prop('checked', false);
+                $('#dialog_user_password2').prop('disabled', false);
+                $('#dialog_user_password3').prop('disabled', false);
+                $('#dialog_user_password2').val('');
+                $('#dialog_user_password3').val('');
+                $('#dialog_copyuser').dropdownVal('-1');
+                showbg(false);
+            });
+
+            $('#dialog_copyuser').dropdown([{ ID: '', Name: ' ' }], {
+                search: true,
+                valueKey: 'ID',
+                textKey: 'Name',
+                searchPlaceholder: GetLanguageByKey('LHBIS_FIC_CLIENT_MODULES_USERMANAGERCTRL_A046','Search') + "...",
+            });
+
+            $('#dialog_user_randompass1').change(function (e) {
+                $('#dialog_user_password2').prop('disabled', $(this).prop('checked'));
+                $('#dialog_user_password3').prop('disabled', $(this).prop('checked'));
+            });
+            $('#dialog_usertimezone').empty();
+            for (var i = 0; i < timezones.length; i++) {
+                $('#dialog_usertimezone').append("<option value='" + timezones[i].Key + "'>" + timezones[i].Value + "</option>");
+            }
         });
     </script>
 </asp:Content>
@@ -1155,11 +1403,12 @@
     <div id="module_main" style="min-width: 400px;">
         <div class="topTools">
             <span class="helpiconspan">
-                <span class="helpicon" PageName="Users"></span>
+                <span class="helpicon" pagename="Users"></span>
             </span>
             <input data-lgid="DATATABLEWIZARD_A049" type="button" value="Reset Layout" onclick="ClearGridLayOut();" style="display: none" />
             <input data-lgid="LHBIS_FIC_CHARTS_CHARTTITLE_A009" type="button" value="Export to Excel" onclick="ExportUsers();" />
             <input data-lgid="DATATABLEWIZARD_A082" type="button" value="Refresh" onclick="OnRefresh();" />
+            <input data-lgid="FI_HOST_MANAGEMENT_USER_A116" type="button" value="Copy User" onclick="OnCopy();" />
             <input data-lgid="USERMANAGERCTRL_A006" data-cls="user" type="button" value="Delete" onclick="OnDelete();" disabled="disabled" />
             <input data-lgid="USERMANAGERCTRL_A060" data-cls="ad" type="button" value="Reset Password" onclick="OnResetPassword();" disabled="disabled" />
             <input data-lgid="USERMANAGERCTRL_A005" data-cls="user" type="button" value="Edit" onclick="OnEdit();" disabled="disabled" />
@@ -1167,14 +1416,14 @@
             <input data-lgid="USERMANAGERCTRL_A002" type="button" value="Add" onclick="OnAdd();" />
             <div style="float: right">
                 <span data-lgid="LHBIS_FIC_CLIENT_MODULES_DATACONNECTION_A005">User Name:</span>
-                <input type="text" id="filterUserName" style="width: 100px; float: none; height: auto; line-height: 17px"/>
+                <input type="text" id="filterUserName" style="width: 100px; float: none; height: auto; line-height: 17px" />
                 <input data-lgid="LHBIS_FIC_CLIENT_FICCONTROLS_WORKSPACESELECTCTRL_A011" type="button" value="Filter Results" onclick="OnRefresh($('#filterUserName').val());" />
             </div>
             <div style="clear: both"></div>
         </div>
         <div class="clear"></div>
         <div id="Users_list" class="margin-top-s"></div>
-        <div id="mask_bg" class="maskbg" style="display: none; z-index: 550;"><div class="loading c-spin"></div></div>
+        <div id="mask_bg" class="maskbg" style="display: none; z-index: 550;"><%--<div class="loading c-spin"></div>--%></div>
         <div class="form" id="dialog_user" style="display: none; width: 840px; z-index: 600;">
             <div class="form-head">
                 <div class="form-close fa"></div>
@@ -1249,6 +1498,11 @@ For example, for cellphone number:  480-123-4567 on Verizon, the text address wo
                             <td>
                                 <input type="text" id="dialog_email" tabindex="9" maxlength="100" /></td>
                         </tr>
+                        <tr id="user_timezone">
+                            <td class="label" data-lgid="LHBIS_FIC_CLIENT_MODULES_SYSTEMOPTIONSCTRL_A056">Time Zone</td>
+                            <td style="padding-right: 41px">
+                                <select id="dialog_usertimezone" tabindex="10"></select></td>
+                        </tr>
                         <tr>
                             <td class="label" data-lgid="UserManagerCtrl_A009">User Level</td>
                             <td>
@@ -1332,7 +1586,7 @@ For example, for cellphone number:  480-123-4567 on Verizon, the text address wo
                             </tr>
                         </table>
                         <div id="email-tab-container"></div>
-                        <div style="margin-top:10px" class="form-func">
+                        <div style="margin-top: 10px" class="form-func">
                             <input id="email-tab-cancel" data-lgid="UserOptionsCtrl_A007" type="button" value="Cancel" />
                             <input id="email-tab-ok" data-lgid="LHBIS_FIC_CLIENT_DIALOGS_RCHARTOPENDIALOG_A002" type="button" value="Ok" />
                             <div class="clear"></div>
@@ -1384,6 +1638,117 @@ For example, for cellphone number:  480-123-4567 on Verizon, the text address wo
                 <div class="clear"></div>
             </div>
         </div>
+
+        <div class="form" id="dialog_copy_user" style="display: none; width: 450px; z-index: 600;">
+            <div class="form-head">
+                <div class="form-close fa"></div>
+                <div class="form-title"><span class="title" data-lgid="FI_HOST_MANAGEMENT_USER_A116">Copy User</span></div>
+            </div>
+            <div class="dialog-content">
+                <table style="line-height: 30px;">
+                    <tr>
+                        <td class="label1" style="width: 180px;" data-lgid="LHBIS_FIC_SILVERLIGHT_LOGIN_LOGINPAGE_A006">User ID:</td>
+                        <td style="width: 220px;">
+                            <input type="text" id="dialog_user_id1" tabindex="1" style="width: 200px;" maxlength="100" autocomplete="off" /></td>
+                        <td></td>
+                    </tr>
+                    <tr>
+                        <td class="label1" style="width: 180px;" data-lgid="LHBIS_FIC_CLIENT_MODULES_DATACONNECTION_A005">User Name:</td>
+                        <td>
+                            <input type="text" id="dialog_user_name1" tabindex="2" style="width: 200px;" maxlength="200" autocomplete="off" /></td>
+                        <td></td>
+                    </tr>
+                    <tr>
+                        <td class="label1" style="width: 180px;" data-lgid="LHBIS_FIC_SILVERLIGHT_LOGIN_LOGINPAGE_A28">Email:</td>
+                        <td style="width: 220px;">
+                            <input type="text" id="dialog_user_email1" tabindex="3" style="width: 200px;" maxlength="200" autocomplete="off" /></td>
+                        <td></td>
+                    </tr>
+                    <tr>
+                        <td style="width: 180px;"></td>
+                        <td>
+                            <input type="checkbox" id="dialog_user_randompass1" tabindex="4" style="width: auto; height: 13px; margin-left: 0; margin-top: -2px; margin-bottom: 1px; vertical-align: middle;" />
+                            <label for="dialog_user_randompass1" data-lgid="LHBIS_FIC_SILVERLIGHT_LOGIN_LOGINPAGE_A27">Random password</label></td>
+                        <td></td>
+                    </tr>
+                    <tr>
+                        <td class="label1" style="width: 180px;" data-lgid="LHBIS_FIC_SILVERLIGHT_LOGIN_LOGINPAGE_A007">Password:</td>
+                        <td>
+                            <input type="password" id="dialog_user_password2" style="width: 200px;" tabindex="5" maxlength="20" autocomplete="off" />
+                        </td>
+                        <td></td>
+                    </tr>
+                    <tr>
+                        <td class="label1" style="width: 180px;" data-lgid="FI_FRS_IMPKG015">Confirm Password:</td>
+                        <td>
+                            <input type="password" id="dialog_user_password3" style="width: 200px;" tabindex="6" maxlength="20" autocomplete="off" /></td>
+                        <td></td>
+                    </tr>
+                    <tr id="tr_copyuser">
+                        <td class="label1" style="width: 180px;" data-lgid="LHBIS_FIC_SILVERLIGHT_LOGIN_LOGINPAGE_A26">Copy User:</td>
+                        <td>
+                            <div id="dialog_copyuser" tabindex="7" style="width: 200px"></div>
+                        </td>
+                        <td></td>
+                    </tr>
+
+                </table>
+                <div class="mask_loading dialog" style="display: none;"></div>
+            </div>
+            <div class="form-func">
+                <input data-lgid="LHBIS_MultiLanguage_Common_A006" type="button" value="Cancel" class="form-close" tabindex="9" />
+                <input data-lgid="LHBIS_MULTILANGUAGE_LHBISMESSAGEBOX_A004" style="min-width: 65px" type="button" onclick="OnCopyUser();" value="OK" tabindex="8" />
+                <div class="clear"></div>
+            </div>
+        </div>
+
+        <div id="mask_bg_ds" class="maskbg" style="display: none; z-index: 900;"><%--<div class="loading c-spin"></div>--%></div>
+        <div class="form non-select" id="dialog_ds" style="display: none; z-index: 910;">
+            <div class="form-head">
+                <div class="form-close fa"></div>
+                <div class="form-title"><span class="title" data-lgid="LHBIS_FIC_CLIENT_FICCONTROLS_PLUGINCTR_A003">Select Filter/Level Data Source Value</span></div>
+            </div>
+            <div class="dialog-content" style="height: 500px; width: 540px;">
+                <div id="content_flatds">
+                    <table style="line-height: 20px; width: 100%;">
+                        <tr>
+                            <td data-lgid="LHBIS_FIC_CLIENT_FICCONTROLS_PLUGINCTR_A006">Available Values</td>
+                            <td></td>
+                            <td data-lgid="LHBIS_FIC_CLIENT_FICCONTROLS_PLUGINCTR_A007">Selected Values</td>
+                        </tr>
+                        <tr>
+                            <td>
+                                <div id="div_avas" style="height: 465px; width: 220px;"></div>
+                            </td>
+                            <td>
+                                <div style="display: inline-grid;">
+                                    <input class="ctl_button" type="button" id="ctl_sel_add" style="margin-top: 5px;" value=">" />
+                                    <input class="ctl_button" type="button" id="ctl_sel_addall" style="margin-top: 5px;" value=">>" />
+                                    <input class="ctl_button" type="button" id="ctl_sel_remove" style="margin-top: 5px;" value="<" />
+                                    <input class="ctl_button" type="button" id="ctl_sel_removeall" style="margin-top: 5px;" value="<<" />
+                                </div>
+                            </td>
+                            <td>
+                                <div id="div_sels" style="height: 465px; width: 220px;"></div>
+                            </td>
+                        </tr>
+                    </table>
+                </div>
+                <div id="content_treeds" style="height: 100%;">
+                    <div class="treeds_content">
+                        <ul id="ulDataSource"></ul>
+                    </div>
+                </div>
+            </div>
+            <div class="form-func">
+                <input data-lgid="LHBIS_MultiLanguage_Common_A006" type="button" value="Cancel" class="form-close" tabindex="10" />
+                <input data-lgid="LHBIS_MULTILANGUAGE_LHBISMESSAGEBOX_A004" type="button" onclick="OnDSSelect();" value="OK" tabindex="9" />
+                <div class="clear"></div>
+            </div>
+            <div class="mask_loading dialog" style="display: none;">
+                <div class="loading_holder"></div>
+            </div>
+        </div>
     </div>
 </asp:Content>
 

Site/fic/fic/Management/UserPermission.aspx

@@ -19,7 +19,7 @@
         document.write('<script type="text/javascript" src="<%=Common.GenerateUrl("fic/js/controls/gridctrl.js") %>"><' + '/script>');
         document.write('<script type="text/javascript" src="<%=Common.GenerateUrl("fic/js/controls/controls.js") %>"><' + '/script>');
 
-        var DataGriew = window.GridView || window['g5-gridview'];
+        var DataGriew = window['g5-gridview'];
 
         function childPageInitLanguage() {
             $("#bt_Refresh").val(GetLanguageByKey("LHBIS_FIC_CLIENT_MODULES_DATATABLEWIZARD_A082", "Refresh"));

Site/fic/fic/Management/VariableManage.aspx

@@ -310,7 +310,7 @@
                     }
                     var width = 610;
                     var height = 400;
-                    if (_utility.currentLang == "fr-fr") {
+                    if (_utility.NeedModifyUI()) {
                         width = 705;
                         height = 450;
                     }

Site/fic/fic/ReverseGeocodePage.aspx

@@ -4,7 +4,7 @@
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
     <meta name="viewport" content="initial-scale=1, maximum-scale=1,user-scalable=no" />
     <title>Simple Map v2</title>
-    <link rel="stylesheet" href="https://js.arcgis.com/3.40/esri/css/esri.css" />
+    <link rel="stylesheet" href="https://js.arcgis.com/3.44/esri/css/esri.css" />
     <style type="text/css">
         html,
         body {
@@ -34,7 +34,7 @@
             display: none; /*隐藏菜单项*/
         }
     </style>
-    <script src="https://js.arcgis.com/3.40/"></script>
+    <script src="https://js.arcgis.com/3.44/"></script>
     <script>
         var map;
 

Site/fic/fic/Template/ChartComments.html

@@ -162,7 +162,7 @@
             currentUser = user;
             sitePath = sp;
             //_utility.rootPath = sp;
-            $('#button_post').text(GetLanguageByKey('SEND', 'Send'));
+            $('#button_post').text(GetLanguageByKey('MESSAGE_SEND', 'Send'));
             _network.management('GetChartComments', [param.iid], function (e) {
                 if (e.ErrorCode === 0) {
                     vue.comments = e.Result;
@@ -206,6 +206,7 @@
                     param[kv[0]] = decodeURIComponent(kv[1]);
                 }
             }
+            //$('#button_post').text(GetLanguageByKey('SEND', 'Send'));
             $('#button_post').text('');
             vue = new Vue({
                 el: '#message',
@@ -249,7 +250,7 @@
     </ul>
     <div class="reply-div">
         <textarea class="reply-text" id="text_reply"></textarea>
-        <button id="button_post" class="reply-post" disabled="disabled">Post</button>
+        <button id="button_post" class="reply-post" disabled="disabled"></button>
     </div>
 </body>
 </html>

Site/fic/fic/Template/ChartWizard/EditMessageInformation.html

@@ -5,7 +5,7 @@
 	<meta charset="utf-8" />
     <style type="text/css">
         .msgeinfortb td {
-            padding-top: 16px;
+            padding-top: 11px;
         }
         .tblefttd {
         text-align:right;
@@ -39,6 +39,12 @@
                 </td>
                 <td><input type='text' name='UIRefreshTime' value='900' style='width:300px;' onkeyup="IngeterTextKeyUp(this);" onblur="IngeterTextKeyUp(this);" /></td>
             </tr>
+            <tr>
+                <td class="tblefttd">
+                    <span data-lgid="LHBIS_FIC_CLIENT_FICCONTROLS_MESSAGEINFORMATION_A023">Send quantity limit:</span>
+                </td>
+                <td><input type='text' name='UISendLimit' maxlength="5" value='900' style='width:300px;' onkeyup="IngeterTextKeyUp(this);" onblur="IngeterTextKeyUp(this);" /></td>
+            </tr>
             <tr>
                 <td class="tblefttd">
                     <span data-lgid="LHBIS_FIC_CLIENT_FICCONTROLS_MESSAGEINFORMATION_A009">Effective Time:</span>

Site/fic/fic/Template/ChartWizard/FRPTSelectReportCtrl.html

@@ -33,7 +33,7 @@
             padding-top: 60px;
             height: 100%;
         }
-        #FRPTSelectReportCtrl .grid-content .data-grid {
+        #FRPTSelectReportCtrl .grid-content .data-grid-old {
             height: 100%;
         }
     </style>

Site/fic/fic/Template/ChartWizard/FRPTSetPivot.html

@@ -33,7 +33,7 @@
             padding-top: 30px;
             height: 100%;
         }
-        #FRPTSetPivot .grid-content .data-grid {
+        #FRPTSetPivot .grid-content .data-grid-old {
             height: 100%;
         }
     </style>

Site/fic/fic/Template/ChartWizard/ShapeAndColorSetting.html

@@ -9,7 +9,7 @@
         #ShapeAndColorSetting .shape-and-color-header {
             line-height: 24px;
         }
-        #ShapeAndColorSetting .data-grid .max108 {
+        #ShapeAndColorSetting .data-grid-old .max108 {
             max-height: 108px;
         }
         #ShapeAndColorSetting .shape-and-color-bottom {

Site/fic/fic/Template/ChartWizard/TargetInputDataCtrl.html

@@ -22,7 +22,7 @@
             padding: 44px 10px 10px 10px;
             height: 100%;
         }
-        #TargetInputDataCtrl .grid-content .data-grid {
+        #TargetInputDataCtrl .grid-content .data-grid-old {
             height: 100%;
         }
     </style>

Site/fic/fic/Template/ChartWizard/YCtrl.html

@@ -8,7 +8,13 @@
         #YCtrl .margin-left-s { margin-left: 4px; }
         #YCtrl .top-bar { white-space: nowrap; }
         #YCtrl .top-bar .top-inputer { height: 22px; width: 120px; padding-right: 22px; box-sizing: border-box; }
-        #YCtrl .fi-input-wrapper { position: relative; display: inline-block; }
+        .top-bar .fi-input-wrapper {
+            display: inline-block;
+        }
+        .fi-input-wrapper {
+            position: relative;
+            display: block;
+        }
         #YCtrl .fi-multilangs {
             position: absolute;
             height: 14px;

Site/fic/fic/Template/ChartWizard/setupFavoriteUrlCtrl.html

@@ -38,8 +38,8 @@
                         <div id="rightcontengdiv" style="display:none;padding:0px;margin:0px;">
                             <div style="margin-bottom:20px;">
                                 <span>Favorite Type:</span>
-                                <input id="externalradio" type="radio" value="External" /><span>External</span>
-                                <input id="internalradio" type="radio" value="Internal" /><span>Internal</span>
+                                <input id="externalradio" name="radiourl" type="radio" value="External" /><span>External</span>
+                                <input id="internalradio" name="radiourl" type="radio" value="Internal" /><span>Internal</span>
                             </div>
                             <div style="padding-left:20px;">
                                 <div id="urldiv" style="display:none;">

Site/fic/fic/Template/DataTable/DailySales.html

@@ -54,11 +54,11 @@
             position: absolute;
             bottom: 14px;
         }
-        #DailySales_Table_Columns .data-grid {
+        #DailySales_Table_Columns .data-grid-old {
             height: 100%;
             box-sizing: border-box;
         }
-        #DailySales_Table_Cells .data-grid {
+        #DailySales_Table_Cells .data-grid-old {
             height: 100%;
             box-sizing: border-box;
         }

Site/fic/fic/Template/EmailSubscription.html

@@ -12,7 +12,7 @@
     <script src="../js/controls/dialog.js?v=20210813"></script>
     <script src="../js/controls/controls.js"></script>
     <script src="../js/Management/func.js?v=20210517"></script>
-    <script src="../js/Management/UserManagement.js?v=20230519"></script>
+    <script src="../js/Management/UserManagement.js?v=20231208.2"></script>
     <title></title>
     <link href="../../css/datepicker.min.css" rel="stylesheet" />
     <link href="../js/components/css/datagrid.css" rel="stylesheet" />

Site/fic/fic/Template/Management/EmailSubscriptionTab.html

@@ -85,6 +85,7 @@
                 <input type="radio" name="execute" id="execute-once" checked="checked" style="width: 20px" />
                 <label for="execute-once" style="display: inline-block; width: 150px" data-lgid="JOBDETAIL_DAILYFREQUENCY_A001">Occurs once at:</label>
                 <input id="text-occurs-once" type="text" value="12:00" style="width: 60px" />
+                <span id="span-time-zone" style="display: inline-block; margin-right: 20px; float: right"></span>
             </div>
             <div style="line-height: 30px">
                 <input type="radio" name="execute" id="execute-every" style="width: 20px" />
@@ -132,9 +133,11 @@
         <div id="schedule-item-xps" style="line-height: 30px; margin: 4px 10px"><input id="schedule-xps" type="checkbox" /><label for="schedule-xps">XPS</label></div>
         <div id="schedule-item-pdf" style="line-height: 30px; margin: 4px 10px"><input id="schedule-pdf" type="checkbox" /><label for="schedule-pdf">PDF</label></div>
         <div id="schedule-item-excel" style="line-height: 30px; margin: 4px 10px"><input id="schedule-excel" type="checkbox" /><label for="schedule-excel">Excel</label></div>
+        <hr />
+        <div id="schedule-item-onlysend" style="line-height: 30px; margin: 4px 10px"><input id="schedule-onlysend" type="checkbox" /><label for="schedule-onlysend" data-lgid="LHBIS_FIC_CLIENT_MODULES_RSUBSCRIBEMESSAGEDIALOG_A025">Only send attachment</label></div>
     </div>
     <div data-page="tab_customization" style="height: 395px; border: 1px solid #ccc; border-top: none">
-        <div style="line-height: 30px; margin: 4px 10px"><input id="schedule-customization-enabled" type="checkbox" /><label for="schedule-excel">Enabled</label></div>
+        <div style="line-height: 30px; margin: 4px 10px"><input id="schedule-customization-enabled" type="checkbox" /><label for="schedule-customization-enabled" data-lgid="LHBIS_FIC_CLIENT_MODULES_SYSTEMOPTIONSCTRL_A047">Enabled</label></div>
         <div style="margin: 4px 10px; display: flex;"><div style="width: 130px;" data-lgid="LHBIS_FIC_CLIENT_WIZARD_CHARTWIZARDHELPER_A082">Chart Caption:</div><input id="schedule-chartcaption" maxlength="200" type="text" style="width: 300px"/></div>
         <div style="margin: 4px 10px; display: flex;"><div style="width: 130px;" data-lgid="LHBIS_FIC_CLIENT_WIZARD_CHARTWIZARDHELPER_A414">Chart Title:</div><input id="schedule-charttitle" maxlength="200" type="text" style="width: 300px"/></div>
         <div id="schedule-customization-grid" style="display:none; height:300px;">

Site/fic/fic/Template/SQLGenerator.html

@@ -12,7 +12,7 @@
     .loading_holder {
     background-image: url(../../image/loading_dark_large.gif);
     }
-    #ModelsData .data-grid {
+    #ModelsData .data-grid-old {
     background-color: #ffffff;
     }
     .modelsfrom {

Site/fic/fic/Template/WorkSpace/BoardFilters.html

@@ -25,7 +25,7 @@
             width: 200px;
             float: left;
         }
-        .board-filters-content .board-filters-left .data-grid .data-grid-body {
+        .board-filters-content .board-filters-left .data-grid-old .data-grid-body {
             overflow-x: hidden;
         }
         .board-filters-content .board-filters-right {
@@ -91,7 +91,7 @@
                     <label data-lgid="LHBIS_FIC_CLIENT_WIZARD_CHARTWIZARDHELPER_A374">Instant Search</label>
                     <input type="checkbox" v-model="instantSearch" v-bind:disabled.prop="pivotType !=0 || personal"/>
                 </div>
-                <div style="height: 224px; margin-top: 12px">
+                <div style="height: 220px; margin-top: 12px">
                     <data-grid v-bind:columns="columns" v-bind:source="source" v-bind:allow-editing="enabled"
                                ref="gridPivots"></data-grid>
                 </div>

Site/fic/fic/Template/WorkSpace/WorkspaceFilters.html

@@ -25,7 +25,7 @@
             width: 200px;
             float: left;
         }
-        .wsp-filters-content .wsp-filters-left .data-grid .data-grid-body {
+        .wsp-filters-content .wsp-filters-left .data-grid-old .data-grid-body {
             overflow-x: hidden;
         }
         .wsp-filters-content .wsp-filters-right {

Site/fic/fic/css/chart.css

@@ -348,7 +348,7 @@
     overflow: hidden;
 }
 
-.chart_content .data-grid .data-grid-body .data-grid-group-header, .data-grid .data-grid-body .data-grid-row {
+.chart_content .data-grid-old .data-grid-body .data-grid-group-header, .data-grid-old .data-grid-body .data-grid-row {
     height: 27px;
 }
 
@@ -636,6 +636,6 @@ pre.preChartNote {
     width: 68%;
 }
 
-.chart_content .data-grid {
+.chart_content .data-grid-old {
     border: none;
 }

Site/fic/fic/css/tabcontrol.css

@@ -406,7 +406,7 @@ table.fixed {
     height: 23px;
 }
 
-.wizard-contentArea .data-grid .data-grid-body .data-grid-row:last-child
+.wizard-contentArea .data-grid-old .data-grid-body .data-grid-row:last-child
 {
     border-bottom: 1px solid #cacaca;
 }

Site/fic/fic/css/wizardctrl.css

@@ -59,7 +59,7 @@
     border-color: #ccc;
     height: 100%;
 }
-.wizard-contentArea .data-grid .data-grid-body .data-grid-row:last-child {
+.wizard-contentArea .data-grid-old .data-grid-body .data-grid-row:last-child {
     border-bottom: none;
 }
 
@@ -91,15 +91,15 @@
     background-color: orange;
 }
 
-.data-grid .autoHeightBody {
+.data-grid-old .autoHeightBody {
     position: static;
     /*max-height: 150px;*/
 }
-.data-grid .hidden-x {
+.data-grid-old .hidden-x {
     overflow-x: hidden;
     overflow-y: hidden;
 }
-.data-grid .noMax {
+.data-grid-old .noMax {
     max-height: none;
 }
 

Site/fic/fic/css/workspace.css

@@ -926,15 +926,15 @@
 .helpiconpopupspan {
     float: right;
 }
-.data-grid .data-grid-header .data-column-header-filter {
+.data-grid-old .data-grid-header .data-column-header-filter {
     top: -1px !important;
     right: 5px !important;
 }
-.data-grid .data-grid-header .arrow.asc + .data-column-header-filter,
-.data-grid .data-grid-header .arrow.desc + .data-column-header-filter {
+.data-grid-old .data-grid-header .arrow.asc + .data-column-header-filter,
+.data-grid-old .data-grid-header .arrow.desc + .data-column-header-filter {
     right: 14px !important;
 }
-.data-grid .data-grid-header .data-column-header-filter span {
+.data-grid-old .data-grid-header .data-column-header-filter span {
     display: inline-block;
     font: normal normal normal 14px/1 FontAwesome;
     font-weight: 300;
@@ -947,7 +947,7 @@
     right: 11px !important;
     margin-top: -3px !important;
 }
-.data-grid .data-grid-header .data-column-header-has-filter .data-column-header-text {
+.data-grid-old .data-grid-header .data-column-header-has-filter .data-column-header-text {
     padding: 4px 24px 4px 4px;
 }
 .data-column-header-filter-panel .data-filter-search-holder .data-filter-search-icon {
@@ -962,13 +962,13 @@
     content: '\f002';
     vertical-align: middle;
 }
-.data-grid .data-grid-header .data-column-header-filter span::before {
+.data-grid-old .data-grid-header .data-column-header-filter span::before {
     content: '\f141';
 }
-.data-grid .data-grid-header .data-column-header-filter.filtered span {
+.data-grid-old .data-grid-header .data-column-header-filter.filtered span {
     color: black;
 }
-.data-grid .data-grid-header .data-column-header-filter.filtered span::before {
+.data-grid-old .data-grid-header .data-column-header-filter.filtered span::before {
     content: '\f0b0';
 }
 .data-column-header-filter-bg,

Site/fic/fic/js/Management/DataTableWizard.js

@@ -111,7 +111,7 @@ if (typeof $dtWizardForm !== 'object') {
                             new $woptLookupdatasource(),
                         ];
 
-                        if (loginedUser('UserType') === 3) {
+                        if (loginedUser('UserType') === 3 && _this.dataObj.Type != 6) {
                             _this.wizardOptions.push(new $woptDataTableCache());
                         }
 
@@ -119,7 +119,7 @@ if (typeof $dtWizardForm !== 'object') {
 
                         _this.showOpen("Data Table Wizard", parentDom, 1050, 540);
 
-                        if (_this.dataObj.Type == 2 || _this.dataObj.Type == 3) {
+                        if (_this.dataObj.Type == 2 || _this.dataObj.Type == 3 || _this.dataObj.Type == 6) {
                             _this.deleteOption("DataTableSQLStatement");
                         }
 
@@ -127,6 +127,12 @@ if (typeof $dtWizardForm !== 'object') {
                             _this.setOptionVisible("DataTableCache", false);
                             _this.setOptionJumpPass("DataTableCache", true);
                         }
+                        if (_this.dataObj.Type == 6) {
+                            if (!_this.isHasOption("SharePointDataTable")) {
+                                _this.addOption(new $woptDataTableSharePoint(), "DataTableNote", true);
+                            }
+                        }
+                        
                     }
                     else {
                         _this.wizardOptions = [selectDataTableType, new $woptDataTableSelectDT(), new $transformationDTFields(), new $woptTransformationDTSetting(), new $woptDataTableProperties(), new $woptDataTableNote(), new $woptDataTableFilter(), new $woptSettingFieldType(), new $woptLookupdatasource()];
@@ -157,6 +163,9 @@ function CreateTitleInfo(wizardCtrl) {
     else if (wizardCtrl.dataObj.Type == 4) {//EMDataTableType.Transformation
         tmpStr = GetLanguageByKey('LHBIS_FIC_CLIENT_MODULES_DATATABLEWIZARD_A057', 'Transformation Data Table');
     }
+    else if (wizardCtrl.dataObj.Type == 6) {
+        tmpStr = GetLanguageByKey('LHBIS_FIC_CLIENT_MODULES_DATATABLEWIZARD_A157', 'SharePoint Data Table');
+    }
     wizardCtrl.TitleCtrlAppend("<span style='margin-right:30px;'>" + GetLanguageByKey('LHBIS_FIC_CLIENT_MODULES_DATATABLEWIZARD_A107', 'Selected Data Table Type:') + tmpStr + "</span>");
 
     if (!strIsNullorEmpty(wizardCtrl.dataObj.DataTableName)) {
@@ -222,8 +231,8 @@ function CheckSQlStatement(resolve, reject) {
         return; //翻转表和包无需验证
     }
 
-    var allowempty = _this.sqlText.prop('allowempty');
-    var sqlText = _this.sqlText.val();
+    var allowempty = _this.linedText.prop('allowempty');
+    var sqlText = _this.sqlText.getValue();
     if (!_this.wizardCtrl.data.CanEdit) {
         sqlText = _this.wizardCtrl.dataObj.DataTableSQL;
     }
@@ -337,6 +346,9 @@ function checkDSIdDataType(DSIDdataType, dataType) {
     if (dataType == 5 && DSIDdataType == 5) {
         return true;
     }
+    if (dataType == 6 && DSIDdataType == 6) {
+        return true;
+    }
     if (dataType == 4 && DSIDdataType == 4) {
         return true;
     }
@@ -445,6 +457,11 @@ if (typeof $woptSelectDataTableType !== 'object') {
             _content.append($("<div><input type='radio' id='radio_type_Transformation' name='DataTaleType' value='Transformation' " + isChecked + "/><label for='radio_type_Transformation'>" + GetLanguageByKey('LHBIS_FIC_CLIENT_MODULES_DATATABLEWIZARD_A057', 'Transformation Data Table') + "</label></div>")
                 .css({ "line-height": "30px" }));
 
+            if (this.wizardCtrl.dataObj.Type == 6)
+                isChecked = "checked";
+            _content.append($("<div><input type='radio' id='radio_type_SharePoint' name='DataTaleType' value='SharePoint' " + isChecked + "/><label for='radio_type_SharePoint'>" + GetLanguageByKey('LHBIS_FIC_CLIENT_MODULES_DATATABLEWIZARD_A157', 'SharePoint Data Table') + "</label></div>")
+                .css({ "line-height": "30px" }));
+
             _content.find("[name='DataTaleType']").click(this, function (e) {
                 DataTaleTypeChange(e.data, _content);
             });
@@ -458,9 +475,21 @@ if (typeof $woptSelectDataTableType !== 'object') {
 
             //反转DT相关界面显示或隐藏都在这控制
             if (typeStr != "Transformation") {
+
                 if (!_this.wizardCtrl.isHasOption("SelectDataConnection")) {
                     _this.wizardCtrl.addOption(new $woptSelectDataConnection(), "DataTableProperties", true);
                 }
+                if (typeStr == "SharePoint") {
+                    if (!_this.wizardCtrl.isHasOption("SharePointDataTable")) {
+                        _this.wizardCtrl.addOption(new $woptDataTableSharePoint(), "DataTableNote", true);
+                    }
+                }
+                else {
+                    if (_this.wizardCtrl.isHasOption("SharePointDataTable")) {
+                        _this.wizardCtrl.deleteOption("SharePointDataTable");
+                    }
+                }
+                
                 if (_this.wizardCtrl.isHasOption("SelectDataTable")) {
                     _this.wizardCtrl.deleteOption("SelectDataTable");
                 }
@@ -475,6 +504,9 @@ if (typeof $woptSelectDataTableType !== 'object') {
                 if (_this.wizardCtrl.isHasOption("SelectDataConnection")) {
                     _this.wizardCtrl.deleteOption("SelectDataConnection");
                 }
+                if (_this.wizardCtrl.isHasOption("SharePointDataTable")) {
+                    _this.wizardCtrl.deleteOption("SharePointDataTable");
+                }
                 if (!_this.wizardCtrl.isHasOption("SelectDataTable")) {
                     _this.wizardCtrl.addOption(new $woptDataTableSelectDT(), "DataTableProperties", true);
                 }
@@ -495,6 +527,16 @@ if (typeof $woptSelectDataTableType !== 'object') {
             }
             if (typeStr == "Composition")
                 _this.wizardCtrl.setOptionJumpPass("SelectDataConnection", true, false);
+
+            if (typeStr == "SharePoint") {
+                _this.wizardCtrl.setOptionVisible("SharePointDataTable", true);
+                _this.wizardCtrl.setOptionJumpPass("SharePointDataTable", false);
+            }
+            else {
+                _this.wizardCtrl.setOptionVisible("SharePointDataTable", false);
+                _this.wizardCtrl.setOptionJumpPass("SharePointDataTable", true);
+            }
+                
         }
 
         $woptSelectDataTableType.prototype.verifyContent = function (resolve) {
@@ -521,8 +563,12 @@ if (typeof $woptSelectDataTableType !== 'object') {
                     this.wizardCtrl.dataObj.Type = 2;
                 this.wizardCtrl.deleteOption("DataTableSQLStatement");
             }
+            else if (typeStr == "SharePoint") {
+                this.wizardCtrl.dataObj.Type = 6;
+                this.wizardCtrl.deleteOption("DataTableSQLStatement");
+            }
 
-            if (typeStr != "Extended" && typeStr != "Transformation" && !this.wizardCtrl.isHasOption("DataTableSQLStatement")) {
+            if (typeStr != "Extended" && typeStr != "Transformation" && typeStr != "SharePoint" && !this.wizardCtrl.isHasOption("DataTableSQLStatement")) {
                 this.wizardCtrl.addOption(new $woptDataTableSQLStatement(), "DataTableNote", true);
             }
             if (typeStr != "Extended" && this.wizardCtrl.isHasOption("DataTableExcel"))
@@ -612,47 +658,93 @@ if (typeof $woptSelectDataConnection !== 'object') {
 
         var CacheDataConnections;
         function InitData(_this, content, resolve) {
-            _network.management('GetDataConnectionsInDTM', [], function (e) {
-                if (e.ErrorCode !== 0) {
-                    throw new Error(e);
-                }
-                CacheDataConnections = e.Result;
+            if (_this.wizardCtrl.dataObj.Type == 6) {
+                _network.management('GetSharePointDataConnections', [], function (e) {
+                    if (e.ErrorCode !== 0) {
+                        throw new Error(e);
+                    }
+                    CacheDataConnections = e.Result;
 
-                if (_this.wizardCtrl.dataObj.Type == 2 || _this.wizardCtrl.dataObj.Type == 3) {   //Extended、EmbedExtended
-                    _network.management('GetDataTableTypeList', [], function (ret) {
-                        if (ret.ErrorCode !== 0) {
-                            throw new Error(ret);
-                        }
-                        content.find("[name='tb_DTType']").css({ "display": "block" });
+                    if (_this.wizardCtrl.dataObj.Type == 2 || _this.wizardCtrl.dataObj.Type == 3) {   //Extended、EmbedExtended
+                        _network.management('GetDataTableTypeList', [], function (ret) {
+                            if (ret.ErrorCode !== 0) {
+                                throw new Error(ret);
+                            }
+                            content.find("[name='tb_DTType']").css({ "display": "block" });
+                            content.find("[name='tb_DC']").css({ "display": "block" });
+                            content.find("[name='div_Connection']").css({ "display": "block" });
+
+                            for (var i = 0; i < ret.Result.length; i++) {
+                                var item = ret.Result[i];
+                                var opt = $("<option></option>")
+                                    .text(item.Name)
+                                    .attr("value", item.IID)
+                                    .attr("DTConfigClassFullName", item.DTConfigClassFullName)
+                                    .attr("DcTypeIID", item.DcTypeIID);
+
+                                content.find("[name='ComboBox_DTType']").append(opt);
+                            }
+
+                            if (!strIsNullorEmpty(_this.wizardCtrl.dataObj.DTTypeIID) && _this.wizardCtrl.dataObj.DTTypeIID != "00000000-0000-0000-0000-000000000000") {
+                                content.find("[name='ComboBox_DTType']").val(_this.wizardCtrl.dataObj.DTTypeIID);
+                            }
+                            ComboBox_DTType_SelectionChanged(_this, content);
+                            resolve(content);
+                        });
+                    }
+                    else {
                         content.find("[name='tb_DC']").css({ "display": "block" });
                         content.find("[name='div_Connection']").css({ "display": "block" });
-
-                        for (var i = 0; i < ret.Result.length; i++) {
-                            var item = ret.Result[i];
-                            var opt = $("<option></option>")
-                                        .text(item.Name)
-                                        .attr("value", item.IID)
-                                        .attr("DTConfigClassFullName", item.DTConfigClassFullName)
-                                        .attr("DcTypeIID", item.DcTypeIID);
-
-                            content.find("[name='ComboBox_DTType']").append(opt);
-                        }
-
-                        if (!strIsNullorEmpty(_this.wizardCtrl.dataObj.DTTypeIID) && _this.wizardCtrl.dataObj.DTTypeIID != "00000000-0000-0000-0000-000000000000") {
-                            content.find("[name='ComboBox_DTType']").val(_this.wizardCtrl.dataObj.DTTypeIID);
-                        }
-                        ComboBox_DTType_SelectionChanged(_this, content);
+                        GetCommonDCList(_this, content);
+                        ComboBox_Connection_SelectionChanged(_this, content);
                         resolve(content);
-                    });
-                }
-                else {
-                    content.find("[name='tb_DC']").css({ "display": "block" });
-                    content.find("[name='div_Connection']").css({ "display": "block" });
-                    GetCommonDCList(_this, content);
-                    ComboBox_Connection_SelectionChanged(_this, content);
-                    resolve(content);
-                }
-            });
+                    }
+                });
+            }
+            else {
+                _network.management('GetDataConnectionsInDTM', [], function (e) {
+                    if (e.ErrorCode !== 0) {
+                        throw new Error(e);
+                    }
+                    CacheDataConnections = e.Result;
+
+                    if (_this.wizardCtrl.dataObj.Type == 2 || _this.wizardCtrl.dataObj.Type == 3) {   //Extended、EmbedExtended
+                        _network.management('GetDataTableTypeList', [], function (ret) {
+                            if (ret.ErrorCode !== 0) {
+                                throw new Error(ret);
+                            }
+                            content.find("[name='tb_DTType']").css({ "display": "block" });
+                            content.find("[name='tb_DC']").css({ "display": "block" });
+                            content.find("[name='div_Connection']").css({ "display": "block" });
+
+                            for (var i = 0; i < ret.Result.length; i++) {
+                                var item = ret.Result[i];
+                                var opt = $("<option></option>")
+                                    .text(item.Name)
+                                    .attr("value", item.IID)
+                                    .attr("DTConfigClassFullName", item.DTConfigClassFullName)
+                                    .attr("DcTypeIID", item.DcTypeIID);
+
+                                content.find("[name='ComboBox_DTType']").append(opt);
+                            }
+
+                            if (!strIsNullorEmpty(_this.wizardCtrl.dataObj.DTTypeIID) && _this.wizardCtrl.dataObj.DTTypeIID != "00000000-0000-0000-0000-000000000000") {
+                                content.find("[name='ComboBox_DTType']").val(_this.wizardCtrl.dataObj.DTTypeIID);
+                            }
+                            ComboBox_DTType_SelectionChanged(_this, content);
+                            resolve(content);
+                        });
+                    }
+                    else {
+                        content.find("[name='tb_DC']").css({ "display": "block" });
+                        content.find("[name='div_Connection']").css({ "display": "block" });
+                        GetCommonDCList(_this, content);
+                        ComboBox_Connection_SelectionChanged(_this, content);
+                        resolve(content);
+                    }
+                });
+            }
+            
         }
 
         var SelectedDTTypeIId = "";
@@ -887,7 +979,11 @@ if (typeof $woptSelectDataConnection !== 'object') {
                         content.find("[name='Txt_ConnectionString']").text(data.Result);
                     });
                 }
-            } else {
+            }
+            else if (connType == 13) {    // SharePoint
+                content.find("[name='Txt_ConnectionString']").text("******");
+            }
+            else {
                 content.find("[name='Txt_ConnectionString']").text(selectOption.attr("ConnectionString"));
             }
         }
@@ -2380,6 +2476,13 @@ if (typeof $woptDataTableSQLStatement !== 'object') {
 
             var sqlGenerator = $("<input type='button'  />").val(GetLanguageByKey('LHBIS_FIC_CLIENT_MODULES_SQLGENERATOR_A001', 'SQL Generator')).appendTo(topdiv);
 
+            var linenumbers = $("<input type='checkbox'></input>").appendTo(topdiv);
+            $("<span></span>").text(GetLanguageByKey('LHBIS_FIC_CLIENT_MODULES_DATATABLEWIZARD_A154', 'Line Numbers')).appendTo(topdiv);
+
+            linenumbers.on('change', function () {
+                _this.sqlText.setOption("lineNumbers", this.checked); 
+            });
+
             var exceldiv = $("<div></div>").css("margin-top", 5).appendTo(topdiv);
             var lblFileName = $("<span></span>").css("margin-left", 5).text(GetLanguageByKey('LHBIS_FIC_CLIENT_MODULES_DATATABLEWIZARD_A139', 'FileName:')).appendTo(exceldiv);
             var fileName = $("<input type='text' style='width:150px' maxlength='200'/>").appendTo(exceldiv);
@@ -2392,12 +2495,27 @@ if (typeof $woptDataTableSQLStatement !== 'object') {
             var _this = this;
 
             var sqlTextDiv = $("<div style='padding-left: 4px'></div>").appendTo(sqlStep);
-            var sqlText = $("<textarea></textarea>").css("resize", "none").addClass("sqlTextArea").appendTo(sqlTextDiv);
+            var sqlText = $("<textarea id='txtlinedsql'></textarea>").appendTo(sqlTextDiv);
 
             var width = this.wizardCtrl.contentAreaCtrl.width();
-            sqlText.css("width", width - 7);
+            //sqlText.css("width", width - 7);
+            _this.linedText = sqlText;
+            var editor = CodeMirror.fromTextArea(_this.linedText[0], {
+
+                lineNumbers: false,  //显示行号
+                lineWrapping: false, //false则超过宽带会显示水平滚动条，true不会显示
+                foldGutter: false,   //代码是否可折叠
+                gutters: ["CodeMirror-linenumbers"],
+                matchBrackets: false,    //括号匹配
+                indentWithTabs: false,  //前 N*tabSize 个空格是否应替换为 N 个制表符
+                smartIndent: false,   //上下文相关缩进（即是否缩进与之前的行相同）
+                autofocus: false,
+                styleActiveLine: true, //光标所在行高亮
+                readOnly: false,      //只读
+            });
+
+            _this.sqlText = editor;
 
-            _this.sqlText = sqlText;
             // 
             var parametersDiv = $("<div></div>").addClass("sqlstatementparam").appendTo(sqlStep);
             parametersDiv.append($("<span></span>").text(GetLanguageByKey('LHBIS_FIC_CLIENT_MODULES_DATATABLEWIZARD_A118', 'Parameter(s):')));
@@ -2497,7 +2615,7 @@ if (typeof $woptDataTableSQLStatement !== 'object') {
             };
             ///SQL生成器事件
             sqlGenerator.click(_this.sqlParametersCtrl, function (e) {
-                if (sqlText.val() !== null && sqlText.val() !== undefined && sqlText.val() !== "") {
+                if (_this.sqlText.getValue() !== null && _this.sqlText.getValue() !== undefined && _this.sqlText.getValue() !== "") {
                     $alertdialog.showConfirmWidth(400,
                         DEFAULT_LANG.FICManagement,
                         GetLanguageByKey('LHBIS_FIC_CLIENT_MODULES_SQLGENERATOR_A051',
@@ -2513,7 +2631,7 @@ if (typeof $woptDataTableSQLStatement !== 'object') {
                                         null,
                                         _this.sqlParametersCtrl,
                                         function(re) {
-                                            sqlText.val(re);
+                                            _this.sqlText.setValue(re);
                                         });
                                 }
                             ]
@@ -2529,7 +2647,7 @@ if (typeof $woptDataTableSQLStatement !== 'object') {
                         null,
                         _this.sqlParametersCtrl,
                         function (re) {
-                            sqlText.val(re);
+                            _this.sqlText.setValue(re);
                         });
                 }
             });
@@ -2600,7 +2718,7 @@ if (typeof $woptDataTableSQLStatement !== 'object') {
                 //权限处理
                 if (IsPackage(_FICDataTable) || _FICDataTable.Type == "EMDataTableType.Transformation") {
                     _this.sqlParametersCtrl.CellsDisabled = true;
-                    sqlText.attr("disabled", "disabled");
+                    _this.sqlText.setOption("readOnly", true);
                     refreshParamsButton.attr("disabled", "disabled");
                     isSqlBlock.attr("disabled", "disabled");
                     twoPhaseExec.attr("disabled", "disabled");
@@ -2615,7 +2733,7 @@ if (typeof $woptDataTableSQLStatement !== 'object') {
                     twoPhaseExec.remove();
                     lbltwoPhaseExec.remove();
                     sqlGenerator.remove();
-                    sqlText.change(function (e) {
+                    _this.sqlText.on('change', function (e) {
                         _this.wizardCtrl.data.IsParamsRefreshed = false;
                     });
                 } else if (_FICDataTable.Type == "Transformation")//Transformation
@@ -2632,7 +2750,7 @@ if (typeof $woptDataTableSQLStatement !== 'object') {
                      
                     }
                     else {
-                        sqlText.prop('allowempty', true);
+                        _this.linedText.prop('allowempty', true);
                         sqlGenerator.remove();
                     }
                 }
@@ -2652,7 +2770,7 @@ if (typeof $woptDataTableSQLStatement !== 'object') {
                         if (_FICDataTable.IsLocked) {
                             CanEdit = false;
                             _this.sqlParametersCtrl.CellsDisabled = true;
-                            sqlText.attr("disabled", "disabled");
+                            _this.sqlText.setOption("readOnly", true);
                             refreshParamsButton.attr("disabled", "disabled");
                             isSqlBlock.attr("disabled", "disabled");
                             twoPhaseExec.attr("disabled", "disabled");
@@ -2679,7 +2797,7 @@ if (typeof $woptDataTableSQLStatement !== 'object') {
 
                     CanEdit = false;
                     _this.sqlParametersCtrl.CellsDisabled = false;
-                    sqlText.attr("disabled", "disabled");
+                    _this.sqlText.setOption("readOnly", true);
                     refreshParamsButton.attr("disabled", "disabled");
                     isSqlBlock.attr("disabled", "disabled");
                     twoPhaseExec.attr("disabled", "disabled");
@@ -2712,9 +2830,9 @@ if (typeof $woptDataTableSQLStatement !== 'object') {
                 //init Data
                 if (this.wizardCtrl.dataObj.DataTableSQL) {
                     if (CanEdit) {
-                        sqlText.val(this.wizardCtrl.dataObj.DataTableSQL);
+                        _this.sqlText.setValue(this.wizardCtrl.dataObj.DataTableSQL);
                     } else {
-                        sqlText.val("******");
+                        _this.sqlText.setValue("******");
                         if (_this.wizardCtrl.isExcelConnector) {
                             fileName.attr("disabled", "disabled");
                             sheetName.attr("disabled", "disabled");
@@ -2753,9 +2871,10 @@ if (typeof $woptDataTableSQLStatement !== 'object') {
                 _this.parameterCtrlDiv.css("height", (tableParams.length + 1) * 30 + 60);
             }
             
-
+            
             setTimeout(function () {
                 _this.sqlParametersCtrl.setData(tableParams);
+                _this.sqlText.refresh();
                 resolve(sqlStep);
             }, 100);
         };
@@ -2768,7 +2887,7 @@ if (typeof $woptDataTableSQLStatement !== 'object') {
             if (!keep_btValidate)
                 this.wizardCtrl.deleteButton("btValidate");
             if (this.wizardCtrl.data.CanEdit) {
-                this.wizardCtrl.dataObj.DataTableSQL = this.sqlText.val();
+                this.wizardCtrl.dataObj.DataTableSQL = this.sqlText.getValue();
             }
             var tabParams = this.sqlParametersCtrl.GetData();
             for (var i = 0; i < tabParams.length; i++) {
@@ -2795,10 +2914,10 @@ if (typeof $woptDataTableSQLStatement !== 'object') {
         };
         $woptDataTableSQLStatement.prototype.sizeChangeOnContent = function (width, height) {
             if (this.sqlParametersCtrl) {
-                this.sqlText.css("width", width - 28);
                 this.parameterCtrlDiv.css("width", width - 22);
                 var topHeight = this.wizardCtrl.contentAreaCtrl.find(".sqlstatementtop").height();
-                this.sqlText.css("height", height - this.parameterCtrlDiv.height() - topHeight - 80);
+                this.sqlText.setSize(width - 28, height - this.parameterCtrlDiv.height() - topHeight - 80); 
+
                 //this.sqlParametersCtrl.onresize(width, height - this.sqlText.height() - topHeight - 80, false);
             }
         };
@@ -3046,7 +3165,7 @@ if (typeof $woptDataTableSQLStatement !== 'object') {
 
         function RefreshTableParams(_this) {
             var lstTableParam = [];
-            var sqlText = _this.sqlText.val();
+            var sqlText = _this.sqlText.getValue();
             if (!_this.wizardCtrl.data.CanEdit) {
                 sqlText = _this.wizardCtrl.dataObj.DataTableSQL;
             }
@@ -3201,6 +3320,142 @@ if (typeof $woptDataTableSQLStatement !== 'object') {
     }());
 }
 
+if (typeof $woptDataTableSharePoint !== 'object') {
+
+    $woptDataTableSharePoint = $wizardOption.extend({
+    });
+
+    (function () {
+        'use strict';
+
+        $woptDataTableSharePoint.prototype.text = GetLanguageByKey('LHBIS_FIC_CLIENT_MODULES_DATATABLEWIZARD_A158', 'Select SharePoint Site & List');
+
+        $woptDataTableSharePoint.prototype.name = "SharePointDataTable";
+
+        $woptDataTableSharePoint.prototype.chooseEnable = false;
+
+        $woptDataTableSharePoint.prototype.jumpPass = false;
+
+
+        function RefreshList(siteID, _this) {
+            _this.wizardCtrl.ShowProgressBar();
+            _network.management('GetSharePointLists', [_this.wizardCtrl.dataObj.ConnectionIID, siteID], function (e) {
+                _this.wizardCtrl.HideProgressBar();
+                if (e.ErrorCode !== 0) {
+                    throw new Error(e);
+                }
+                var lists = JSON.parse(e.Result);
+
+                _this.list.find("option:selected").text("");
+                _this.list.empty();
+                for (var i = 0; i < lists.length; i++) {
+                    var item = lists[i];
+                    _this.list.append($('<option></option>')
+                        .attr('value', item.Id)
+                        .text(item.DisplayName));
+
+                }
+
+                if (_this.vals.length > 0) {
+                    _this.list.val(_this.vals[1]);
+                }
+
+            });
+        }
+        $woptDataTableSharePoint.prototype.createContent = function (resolve) {
+            this.wizardCtrl.SetHeadTitle(GetLanguageByKey('LHBIS_FIC_CLIENT_MODULES_DATATABLEWIZARD_A158', 'Select SharePoint Site & List'));
+
+            CreateTitleInfo(this.wizardCtrl);
+
+            this.wizardCtrl.setButtonEnable("btPreview", true);
+
+            //填充内容
+            var _this = this;
+            var _content = $("<div style='margin:10px;'></div>");
+            var table = $("<table></table>").appendTo(_content);
+            var tr = $("<tr></tr>").appendTo(table);
+            var td = $("<td></td>").text('Select Site:').appendTo(tr);
+            td = $("<td></td>").appendTo(tr);
+            var site = $("<select id='spSite' style='width:300px;'></select>").appendTo(td);
+            site.on('change', function () {
+                RefreshList(this.value, _this);
+            })
+            _this.site = site;
+
+            var vals = [];
+            if (this.wizardCtrl.dataObj.DataTableSQL !== undefined && this.wizardCtrl.dataObj.DataTableSQL.indexOf('@')>0) {
+                vals = this.wizardCtrl.dataObj.DataTableSQL.split('@');
+            }
+            _this.vals = vals;
+            $("<tr style='height:5px;'></tr>").appendTo(table);
+
+            tr = $("<tr></tr>").appendTo(table);
+            td = $("<td></td>").text('Select List:').appendTo(tr);
+            td = $("<td></td>").appendTo(tr);
+            var list = $("<select id='spList' style='width:300px;'></select>").appendTo(td);
+            _this.list = list;
+            _this.wizardCtrl.ShowProgressBar();
+            _network.management('GetSharePointSites', [this.wizardCtrl.dataObj.ConnectionIID], function (e) {
+                _this.wizardCtrl.HideProgressBar();
+                if (e.ErrorCode !== 0) {
+                    throw new Error(e);
+                }
+                var sites = JSON.parse(e.Result);
+                for (var i = 0; i < sites.length; i++) {
+                    var item = sites[i];
+                    site.append($('<option></option>')
+                        .attr('value', item.Id)
+                        .text(item.DisplayName));
+
+                }
+
+                if (_this.vals.length > 0) {
+                    site.val(_this.vals[0]);
+                    RefreshList(_this.vals[0], _this);
+                }
+                else {
+                    if (sites.length > 0) {
+                        site.val(sites[0].Id);
+                        RefreshList(sites[0].Id, _this);
+                    }
+                }
+
+                resolve(_content);
+            });
+        };
+
+        $woptDataTableSharePoint.prototype.verifyContent = function (resolve, reject) {
+            var _this = this;
+
+            var sitevalue = _this.site.val();
+            if ($.nullOrEmpty(sitevalue)) {
+                _this.wizardCtrl.showMessage(GetLanguageByKey("LHBIS_FIC_CLIENT_MODULES_DATATABLEWIZARD_A155", "Please select a site item."));
+                return reject();
+            }
+            var listvalue = _this.list.val();
+            if ($.nullOrEmpty(listvalue)) {
+                _this.wizardCtrl.showMessage(GetLanguageByKey("LHBIS_FIC_CLIENT_MODULES_DATATABLEWIZARD_A156", "Please select a list item."));
+                return reject();
+            }
+
+            _this.wizardCtrl.dataObj.DataTableSQL = sitevalue + "@" + listvalue;
+
+            return resolve();
+        };
+
+        $woptDataTableSharePoint.prototype.saveContentData = function () {
+            //验证中保存
+        };
+
+        //窗体大小发生改变时的回调函数
+        $woptDataTableSharePoint.prototype.sizeChangeOnContent = function (width, height) {
+            
+        };
+
+    }());
+
+}
+
 
 //Validate按钮
 
@@ -3493,6 +3748,10 @@ if (typeof $woptDataTableFRS !== 'object') {
             var _this = this;
 
             var contentHeight = this.wizardCtrl.contentAreaCtrl.height() - 15;
+            _this.ispackage = false;
+            if (IsPackage(_this.wizardCtrl.dataObj)) {
+                _this.ispackage = true;
+            }
 
             mainTable = $("<div></div>").css({ "display": "table", "width": "100%" })
                 .height(contentHeight).appendTo(_content);
@@ -3533,8 +3792,10 @@ if (typeof $woptDataTableFRS !== 'object') {
                     grid_CellsCtrl.selectrowIndexs = [];
                     grid_CellsCtrl.setData(FRPTColumnEntity.Cells);
                     mainTable.find("[name='Cell_btDelete']").attr("disabled", "disabled");
-                    _this.btn_delete.removeAttr("disabled");
-                    _this.btn_addCell.removeAttr("disabled");
+                    if (!_this.ispackage) {
+                        _this.btn_delete.removeAttr("disabled");
+                        _this.btn_addCell.removeAttr("disabled");
+                    }
                     _this.txt_Formula.removeAttr("disabled");
 
                 } else {
@@ -3571,16 +3832,22 @@ if (typeof $woptDataTableFRS !== 'object') {
                         }
                     }]], undefined, undefined, _this.wizardCtrl.parentDom);
                 });
-            colTD = $("<div name='tdColumns' valign='top'  style='display:table-cell;width:190px;border:1px solid #ccc;padding:5px;'></div>")
-            .append(grid_Columns)
-            .append($("<input type='button' style='float:left;margin:5px 5px 5px 0px;' />")
+            this.btn_add = $("<input type='button' style='float:left;margin:5px 5px 5px 0px;' />")
                 .val(GetLanguageByKey('EXTEND_LHBIS_FIC_CLIENT_MODULES_DATATABLEWIZARD_A101', 'Add'))
                 .click(grid_ColumnsCtrl, function (e) {
                     //FRPTColumnforUIList.push({ ColumnName: "", Formula: "", Cells: [] });
                     e.data.AddNewRow();
-                }))
+                });
+            colTD = $("<div name='tdColumns' valign='top'  style='display:table-cell;width:190px;border:1px solid #ccc;padding:5px;'></div>")
+            .append(grid_Columns)
+            .append(this.btn_add)
             .append(this.btn_delete)
-            .appendTo(mainTable);
+                .appendTo(mainTable);
+
+            if (_this.ispackage) {
+                this.btn_add.prop("disabled", _this.ispackage);
+                this.btn_delete.prop("disabled", _this.ispackage);
+            }
 
             var spliterDiv = $("<div id='spliterdiv' ></div>").css({ "width": "8px", "min-width": "8px", "display": "table-cell" }).appendTo(mainTable);
             spliterDiv.on("mousedown", onmousedown);
@@ -3599,7 +3866,7 @@ if (typeof $woptDataTableFRS !== 'object') {
             grid_CellsCtrl.resetHeaderWidth = true;
             grid_CellsCtrl.load(grid_Cells, true);
             grid_CellsCtrl.selectrowevent = function (rowindex, sectionRowIndex) {
-                if (sectionRowIndex > -1) {
+                if (sectionRowIndex > -1 && !_this.ispackage) {
                     mainTable.find("[name='Cell_btDelete']").removeAttr("disabled");
 
                 } else {
@@ -3638,6 +3905,10 @@ if (typeof $woptDataTableFRS !== 'object') {
                     e.data.AddRow(parentData);
                 });
 
+            if (_this.ispackage) {
+                this.btn_addCell.prop("disabled", _this.ispackage);
+            }
+
             cellTD = $("<div name='tdCells' valign='top' style='display:table-cell;border:1px solid #ccc;padding:5px;'></div>").append(grid_Cells)
             .append(this.btn_addCell)
             .append($("<input type='button' disabled='disabled' name='Cell_btDelete' style='float:left;margin:5px 5px 5px 0px;' />")
@@ -4276,6 +4547,11 @@ if (typeof $woptDataTableFIFRS !== 'object') {
 
             var _this = this;
 
+            _this.ispackage = false;
+            if (IsPackage(_this.wizardCtrl.dataObj)) {
+                _this.ispackage = true;
+            }
+
             var contentHeight = this.wizardCtrl.contentAreaCtrl.height() - 15;
 
             mainTable = $("<div></div>").css({ "display": "table", "width": "100%" })
@@ -4343,15 +4619,18 @@ if (typeof $woptDataTableFIFRS !== 'object') {
                         _content.find("[name='tableConst']").css("display", "none");
                         _content.find("[name='divGrid']").css("display", "table-row");
                         mainTable.find("[name='Cell_btDelete']").attr("disabled", "disabled");
-                        _this.btn_addCell.removeAttr("disabled");
+                        if (!_this.ispackage) {
+                            _this.btn_addCell.removeAttr("disabled");
+                        }
                         _this.txt_Formula.removeAttr("disabled");
 
                         _this.txt_Formula.val(FRPTColumnEntity.Formula);
                         grid_CellsCtrl.selectrowIndexs = [];
                         grid_CellsCtrl.setData(FRPTColumnEntity.Cells);
                     }
-                    _this.btn_delete.removeAttr("disabled");
-
+                    if (!_this.ispackage) {
+                        _this.btn_delete.removeAttr("disabled");
+                    }
                 } else {
                     _this.btn_delete.attr("disabled", "disabled");
                     _this.btn_addCell.attr("disabled", "disabled");
@@ -4387,15 +4666,22 @@ if (typeof $woptDataTableFIFRS !== 'object') {
                         }
                     }]], undefined, undefined, _this.wizardCtrl.parentDom);
                 });
-            colTD = $("<div name='tdColumns' valign='top'  style='display:table-cell;width:190px;border:1px solid #ccc;padding:5px;'></div>").append(grid_Columns)
-            .append($("<input type='button' style='float:left;margin:5px 5px 5px 0px;' />")
+            this.btn_add = $("<input type='button' style='float:left;margin:5px 5px 5px 0px;' />")
                 .val(GetLanguageByKey('EXTEND_LHBIS_FIC_CLIENT_MODULES_DATATABLEWIZARD_A101', 'Add'))
                 .click(grid_ColumnsCtrl, function (e) {
                     //FRPTColumnforUIList.push({ ColumnName: "", Formula: "", IsConst: false, Const: "", ConstFilters: [], Cells: [] });
                     e.data.AddNewRow();
-                }))
-            .append(this.btn_delete)
-            .appendTo(mainTable);
+                });
+
+            colTD = $("<div name='tdColumns' valign='top'  style='display:table-cell;width:190px;border:1px solid #ccc;padding:5px;'></div>").append(grid_Columns)
+                .append(this.btn_add)
+                .append(this.btn_delete)
+                .appendTo(mainTable);
+
+            if (_this.ispackage) {
+                this.btn_add.prop("disabled", _this.ispackage);
+                this.btn_delete.prop("disabled", _this.ispackage);
+            }
 
             var spliterDiv = $("<div id='spliterdiv' ></div>").css({ "width": "8px", "min-width": "8px", "display": "table-cell" }).appendTo(mainTable);
             spliterDiv.on("mousedown", onmousedown);
@@ -4414,7 +4700,7 @@ if (typeof $woptDataTableFIFRS !== 'object') {
             grid_CellsCtrl.resetHeaderWidth = true;
             grid_CellsCtrl.load(grid_Cells, true);
             grid_CellsCtrl.selectrowevent = function (rowindex, sectionRowIndex) {
-                if (sectionRowIndex > -1) {
+                if (sectionRowIndex > -1 && !_this.ispackage) {
                     mainTable.find("[name='Cell_btDelete']").removeAttr("disabled");
 
                 } else {
@@ -4501,13 +4787,21 @@ if (typeof $woptDataTableFIFRS !== 'object') {
                          mainTable.find("[name='tableConst']").css("display", "none");
                          mainTable.find("[name='divGrid']").css("display", "table-row");
 
-                         _this.btn_addCell.removeAttr("disabled");
+                         if (!_this.ispackage) {
+                             _this.btn_addCell.removeAttr("disabled");
+                         }
+                         
                          _this.txt_Formula.removeAttr("disabled");
 
-                         if (grid_CellsCtrl.dataCtrl.find("tr[class='rowSelected']").length == 0)
+                         if (grid_CellsCtrl.dataCtrl.find("tr[class='rowSelected']").length == 0) {
                              mainTable.find("[name='Cell_btDelete']").attr("disabled", "disabled");
-                         else
-                             mainTable.find("[name='Cell_btDelete']").removeAttr("disabled");
+                         }
+                         else {
+                             if (!_this.ispackage) {
+                                 mainTable.find("[name='Cell_btDelete']").removeAttr("disabled");
+                             }
+                         }
+                             
 
                      }
                  }))
@@ -5383,7 +5677,7 @@ if (typeof $woptDataTableDailySales !== 'object') {
                 });
 
                 var tableColumns = _content.find('#DailySales_Table_Columns').css('height', height - 79);
-                var GridView = window.GridView || window['g5-gridview'];
+                var GridView = window['g5-gridview'];
                 var g = new GridView(tableColumns);
                 _this.gridColumns = g;
                 g.$window = window.parent;

Site/fic/fic/js/Management/SQLGenerator.js

@@ -5,7 +5,7 @@
     (function () {
         'use strict';
         var DataGrid = window.DataGrid || window['g5-datagrid'];
-        var GridView = window.GridView || window['g5-gridview'];
+        var GridView = window['g5-gridview'];
         var EntityVue;
         var VueField;
         var VueCondition;
@@ -51,6 +51,7 @@
             gridcontent.find("#Verification")
                 .val(GetLanguageByKey("LHBIS_FIC_CLIENT_MODULES_SQLGENERATOR_A010", "Verification"));
             gridcontent.find("#Preview").val(GetLanguageByKey("LHBIS_FIC_CLIENT_MODULES_SQLGENERATOR_A011", "Preview"));
+            gridcontent.find("#Preview").attr('title', GetLanguageByKey("LHBIS_FIC_CLIENT_MODULES_SQLGENERATOR_A052", "Only 100 records."));
             gridcontent.find('#td_Tab .tab_header li[data-href="tab_entity"]')
                 .text(GetLanguageByKey("LHBIS_FIC_CLIENT_MODULES_SQLGENERATOR_A006", "Entity Relationship"));
             gridcontent.find('#td_Tab .tab_header li[data-href="tab_Field"]')
@@ -1687,7 +1688,7 @@ if (typeof $addEntityShow !== 'object') {
     });
     (function () {
         'use strict';
-        var GridView = window.GridView || window['g5-gridview'];
+        var GridView = window['g5-gridview'];
         var grid_dtCommunity;
         var connectionIID;
         var eparent;

Site/fic/fic/js/Management/UserAlertFilter.js

@@ -118,7 +118,7 @@
                         },
                         {
                             key: 'FleetSource',
-                            caption: 'Filter Template',
+                            caption: GetLanguageByKey('LHBIS_FIC_CLIENT_FICCONTROLS_FILTERCTRL_A030', 'Filter Template'),
                             type: DataGrid.COLUMN_TYPE.dropdown,
                             sortable: false,
                             source: (_this.FleetSource == null ? [''] : [''].concat(_this.FleetSource)),
@@ -185,7 +185,7 @@
                                             item.PluginIID = fields[0].PluginIID;
 
                                             if (strIsNullorEmpty(item.ColumnName)) {
-                                                msg = "This Alert Message has no filter set.";
+                                                msg = GetLanguageByKey('LHBIS_FIC_CLIENT_FICCONTROLS_FILTERCTRL_A032', "This Alert Message has no filter set.");
                                                 $alertdialog.showError('', msg, null, null, undefined, 850);
                                                 return;
                                             }
@@ -196,13 +196,13 @@
                                                 continue;
                                             }
                                             if (!strIsNullorEmpty(item.ColumnName) && $.nullOrEmpty(item.FleetSource)) {
-                                                msg = "The Filter Template is blank.";
+                                                msg = GetLanguageByKey('LHBIS_FIC_CLIENT_FICCONTROLS_FILTERCTRL_A031',"The Filter Template is blank.");
                                                 $alertdialog.showError('', msg, null, null, undefined, 850);
                                                 return;
                                             }
                                         }
                                         else {
-                                            msg = "This Alert Message has no filter set.";
+                                            msg = GetLanguageByKey('LHBIS_FIC_CLIENT_FICCONTROLS_FILTERCTRL_A032', "This Alert Message has no filter set.");
                                             $alertdialog.showError('', msg, null, null, undefined, 850);
                                             return;
                                         }

Site/fic/fic/js/Management/UserManagement.js

@@ -1674,6 +1674,12 @@ if (typeof $schedulePage != 'function') {
             p.data('schedule', this);
             p.load(window.sitePath + 'fic/Template/Management/EmailSubscriptionTab.html?v=' + Math.random(), function () {
                 p.applyLanguageText();
+
+                var tz = window.parent._utility?.currentTimezone;
+                if (tz) {
+                    p.find('#span-time-zone').text(tz);
+                }
+
                 p.tab({
                     'onclick': function (li, next) {
                         if (li.attr('data-href') === 'tab_pivots') {
@@ -2238,6 +2244,23 @@ if (typeof $schedulePage != 'function') {
                             p.find('#schedule-pdf').prop('checked', false);
                             p.find('#schedule-xps').prop('checked', false);
                         }
+                        var _hasattch = false;
+                        if (p.find('#schedule-xps').prop('checked')) {
+                            _hasattch = true;
+                        }
+                        if (p.find('#schedule-pdf').prop('checked')) {
+                            _hasattch = true;
+                        }
+                        if (p.find('#schedule-excel').prop('checked')) {
+                            _hasattch = true;
+                        }
+                        if (_hasattch) {
+                            p.find('#schedule-onlysend').attr('disabled', false);
+                        }
+                        else {
+                            p.find('#schedule-onlysend').attr('disabled', true);
+                            p.find('#schedule-onlysend').prop('checked', false);
+                        }
                     };
                 };
                 p.find('#schedule-xps').on('change', attachmentsClick('xps'));
@@ -2276,7 +2299,8 @@ if (typeof $schedulePage != 'function') {
             this.container.find('#frequency-week6').prop('checked', schedule.Saturday === true);
             this.container.find('#frequency-week7').prop('checked', schedule.Sunday === true);
             this.container.find('#schedule-hasdatasent').prop('checked', schedule.HasDataSent === true);
-
+            this.container.find('#schedule-onlysend').prop('checked', schedule.OnlySendAttachment === true);
+            
             this.container.find('#execute-once').prop('checked', schedule.Daily.OcurrsOnce === true).change();
             this.container.find('#text-occurs-once').val(schedule.Daily.OcurrsOnceAt || '');
             this.container.find('#execute-every').prop('checked', !schedule.Daily.OcurrsOnce);
@@ -2298,45 +2322,62 @@ if (typeof $schedulePage != 'function') {
             this.container.find('#schedule-xps').prop('checked', false);
             this.container.find('#schedule-pdf').prop('checked', false);
             this.container.find('#schedule-excel').prop('checked', false);
+            
             var canExport = (typeof (useritem) === 'undefined' ? loginedUser('CanExportFile') : useritem.CanExportFile);
+
+            var _this = this.container;
+
             if (obj.ChartType === _chartType.Grid
                 || obj.ChartType === _chartType.Grid3D
                 || obj.ChartType === _chartType.List
                 || obj.ChartType === _chartType.Alert
                 || obj.ChartType === _chartType.Stock) {
                 if (canExport) {
+                    this.container.find('#schedule-item-onlysend').show();
                     this.container.find('#schedule-item-excel').show();
                     this.container.find('#schedule-item-xps').show();
                     this.container.find('#schedule-item-pdf').show();
                 }
                 else {
+                    this.container.find('#schedule-item-onlysend').hide();
                     this.container.find('#schedule-item-excel').hide();
                     this.container.find('#schedule-item-xps').hide();
                     this.container.find('#schedule-item-pdf').hide();
                 }
+                var hasAttach = false;
                 if ((schedule.Attachments & 1) === 1) {
+                    hasAttach = true;
                     this.container.find('#schedule-xps').prop('checked', true);
                 } else if ((schedule.Attachments & 2) === 2) {
+                    hasAttach = true;
                     this.container.find('#schedule-pdf').prop('checked', true);
                 } else if ((schedule.Attachments & 4) === 4) {
+                    hasAttach = true;
                     this.container.find('#schedule-excel').prop('checked', true);
                 }
+                this.container.find('#schedule-onlysend').attr('disabled', !hasAttach);
             } else {
                 this.container.find('#schedule-item-excel').hide();
                 if (canExport) {
+                    this.container.find('#schedule-item-onlysend').show();
                     this.container.find('#schedule-item-xps').show();
                     this.container.find('#schedule-item-pdf').show();
                 }
                 else {
+                    this.container.find('#schedule-item-onlysend').hide();
                     this.container.find('#schedule-item-xps').hide();
                     this.container.find('#schedule-item-pdf').hide();
                 }
                 this.container.find('#schedule-excel').prop('checked', false);
+                var hasAttach = false;
                 if ((schedule.Attachments & 1) === 1) {
+                    hasAttach = true;
                     this.container.find('#schedule-xps').prop('checked', true);
                 } else if ((schedule.Attachments & 2) === 2) {
+                    hasAttach = true;
                     this.container.find('#schedule-pdf').prop('checked', true);
                 }
+                this.container.find('#schedule-onlysend').attr('disabled', !hasAttach);
             }
 
             if (schedule.Custom === undefined) {
@@ -2449,6 +2490,7 @@ if (typeof $schedulePage != 'function') {
                 StartDate: this.container.find('#text-start-date').val(),
                 EndDate: this.container.find('#text-end-date').val(),
                 HasDataSent: hasDataSent,
+                OnlySendAttachment: this.container.find('#schedule-onlysend').prop('checked'),
                 Attachments: attach,
                 Custom: {
                     Enabled: this.container.find('#schedule-customization-enabled').prop('checked'),
@@ -2985,25 +3027,33 @@ $(function () {
                     || chartObj.ChartType === _chartType.Alert
                     || chartObj.ChartType === _chartType.Stock) {
                     if (useritem.CanExportFile) {
+                        scheduleTab.container.find('#schedule-item-onlysend').show();
                         scheduleTab.container.find('#schedule-item-excel').show();
                         scheduleTab.container.find('#schedule-item-pdf').show();
                         scheduleTab.container.find('#schedule-item-xps').show();
                     }
                     else {
+                        scheduleTab.container.find('#schedule-item-onlysend').hide();
                         scheduleTab.container.find('#schedule-item-excel').hide();
                         scheduleTab.container.find('#schedule-item-pdf').hide();
                         scheduleTab.container.find('#schedule-item-xps').hide();
                     }
+                    scheduleTab.container.find('#schedule-onlysend').prop('checked', false);
+                    scheduleTab.container.find('#schedule-onlysend').attr('disabled', true);
                 } else {
                     scheduleTab.container.find('#schedule-item-excel').hide();
                     if (useritem.CanExportFile) {
+                        scheduleTab.container.find('#schedule-item-onlysend').show();
                         scheduleTab.container.find('#schedule-item-pdf').show();
                         scheduleTab.container.find('#schedule-item-xps').show();
                     }
                     else {
+                        scheduleTab.container.find('#schedule-item-onlysend').hide();
                         scheduleTab.container.find('#schedule-item-pdf').hide();
                         scheduleTab.container.find('#schedule-item-xps').hide();
                     }
+                    scheduleTab.container.find('#schedule-onlysend').prop('checked', false);
+                    scheduleTab.container.find('#schedule-onlysend').attr('disabled', true);
                 }
                 gridSchedule.source[gridSchedule.selectedIndex].Values.ChartIID = chartObj.ChartIID;
                 gridSchedule.source[gridSchedule.selectedIndex].Values.ChartName = chartObj.ChartName;
@@ -3173,6 +3223,7 @@ $(function () {
                 MonthOfYear: 1,
                 DayOfMonth: 1,
                 HasDataSent: 0,
+                OnlySendAttachment: false,
                 StartDate: currDate,
                 EndDate: currDate,
                 Custom: {

Site/fic/fic/js/Management/addDataConnection.js

@@ -15,6 +15,7 @@
             this.dataObj = jQuery.extend({}, {
                 "$type": 'FI.FIC.Contracts.DataObjects.BLObject.DataConnectionStructure, FICIntfAdv'
             });
+            this.dataObj.IsEdit = false;
             this.wizardButtons = [new $cancelButton(), new $finishButton(), this.nextPassButton, new $preButton()];
             this.showOpen(GetLanguageByKey("LHBIS_FIC_CLIENT_MODULES_DATACONNECTION_A053", "Data Connection Wizard"), parent, 800, 504);
         }
@@ -36,11 +37,14 @@
                 } else if (_this.dcType == 'Custom') {
                     this.wizardOptions.push(new $CustomInformationOption());
                     this.wizardOptions.push(new $CustomDCConfigureOption());
+                } else if (_this.dcType == 'SharePoint') {
+                    this.wizardOptions.push(new $CustomInformationOption());
+                    this.wizardOptions.push(new $SharePointConfigureOption());
                 } else {    // Connector
                     this.wizardOptions.push(new $CustomInformationOption());
                     this.wizardOptions.push(new $ConnectorConfigureOption());
                 }
-
+                this.dataObj.IsEdit = true;
                 this.wizardButtons = [new $cancelButton(), new $finishButton(), this.nextPassButton, new $preButton()];
                 this.showOpen(GetLanguageByKey("LHBIS_FIC_CLIENT_MODULES_DATACONNECTION_A053", "Data Connection Wizard"), parent, 800, 504);
             }
@@ -95,6 +99,8 @@
                     dctypeSpan.text(GetLanguageByKey("LHBIS_FIC_CLIENT_MODULES_DATACONNECTION_A065", "Custom"));
                 } else if (data.dcType == 'Connector') {
                     dctypeSpan.text(GetLanguageByKey("LHBIS_FIC_CLIENT_MODULES_DATACONNECTION_A116", "Connector"));
+                } else if (data.dcType == 'SharePoint') {
+                    dctypeSpan.text(GetLanguageByKey("LHBIS_FIC_CLIENT_MODULES_DATACONNECTION_A137", "SharePoint"));
                 } else {
                     dctypeSpan.text('');
                 }
@@ -168,6 +174,8 @@ function getConnectionTypeStr(ConnectionType) {
             return "External";
         case 12:
             return "Connector";
+        case 13:
+            return "SharePoint";
         default:
             return "Custom";
     }
@@ -304,6 +312,9 @@ if (typeof $selectConnectionTypeOption !== 'object') {
                 .append($("<p></p>").append(
                     $("<input type='radio' class='radio' name='dcType' id='rconnector' value='Connector' />"),
                     $("<label for='rconnector'></label>").text(GetLanguageByKey("LHBIS_FIC_CLIENT_MODULES_DATACONNECTION_A116", "Connector"))))
+                .append($("<p></p>").append(
+                    $("<input type='radio' class='radio' name='dcType' id='rsharepoint' value='SharePoint' />"),
+                    $("<label for='rsharepoint'></label>").text(GetLanguageByKey("LHBIS_FIC_CLIENT_MODULES_DATACONNECTION_A137", "SharePoint"))))
             ;
 
             var _this = this;
@@ -366,6 +377,23 @@ if (typeof $selectConnectionTypeOption !== 'object') {
                         _this.wizardCtrl.deleteOption("ExternalUserOption");
                     }
                     break;
+                case "SharePoint":
+                    if (!_this.wizardCtrl.isHasOption("CustomInformationOption")) {
+                        _this.wizardCtrl.addOption(new $CustomInformationOption(), "selectConnectionType", false);
+                    }
+                    if (!_this.wizardCtrl.isHasOption("SharePointConfigureOption")) {
+                        _this.wizardCtrl.addOption(new $SharePointConfigureOption(), "CustomInformationOption", false);
+                    }
+                    if (_this.wizardCtrl.isHasOption("CommonOption")) {
+                        _this.wizardCtrl.deleteOption("CommonOption");
+                    }
+                    if (_this.wizardCtrl.isHasOption("ExternalUrlOption")) {
+                        _this.wizardCtrl.deleteOption("ExternalUrlOption");
+                    }
+                    if (_this.wizardCtrl.isHasOption("ExternalUserOption")) {
+                        _this.wizardCtrl.deleteOption("ExternalUserOption");
+                    }
+                    break;
                 default:    // Common
                     if (!_this.wizardCtrl.isHasOption("CommonOption")) {
                         _this.wizardCtrl.addOption(new $CommonOption(), "selectConnectionType", false);
@@ -1726,7 +1754,175 @@ if (typeof $ConnectorConfigureOption !== 'object') {
     }());
 }
 
+if (typeof $SharePointConfigureOption !== 'object') {
 
+    $SharePointConfigureOption = $wizardOption.extend({
+        'tempAgents': undefined,
+        'tempConnectors': {}
+    });
+
+    (function () {
+        'use strict';
+
+        $SharePointConfigureOption.prototype.text = GetLanguageByKey("LHBIS_FIC_CLIENT_MODULES_DATACONNECTION_A136", "Set SharePoint Information");
+
+        $SharePointConfigureOption.prototype.name = "SharePointConfigureOption";
+
+        $SharePointConfigureOption.prototype.chooseEnable = false;
+
+        $SharePointConfigureOption.prototype.jumpPass = false;
+
+        $SharePointConfigureOption.prototype.createContent = function (resolve) {
+            this.wizardCtrl.CreateTitleInfo();
+            //填充内容
+            var _content = $("<div></div>").css({ "padding": "10px", "box-sizing": "border-box", "overflow-x": "auto", "height": "100%" });
+            var _this = this;
+
+            var div = $('<div class="single-line"></div>');
+            var dcprops = _this.wizardCtrl.dataObj.DetailProperties;
+            var tenantIDInputer = $('<input id="text_TenantID" style="width: 320px;" maxlength="200" />').val(dcprops && dcprops.TenantID);
+            div.append($('<span></span>').text(GetLanguageByKey('LHBIS_FIC_CLIENT_MODULES_DATACONNECTION_A131', 'Tenant ID:')), tenantIDInputer);
+            _content.append(div);
+
+            div = $('<div class="single-line"></div>');
+            var clientIDInputer = $('<input id="text_ClientID" style="width: 320px;" maxlength="200" />').val(dcprops && dcprops.ClientID);
+            div.append($('<span></span>').text(GetLanguageByKey('LHBIS_FIC_CLIENT_MODULES_DATACONNECTION_A132', 'Client ID:')), clientIDInputer);
+            _content.append(div);
+            var secret = dcprops && dcprops.Secret;
+            var tmpSecret = secret;
+            if (this.wizardCtrl.dataObj.IsEdit) {
+                tenantIDInputer.prop('disabled', true);
+                clientIDInputer.prop('disabled', true);
+                tmpSecret = secret.substring(0, 4) + "******" + secret.substring(secret.length - 4);
+            }
+
+            div = $('<div class="single-line"></div>');
+            var secretInputer = $('<input id="text_Secret" style="width: 320px;" maxlength="200" />').val(tmpSecret);
+            div.append($('<span></span>').text(GetLanguageByKey('LHBIS_FIC_CLIENT_MODULES_DATACONNECTION_A133', 'Secret:')), secretInputer);
+            _content.append(div);
+
+            div = $('<div class="single-line"></div>');
+            var buttonText = this.wizardCtrl.dataObj.IsEdit ? GetLanguageByKey("LHBIS_FIC_CLIENT_MODULES_DATACONNECTION_A135", "Refresh Token") : GetLanguageByKey("LHBIS_FIC_CLIENT_MODULES_DATACONNECTION_A134", "Get Token");
+            var checktoken = $("<input type='button' id='getsharepointtoken' class='testConnection' style='margin-left:105px;' />").val(buttonText).appendTo(div);
+            _content.append(div);
+
+            checktoken.on('click', function () {
+                var tid = parentFind(_this, "#text_TenantID").val();
+                var cid = parentFind(_this, "#text_ClientID").val();
+                var secret = parentFind(_this, "#text_Secret").val();
+                if (!tid) {
+                    _this.wizardCtrl.showMessage(GetLanguageByKey("LHBIS_FIC_CLIENT_MODULES_DATACONNECTION_A127", "Please enter a TenantID."));
+                    return;
+                }
+                if (!cid) {
+                    _this.wizardCtrl.showMessage(GetLanguageByKey("LHBIS_FIC_CLIENT_MODULES_DATACONNECTION_A128", "Please enter a ClientID."));
+                    return;
+                }
+                if (!secret) {
+                    _this.wizardCtrl.showMessage(GetLanguageByKey("LHBIS_FIC_CLIENT_MODULES_DATACONNECTION_A129", "Please enter a Secret."));
+                    return;
+                }
+
+                if (_this.wizardCtrl.dataObj.IsEdit) {
+                    if (secret.indexOf('******')>0) {
+                        _this.wizardCtrl.showMessage(GetLanguageByKey("LHBIS_FIC_CLIENT_MODULES_DATACONNECTION_A130", "Please enter the full Secret."));
+                        return;
+                    }
+                }
+
+                _this.wizardCtrl.ShowProgressBar();
+                var url = location.origin + sitePath + "fic/FIManagement.aspx";
+                _network.management('GetSharePointTokenCode', [tid, cid, secret, encodeURIComponent(url)], function (e) {
+                    //_this.wizardCtrl.HideProgressBar();
+                    if (e.ErrorCode !== 0) {
+                        console.log(e);
+                        throw new Error(e);
+                    }
+                    var site = JSON.parse(e.Result);
+
+                    window.open(site.Url);
+
+                    let ws = new WebSocket(site.WebSocketUrl);
+
+                    ws.onopen = function (params) {
+                        console.log('connection success.');
+                    };
+
+                    ws.onmessage = function (e) {
+                        console.log('receive message.', e.data);
+                        _network.management('GetSharePointToken', [e.data], function (e) {
+                            _this.wizardCtrl.HideProgressBar();
+                            if (e.ErrorCode !== 0) {
+                                console.log(e);
+                                throw new Error(e);
+                            }
+                            var token = JSON.parse(e.Result);
+                            if (token.Status !== 2) {
+                                _this.wizardCtrl.showMessage("Error:" + token.Error || token.ErrorDescription);
+                            }
+                            else {
+                                _this.wizardCtrl.dataObj.RefreshToken = true;
+                                _this.wizardCtrl.dataObj.SharePointToken = token.Token;
+                                _this.wizardCtrl.showMessage(GetLanguageByKey("LHBIS_FIC_CLIENT_MODULES_DATACONNECTION_A126", "The Token has been successfully acquired."));
+                            }
+                            
+                        });
+                    };
+                });
+            });
+
+            finishEnable(_this);
+            resolve(_content);
+        };
+
+        $SharePointConfigureOption.prototype.verifyContent = function (resolve, reject) {
+            var _this = this;
+            var tenant = parentFind(_this, "#text_TenantID").val();
+            if (!tenant) {
+                _this.wizardCtrl.showMessage(GetLanguageByKey("LHBIS_FIC_CLIENT_MODULES_DATACONNECTION_A127", "Please enter a TenantID."));
+                reject();
+                return;
+            }
+            var client = parentFind(_this, "#text_ClientID").val();
+            if (!client) {
+                _this.wizardCtrl.showMessage(GetLanguageByKey("LHBIS_FIC_CLIENT_MODULES_DATACONNECTION_A128", "Please enter a ClientID."));
+                reject();
+                return;
+            }
+            var secret = parentFind(_this, "#text_Secret").val();
+            if (!secret) {
+                _this.wizardCtrl.showMessage(GetLanguageByKey("LHBIS_FIC_CLIENT_MODULES_DATACONNECTION_A129", "Please enter a Secret."));
+                reject();
+                return;
+            }
+            resolve();
+        };
+
+        $SharePointConfigureOption.prototype.saveContentData = function () {
+            var _this = this;
+
+            var dcstructure = _this.wizardCtrl.dataObj;
+            dcstructure.ConnectionType = 13;
+            if (!dcstructure.hasOwnProperty('DetailProperties')) {
+                dcstructure.DetailProperties = {};
+            }
+
+            dcstructure.DetailProperties.TenantID = parentFind(_this, "#text_TenantID").val();
+            dcstructure.DetailProperties.ClientID = parentFind(_this, "#text_ClientID").val();
+            if (!_this.wizardCtrl.dataObj.IsEdit) {
+                dcstructure.DetailProperties.Secret = parentFind(_this, "#text_Secret").val();
+            }
+            else {
+                if (_this.wizardCtrl.dataObj.RefreshToken) {
+                    dcstructure.DetailProperties.Secret = parentFind(_this, "#text_Secret").val();
+                }
+            }
+        };
+
+        $SharePointConfigureOption.prototype.sizeChangeOnContent = function (width, height) { };
+
+    }());
+}
 
 
 

Site/fic/fic/js/Management/alertMessageWizard.js

@@ -180,8 +180,10 @@ if (typeof $alertMessageWizard !== 'function') {
                 PivotData: [],
                 AggregatesFields: null,
                 TableFields: [],
-                IsAlertDrilldown:true
+                IsAlertDrilldown: true,
             };
+            var tz = createTmpData(tmpdata);
+            tmpdata = tz;
             tmpdata.HasStatistics = tmpdata.AggregatesFields != null;
             if (objdata.DrillDowns != null && objdata.DrillDowns.length > 0) {
                 tmpdata.drilldownchart = {
@@ -1317,7 +1319,8 @@ if (typeof $messageContentParameters != 'function') {
                         ParamName: m.ParamName,
                         ShowIDValue: m.ShowIDValue,
                         UseDataSource: m.UseDataSource,
-                        IDOrName: (m.UseDataSource == 1 ? (m.ShowIDValue == 1 ? "ID" : "Name") : "")
+                        IDOrName: (m.UseDataSource == 1 ? (m.ShowIDValue == 1 ? "ID" : "Name") : ""),
+                        UseTimeZone: m.UseTimeZone
                     };
                     tempsource.push(source);
                 }
@@ -1453,7 +1456,51 @@ if (typeof $messageContentParameters != 'function') {
                         }
                         return isEnabled;
                     }
-                }],
+                        },
+                        {
+                            key: "UseTimeZone",
+                            caption: GetLanguageByKey('LHBIS_FIC_CLIENT_WIZARD_CHARTWIZARDHELPER_A416', 'Offset Timestamp'),
+                            type: _this.wizardCtrl.tmpdata.IsThirdPackge ? 0 : 2,
+                            visible: true,
+                            width: 200,
+                            sortable: false,
+                            source: function () {
+                                return [
+                                    { Key: '', Value: ' ' },
+                                    { Key: '@OrganizationTimeZone@', Value: GetLanguageByKey('LHBIS_FIC_CLIENT_WIZARD_CHARTWIZARDHELPER_A417', 'Organization Setting') },
+                                    { Key: '@UserTimeZone@', Value: GetLanguageByKey('LHBIS_FIC_CLIENT_WIZARD_CHARTWIZARDHELPER_A418', 'User Setting') }
+                                ].concat(_this.wizardCtrl.tmpdata.timezones);
+                            },
+                            sourceKey: 'Key',
+                            sourceText: 'Value',
+                            filter: function (item) {
+                                switch (item.UseTimeZone) {
+                                    case '@OrganizationTimeZone@': return GetLanguageByKey('LHBIS_FIC_CLIENT_WIZARD_CHARTWIZARDHELPER_A417', 'Organization Setting');
+                                    case '@UserTimeZone@': return GetLanguageByKey('LHBIS_FIC_CLIENT_WIZARD_CHARTWIZARDHELPER_A418', 'User Setting');
+                                }
+                                if (_this.wizardCtrl.tmpdata.timezones) {
+                                    var tz = _this.wizardCtrl.tmpdata.timezones.filter(function (t) { return t.Key == item.UseTimeZone })[0];
+                                    if (tz == null) {
+                                        return '';
+                                    }
+                                    return tz.Value;
+                                }
+                                return '';
+                            },
+                            enabled: function (item) {
+                                if (_this.wizardCtrl.tmpdata.IsThirdPackge) {
+                                    return false;
+                                }
+                                var fieldType = GetFiledType(item.ParamField, _this.wizardCtrl.tmpdata.TableFields);
+                                if (fieldType == DBDataType.dtDate) {
+                                    return true;
+                                }
+                                else {
+                                    item.UseTimeZone = '';
+                                    return false;
+                                }
+                            }
+                        },                    ],
                     sourceFilter: _this.wizardCtrl.dataObj.MessageParams
                 },
             });
@@ -1507,7 +1554,8 @@ if (typeof $messageContentParameters != 'function') {
                             ParamField: '',
                             ParamName: splitarray[i],
                             ShoeIDValue: 1,
-                            UseDataSource: 1
+                            UseDataSource: 1,
+                            UseTimeZone:''
                         };
                         inputArray.push(newfielddata);
                     }
@@ -1529,7 +1577,8 @@ if (typeof $messageContentParameters != 'function') {
                                 ParamField: '',
                                 ParamName: splitarray[i],
                                 ShoeIDValue: 1,
-                                UseDataSource: 1
+                                UseDataSource: 1,
+                                UseTimeZone: ''
                             };
                             inputArray.push(newfielddata);
                         }
@@ -1735,9 +1784,9 @@ if (typeof $messageInformationCtrl !== 'object') {
 
             this.wizardCtrl.CreateTitleInfo();
 
-            _content.load(window.sitePath + 'fic/Template/ChartWizard/EditMessageInformation.html?v=4', function () {
+            _content.load(window.sitePath + 'fic/Template/ChartWizard/EditMessageInformation.html?v=6', function () {
                 _content.applyLanguageText();
-
+                _content.find("[name='UISendLimit']").attr("placeholder", GetLanguageByKey('LHBIS_FIC_CLIENT_FICCONTROLS_MESSAGEINFORMATION_A024',"limit how many alerts can be sent per day"));
                 //this.wizardCtrl.ShowProgressBar();
                 GetData(_this, resolve, _content);
 
@@ -1745,21 +1794,45 @@ if (typeof $messageInformationCtrl !== 'object') {
         };
 
         function GetData(_this, resolve, _content) {
-
+            var enname = "";
+            var finded = false;
             for (var i = 0; i < _this.wizardCtrl.MessageTypeNames.length; i++) {
                 if (_this.wizardCtrl.MessageTypeNames[i].LanguageCode == _utility.currentLang) {
                     _content.find("[name='UICaption']").val(_this.wizardCtrl.MessageTypeNames[i].Content);
-                    break;
+                    finded = true;
+                }
+                if (_this.wizardCtrl.MessageTypeNames[i].LanguageCode == "en-us") {
+                    enname = _this.wizardCtrl.MessageTypeNames[i].Content;
                 }
             }
+            if (!finded) {
+                if ($.nullOrEmpty(enname)) {
+                    _content.find("[name='UICaption']").val((_this.wizardCtrl.MessageTypeNames && _this.wizardCtrl.MessageTypeNames.length>0) ? _this.wizardCtrl.MessageTypeNames[0].Content : "");
+                }
+                else {
+                    _content.find("[name='UICaption']").val(enname);
+                }
+            }
+            var endesc = "";
+            finded = false;
 
             for (var i = 0; i < _this.wizardCtrl.MessageDescriptions.length; i++) {
                 if (_this.wizardCtrl.MessageDescriptions[i].LanguageCode == _utility.currentLang) {
                     _content.find("[name='UIDescription']").val(_this.wizardCtrl.MessageDescriptions[i].Content);
-                    break;
+                    finded = true;
+                }
+                if (_this.wizardCtrl.MessageDescriptions[i].LanguageCode == "en-us") {
+                    endesc = _this.wizardCtrl.MessageDescriptions[i].Content;
+                }
+            }
+            if (!finded) {
+                if ($.nullOrEmpty(endesc)) {
+                    _content.find("[name='UIDescription']").val((_this.wizardCtrl.MessageDescriptions && _this.wizardCtrl.MessageDescriptions.length > 0) ? _this.wizardCtrl.MessageDescriptions[0].Content : "");
+                }
+                else {
+                    _content.find("[name='UIDescription']").val(endesc);
                 }
             }
-
             var intHour = 0;
             var intMinute = 0;
             intHour = parseInt(parseInt(_this.wizardCtrl.dataObj.EnabledTimeLen / 3600));
@@ -1767,12 +1840,20 @@ if (typeof $messageInformationCtrl !== 'object') {
 
             if (_this.wizardCtrl.IsAddMessage) {
                 _content.find("[name='UIRefreshTime']").val(900);
+                _content.find("[name='UISendLimit']").val('');
                 _content.find("[name='UIHour']").val(48);
                 _content.find("[name='UIIsActive']").prop('checked', true);
                 _content.find("[name='UISendCreateTime']").prop('checked', true);
             }
             else {
                 _content.find("[name='UIRefreshTime']").val(_this.wizardCtrl.dataObj.RefreshTimeSpan);
+                if (_this.wizardCtrl.dataObj.SendLimit === -1) {
+                    _content.find("[name='UISendLimit']").val("");
+                }
+                else {
+                    _content.find("[name='UISendLimit']").val(_this.wizardCtrl.dataObj.SendLimit);
+                }
+                
                 _content.find("[name='UIHour']").val((isNaN(intHour) ? 0 : intHour));
                 _content.find("[name='UIIsActive']").prop('checked', (_this.wizardCtrl.dataObj.IsActive == 1));
                 _content.find("[name='UISendCreateTime']").prop('checked', (_this.wizardCtrl.dataObj.SendCreateTime == 1));
@@ -1843,7 +1924,7 @@ if (typeof $messageInformationCtrl !== 'object') {
                         var l = { Key: _utility.currentLang, Value: caption };
                         langs.push(l);
                     }
-                    formlang.showOpen($(window.parent.document.body), langs, 250, SetLanguages, 800);
+                    formlang.showOpen($.getParentDomForChart(), langs, 250, SetLanguages, 800);
                 });
 
                 _content.find("[name='UIDescriptionLang']").click(this, function () {
@@ -1864,7 +1945,7 @@ if (typeof $messageInformationCtrl !== 'object') {
                         var l = { Key: _utility.currentLang, Value: caption };
                         langs.push(l);
                     }
-                    formlang.showOpen($(window.parent.document.body), langs, 250, SetLanguages, 800);
+                    formlang.showOpen($.getParentDomForChart(), langs, 250, SetLanguages, 800);
                 })
             }
         }
@@ -1936,6 +2017,7 @@ if (typeof $messageInformationCtrl !== 'object') {
                     return reject();
                 }
             }
+
             var min = parseInt(this.wizardCtrl.contentAreaCtrl.find("[name='UIMinute']").val());
             if (min < 0 || min > 60)
             {
@@ -2009,6 +2091,19 @@ if (typeof $messageInformationCtrl !== 'object') {
             }
             message.RefreshTimeSpan = tmp;
 
+            var sendlimit = this.wizardCtrl.contentAreaCtrl.find("[name='UISendLimit']").val();
+            if (!$.nullOrEmpty(sendlimit)) {
+                var limitNumber = parseInt(sendlimit);
+                if (!isNaN(limitNumber)) {
+                    if (limitNumber <= 0) {
+                        sendlimit = -1;
+                    }
+                }
+            }
+            else {
+                sendlimit = -1;
+            }
+            message.SendLimit = sendlimit;
             var hourval = this.wizardCtrl.contentAreaCtrl.find("[name='UIHour']").val();
             var minuteval = this.wizardCtrl.contentAreaCtrl.find("[name='UIMinute']").val();
             var intHour = hourval == '' ? 0 :parseInt(hourval);

Site/fic/fic/js/Management/boardFilters.js

@@ -79,7 +79,7 @@ if (typeof $boardFilterDialog !== 'function') {
 
             var content = $('<div style="padding: 6px"></div>');
             var ethis = this;
-            content.load(window.sitePath + 'fic/Template/WorkSpace/BoardFilters.html?v=10', function () {
+            content.load(window.sitePath + 'fic/Template/WorkSpace/BoardFilters.html?v=11', function () {
                 content.applyLanguageText();
 
                 var charts = (ethis.board.charts || []).filter(function (c) {

Site/fic/fic/js/Management/createPackage.js

@@ -17,7 +17,8 @@ var BusinessObjectType = {
     GlobalFilter: 9,
     Snapshot: 11,
     ColorScheme: 12,
-    DataTableCache:13
+    DataTableCache: 13,
+    CacheSchedule: 14
 };
 var BusinessObjectName = [
     undefined,
@@ -34,6 +35,7 @@ var BusinessObjectName = [
     GetLanguageByKey('LHBIS_FIC_Client_Package_Create_A087', 'Snapshot'),
     GetLanguageByKey('LHBIS_FIC_Client_Package_Create_A096', 'Chart Color Scheme'),
     GetLanguageByKey('LHBIS_FIC_CLIENT_MANAGEMENT_MAINPAGE_A123', 'SQL Queries'),
+    GetLanguageByKey('LHBIS_FIC_CLIENT_PACKAGE_CREATE_A098', 'Schedules'),
 ];
 var MessageRes = [
     undefined,
@@ -76,6 +78,10 @@ var MessageRes = [
     {
         'on': GetLanguageByKey('LHBIS_FIC_CLIENT_PACKAGE_CREATE_A033', 'Would you like to include the associated Data Connection?'),
         'off': GetLanguageByKey('LHBIS_FIC_CLIENT_PACKAGE_CREATE_A068', 'Would you like to exclude the associated Data Connection?')
+    },
+    {
+        'on': GetLanguageByKey('LHBIS_FIC_CLIENT_PACKAGE_CREATE_A099', 'Would you like to include the associated SQL Queries?'),
+        'off': GetLanguageByKey('LHBIS_FIC_CLIENT_PACKAGE_CREATE_A100', 'Would you like to exclude the associated SQL Queries?')
     }
 ];
 
@@ -91,6 +97,7 @@ var gridTableNames = {
     Snapshot: "Package.Create.CtrlSnapshotSelector.dgSnapshots",
     Workspace: "Package.Create.CtrlWorkspaceSelector.dgWorkspaces",
     DataTableCache: "Package.Create.CtrlSnapshotSelector.dgDataTableCache",
+    Schedules: "Package.Create.CtrlSchedulesSelector.dgCacheSchedules",
 
     getTableName: function () {
         switch (currentTabID) {
@@ -127,6 +134,9 @@ var gridTableNames = {
             case "tab_colors":
                 return this.ChartColor;
                 break;
+            case "tab_schedules":
+                return this.Schedules;
+                break;
             default:
                 return this.Workspace;
                 break;
@@ -147,6 +157,7 @@ function getObjectTypeName(type) {
         case 11:
         case 12:
         case 13:
+        case 14:
             return BusinessObjectName[type];
         case 8:
             return 'DSExternalDT';
@@ -198,6 +209,7 @@ function getSelectedDictionary() {
     list.push({ 'Type': BusinessObjectType.GlobalFilter, 'IIDs': getSelectedIIDs($('#tab_filters').data('grid')) });
     list.push({ 'Type': BusinessObjectType.Snapshot, 'IIDs': getSelectedIIDs($('#tab_snapshots').data('grid')) });
     list.push({ 'Type': BusinessObjectType.DataTableCache, 'IIDs': getSelectedIIDs($('#tab_datatablecaches').data('grid')) });
+    list.push({ 'Type': BusinessObjectType.CacheSchedule, 'IIDs': getSelectedIIDs($('#tab_schedules').data('grid')) });
     list.push({ 'Type': BusinessObjectType.ColorScheme, 'IIDs': getSelectedIIDs($('#tab_colors').data('grid')) });
     return list
 }
@@ -397,6 +409,9 @@ function initUI() {
                 case BusinessObjectType.ColorScheme:
                     grid = $('#tab_colors').data('grid');
                     break;
+                case BusinessObjectType.CacheSchedule:
+                    grid = $('#tab_schedules').data('grid');
+                    break;
                 default:
                     console.log('unknown grid type', list[i]);
                     return;
@@ -731,6 +746,11 @@ function initUI() {
         'on': { 'change': onchange(BusinessObjectType.DataTableCache, 1) },
         'checkall': checkAll(BusinessObjectType.DataTableCache, 1)
     }]);
+    $('#tab_schedules').grid([{
+        'index': 0,
+        'on': { 'change': onchange(BusinessObjectType.CacheSchedule, 1) },
+        'checkall': checkAll(BusinessObjectType.CacheSchedule, 1)
+    }]);
     $('#tab_colors').grid();
 
 
@@ -750,7 +770,8 @@ function loadExportObjects() {
     gridTableNames.Message,
     gridTableNames.Snapshot,
         gridTableNames.Workspace,
-        gridTableNames.DataTableCache];
+        gridTableNames.DataTableCache,
+        gridTableNames.Schedules];
 
     managementquery('GetManagementGridLayouts', [{ '$type': 'System.String[], mscorlib', '$values': gridNames }], function (d) {
         var gridlayouts = d.Result;
@@ -983,6 +1004,24 @@ function showData(data, gridlayouts) {
         changeGridColumns(grid, getGridData(gridTableNames.ChartColor), false);
         grid.setData(getGridData(rst), true);
     }
+
+    grid = $('#tab_schedules').data('grid');
+    grid.columnInfoChanged = saveColumnInfo(gridTableNames.Schedules);
+    list = data.Result.CacheSchedule;
+    if (grid && list) {
+        var rst = [];
+        for (var i = 0; i < list.length; i++) {
+            var item = list[i];
+            rst.push({
+                'IsChecked': false,
+                'IID': item.IID,
+                'Name': item.ScheduleName
+            });
+        }
+        grid.allowDynamic = rst.length > 100;
+        changeGridColumns(grid, getGridData(gridTableNames.Schedules), false);
+        grid.setData(getGridData(rst), true);
+    }
 }
 
 
@@ -1042,6 +1081,10 @@ function getSelectedDictionaryData() {
     if (selecteditem.length > 0)
         list.push({ 'Type': BusinessObjectType.DataTableCache, 'Datas': selecteditem });
 
+    selecteditem = getSelectedDatas($('#tab_schedules').data('grid'));
+    if (selecteditem.length > 0)
+        list.push({ 'Type': BusinessObjectType.CacheSchedule, 'Datas': selecteditem });
+
     selecteditem = getSelectedDatas($('#tab_colors').data('grid'));
     if (selecteditem.length > 0)
         list.push({ 'Type': BusinessObjectType.ColorScheme, 'Datas': selecteditem });

Site/fic/fic/js/Management/dataSourceWizard.js

@@ -842,20 +842,20 @@ if (typeof $woptSetCaptions !== 'object') {
             var columns = [
                 {
                     text: 'FieldName',
-                    name: 'Field Name',
+                    name: GetLanguageByKey('LHBIS_FIC_CLIENT_FICCONTROLS_FILTERCTRL_A003', 'Field Name'),
                     valueIndex: 'FieldName',
                     css: { 'width': 240, 'text-align': 'left' }
                 },
                 {
                     text: 'FieldCaption',
-                    name: 'Field Caption',
+                    name: GetLanguageByKey('LHBIS_FIC_CLIENT_FICCONTROLS_FILTERCTRL_A026', 'Field Caption'),
                     valueIndex: 'FieldCaption',
                     type: 1,
                     css: { 'width': 240, 'text-align': 'left' }
                 },
                 {
                     text: 'FieldDataType',
-                    name: 'FieldDataType',
+                    name: GetLanguageByKey('LHBIS_FIC_CLIENT_FICCONTROLS_FILTERCTRL_A027', 'Field DataType'),
                     valueIndex: 'DataTypeCaption',
                     css: { 'width': 240, 'text-align': 'left' }
                 }

Site/fic/fic/js/Management/purgePackage.js

@@ -3,7 +3,7 @@
 /// <reference path="../controls/gridctrl.js" />
 /// <reference path="func.js" />
 
-   var DataGriew = window.GridView || window['g5-gridview'];
+   var DataGriew = window['g5-gridview'];
 
 var BusinessObjectType = {
     Workspace: 1,
@@ -17,7 +17,8 @@ var BusinessObjectType = {
     GlobalFilter: 9,
     Snapshot: 11,
     ColorScheme: 12,
-    DataTableCache: 13
+    DataTableCache: 13,
+    CacheSchedule: 14
 };
 var BusinessObjectName = [
     undefined,
@@ -34,6 +35,7 @@ var BusinessObjectName = [
     GetLanguageByKey('LHBIS_FIC_Client_Package_Create_A087', 'Snapshot'),
     GetLanguageByKey('LHBIS_FIC_Client_Package_Create_A096', 'Chart Color Scheme'),
     GetLanguageByKey('LHBIS_FIC_CLIENT_MANAGEMENT_MAINPAGE_A123', 'SQL Queries'),
+    GetLanguageByKey('LHBIS_FIC_CLIENT_PACKAGE_CREATE_A098', 'Schedules'),
 ];
 var MessageRes = [
     undefined,
@@ -71,6 +73,10 @@ var MessageRes = [
     {
         'on': GetLanguageByKey('LHBIS_FIC_CLIENT_PACKAGE_CREATE_A032', 'Would you like to include the associated Data Table and Connection?'),
         'off': GetLanguageByKey('LHBIS_FIC_CLIENT_PACKAGE_CREATE_A067', 'Would you like to exclude the associated Data Table and Connection?')
+    },
+    {
+        'on': GetLanguageByKey('LHBIS_FIC_CLIENT_PACKAGE_CREATE_A099', 'Would you like to include the associated SQL Queries?'),
+        'off': GetLanguageByKey('LHBIS_FIC_CLIENT_PACKAGE_CREATE_A100', 'Would you like to exclude the associated SQL Queries?')
     }
 ];
 
@@ -86,6 +92,8 @@ function getObjectTypeName(type) {
         case 9:
         case 11:
         case 12:
+        case 13:
+        case 14:
             return BusinessObjectName[type];
         case 8:
             return 'DSExternalDT';
@@ -137,6 +145,7 @@ function getSelectedDictionary() {
     list.push({ 'Type': BusinessObjectType.GlobalFilter, 'IIDs': getSelectedIIDs($('#tab_filters').data('grid')) });
     list.push({ 'Type': BusinessObjectType.Snapshot, 'IIDs': getSelectedIIDs($('#tab_snapshots').data('grid')) });
     list.push({ 'Type': BusinessObjectType.DataTableCache, 'IIDs': getSelectedIIDs($('#tab_datatablecaches').data('grid')) });
+    list.push({ 'Type': BusinessObjectType.CacheSchedule, 'IIDs': getSelectedIIDs($('#tab_schedules').data('grid')) });
     list.push({ 'Type': BusinessObjectType.ColorScheme, 'IIDs': getSelectedIIDs($('#tab_colors').data('grid')) });
     return list;
 }
@@ -362,6 +371,9 @@ function initUI() {
                 case BusinessObjectType.ColorScheme:
                     grid = $('#tab_colors').data('grid');
                     break;
+                case BusinessObjectType.CacheSchedule:
+                    grid = $('#tab_schedules').data('grid');
+                    break;
                 default:
                     console.log('unknown grid type', list[i]);
                     return;
@@ -496,6 +508,13 @@ function initUI() {
             'SQL Queries': { 'onchange': onchange(BusinessObjectType.DataTableCache) }
         }
     });
+    $('#tab_schedules').datagrid({
+        //'index': 0,
+        //'on': { 'change': onchange(BusinessObjectType.Snapshot) }
+        'events': {
+            'CacheSchedule': { 'onchange': onchange(BusinessObjectType.CacheSchedule) }
+        }
+    });
     $('#tab_colors').datagrid();
 
     // load data
@@ -675,6 +694,22 @@ function loadPackageDetail(pkgIID) {
             grid.setData(getGridData(rst));
         }
 
+        grid = $('#tab_schedules').data('grid');
+        list = data.Result.CacheSchedule;
+        if (grid && list) {
+            var rst = [];
+            for (var i = 0; i < list.length; i++) {
+                var item = list[i];
+                rst.push({
+                    'IsChecked': false,
+                    'IID': item.IID,
+                    'Name': item.ScheduleName
+                });
+            }
+            grid.allowDynamic = rst.length > 100;
+            grid.setData(getGridData(rst));
+        }
+
         grid = $('#tab_colors').data('grid');
         list = data.Result.ColorScheme;
         if (grid && list) {

Site/fic/fic/js/chart.js

@@ -488,6 +488,7 @@ if (typeof $chart !== 'function') {
                     } else {
                         _this.scrollTop = -1;
                         _this.scrollLeft = -1;
+                        _this.gridColumnFilter = [];
                         if (_this.chart !== undefined && _this.chart.chartobj !== undefined && _this.chart.chartobj.chartDiv !== undefined) {
                             var scrollTop = _this.chart.chartobj.chartDiv.find('.data-grid-body').scrollTop();
                             if (scrollTop != null) {
@@ -496,13 +497,22 @@ if (typeof $chart !== 'function') {
                             else {
                                 _this.scrollTop = -1;
                             }
-                            var scrollLeft = _this.chart.chartobj.chartDiv.find('div[class="data-grid"] .data-grid-body').scrollLeft();
+                            var scrollLeft = _this.chart.chartobj.chartDiv.find('div[class="data-grid-old"] .data-grid-body').scrollLeft();
                             if (scrollLeft != null) {
                                 _this.scrollLeft = scrollLeft;
                             }
                             else {
                                 _this.scrollLeft = -1;
                             }
+                            if (_this.chart.gridCtrl) {
+                                for (var i = 0; i < _this.chart.gridCtrl.columns.length; i++) {
+                                    var cc = _this.chart.gridCtrl.columns[i];
+                                    if (cc.filterValues) {
+                                        var c = { key: cc.key, fv: cc.filterValues };
+                                        _this.gridColumnFilter.push(c);
+                                    }
+                                }
+                            }
                         }
                         
                         if (resultdata && resultdata.IID) {
@@ -557,6 +567,14 @@ if (typeof $chart !== 'function') {
                     _this.chart.IsStartZero = _this.IsStartZero;
                     data.Result.Data.StarZero = _this.IsStartZero;
                 }
+                if (_this.DisplayDataPoints) {
+                    _this.chart.DisplayDataPoints = _this.DisplayDataPoints;
+                    data.Result.Data.DisplayDataPoints = _this.DisplayDataPoints;
+                }
+                if (_this.DisplayIndividualValues) {
+                    _this.chart.DisplayIndividualValues = _this.DisplayIndividualValues;
+                    data.Result.Data.DisplayIndividualValues = _this.DisplayIndividualValues;
+                }
                 if (_this.chart) {
                     var lg = _this.chart.personalData && _this.chart.personalData.ClientLanguage;
                     var title = _this.chartDiv.children('.chart_top').children('.chart_title').children('.title');
@@ -567,6 +585,7 @@ if (typeof $chart !== 'function') {
                         title.text(_this.chartData.Name);
                         title.attr('title', _this.chartData.Description);
                     }
+                    
                     _this.chart.setData(data.Result.Data);
                     if (_this.scrollTop != -1) {
                         _this.chartDiv.find('.data-grid-body').scrollTop(_this.scrollTop);
@@ -1112,7 +1131,7 @@ if (typeof $chart !== 'function') {
                     container.attr('src', sitePath + 'fic/Template/ChartComments.html?iid=' + _chart.chartobj.ID + '&name=' + encodeURIComponent(name) + '&sn=' + Math.random());
                     var bg = $('#chart_comments_bg');
                     bg.show();
-                    commentOpenCount = 0;
+                    //commentOpenCount = 0;
                     container.show().stop().animate({ 'margin-right': 0 }, ANIMATE_FAST_SPEED, function () {
                         onCommentsOpened();
                     });
@@ -1497,6 +1516,10 @@ if (typeof $chart !== 'function') {
                     this.isquerying = true;
                     if (_this.chart && _this.chart.IsStartZero)
                         _this.IsStartZero = _this.chart.IsStartZero;
+                    if (_this.chart && _this.chart.DisplayIndividualValues)
+                        _this.DisplayIndividualValues = _this.chart.DisplayIndividualValues;
+                    if (_this.chart && _this.chart.DisplayDataPoints)
+                        _this.DisplayDataPoints = _this.chart.DisplayDataPoints;
 
                     var onerror = function (request, textStatus, errorThrown) {
                         _this.board && _this.board.setchartloading(-1);

Site/fic/fic/js/chartManage/DimWizard.js

@@ -1,7 +1,7 @@
 
 function editChart(chartClassIID, iid, chartName, callBack, onclosed) {
     var wizard;
-    var parent = typeof isLocalForm === 'undefined' || !isLocalForm ? $(window.parent.document.body) : $(window.document.body);
+    var parent = $.getParentDomForChart();
     if (chartClassIID === ChartTypeEnum.Rss) {
         wizard = new $rssWizard();
         wizard.editChart(parent, iid, chartName);

Site/fic/fic/js/chartManage/GaugeWizard.js

@@ -22,9 +22,9 @@ if (typeof $gaugeWizard !== 'function') {
         $gaugeWizard.prototype.newChart = function (parentDom) {
             this.dataObj = new $ChartItem(this.chartType);
             this.dataObj.ChartClassName = this.chartTypeName;
-            this.tmpdata = {
-                isGauge: true
-            };
+            this.tmpdata = createTmpData();
+            this.tmpdata.isGauge = true;
+
             var ethis = this;
             this.getColorSchemes().then(function (colorSchemes) {
                 ethis.tmpdata.colorSchemes = colorSchemes;

Site/fic/fic/js/chartManage/chartTypeWizard.js

@@ -124,12 +124,12 @@ if (typeof WeightUnitName !== 'object') {
 if (typeof AreaUnitName !== 'object') {
     var AreaUnitName = {
         '-1': ' ',
-        '100': GetLanguageByKey('LHBIS_FIC_CLIENT_WIZARD_CHARTWIZARDHELPER_Axxx', 'System setting'),
-        '0': GetLanguageByKey('LHBIS_FIC_CLIENT_WIZARD_CHARTWIZARDHELPER_Axxx', 'Square Meter'),
-        '1': GetLanguageByKey('LHBIS_FIC_CLIENT_WIZARD_CHARTWIZARDHELPER_Axxx', 'Square Kilometre'),
-        '2': GetLanguageByKey('LHBIS_FIC_CLIENT_WIZARD_CHARTWIZARDHELPER_Axxx', 'Hectare'),
-        '3': GetLanguageByKey('LHBIS_FIC_CLIENT_WIZARD_CHARTWIZARDHELPER_Axxx', 'Acre'),
-        '4': GetLanguageByKey('LHBIS_FIC_CLIENT_WIZARD_CHARTWIZARDHELPER_Axxx', 'Square Mile')
+        '100': GetLanguageByKey('LHBIS_FIC_CLIENT_WIZARD_CHARTWIZARDHELPER_A390', 'System setting'),
+        '0': GetLanguageByKey('LHBIS_FIC_CLIENT_WIZARD_CHARTWIZARDHELPER_A403', 'Square Meter'),
+        '1': GetLanguageByKey('LHBIS_FIC_CLIENT_WIZARD_CHARTWIZARDHELPER_A404', 'Square Kilometre'),
+        '2': GetLanguageByKey('LHBIS_FIC_CLIENT_WIZARD_CHARTWIZARDHELPER_A405', 'Hectare'),
+        '3': GetLanguageByKey('LHBIS_FIC_CLIENT_WIZARD_CHARTWIZARDHELPER_A406', 'Acre'),
+        '4': GetLanguageByKey('LHBIS_FIC_CLIENT_WIZARD_CHARTWIZARDHELPER_A407', 'Square Mile')
     };
 }
 
@@ -888,6 +888,7 @@ if (typeof $AlertMessageItem !== 'function') {
                     _this.SecretType = e.Result.SecretType;
                     _this.SendCreateTime = e.Result.SendCreateTime;
                     _this.SingleSend = e.Result.SingleSend;
+                    _this.SendLimit = e.Result.SendLimit;
                 }
             }, undefined, undefined, true);
         };
@@ -2420,7 +2421,8 @@ var $previewButton = $wizardButton.extend();
             }
             _this.wizardCtrl.HideProgressBar();
             //console.log(_this.wizardCtrl.dataObj);
-            var wnd = window.parent;
+            
+            var wnd = $.getParentParamForChart();
             $(wnd).on('mousedown.preview', onmousedown);
             var mask = $('<div class="form-maskbg" style="z-index: 700"></div>').appendTo($(wnd.document.body));
             var chart = new $chart();
@@ -2432,6 +2434,9 @@ var $previewButton = $wizardButton.extend();
             chart.ispivotpinned = true;
             chart.frozen = true;
             chart.displayRefreshTime = false;
+            if (_this.wizardCtrl.dataObj.ChartSortType == null) {
+                _this.wizardCtrl.dataObj.ChartSortType = 0;
+            }
             var obj = {
                 ID: _this.wizardCtrl.dataObj.IID,
                 PinnedBorder: true,

Site/fic/fic/js/chartManage/chartWizardOptions/D2XYPivotCtrl.js

@@ -328,7 +328,7 @@ if (typeof $D2XYPivotCtrlOption !== 'object') {
                 var y = this.convertTmpToY(ty, i, tmpkey, def);
                 if (isPie && this.wizardCtrl.dataObj.ChartSortType === 0) {
                     if (sorts != null) {
-                        if (i + 1 > sorts.length || sorts[i].SortField !== ty.Caption) {
+                        if (this.wizardCtrl.tmpdata.YS.length !== sorts.length || sorts[i].SortField !== ty.Caption) {
                             sorts = this.wizardCtrl.dataObj.Sorts = null;
                         }
                     }

Site/fic/fic/js/chartManage/chartWizardOptions/aggregatesCtrl.js

@@ -274,7 +274,7 @@ if (typeof $aggregatesCtrl !== 'function') {
                     Value: this.caption
                 });
                 var ethis = this;
-                langs.showOpen($(window.parent.document.body), vals, 100, function (lgs) {
+                langs.showOpen($.getParentDomForChart(), vals, 100, function (lgs) {
                     for (var i = 0; i < lgs.length; i++) {
                         var lgid = lgs[i].Key;
                         var lgval = lgs[i].Value;

Site/fic/fic/js/chartManage/chartWizardOptions/chartInformationCtrl.js

@@ -81,7 +81,7 @@ if (typeof $chartInformationCtrl !== 'object') {
                     var l = { Key: _utility.currentLang, Value: caption };
                     langs.push(l);
                 }
-                formlang.showOpen($(window.parent.document.body), langs, 100, SetLanguages, 800);
+                formlang.showOpen($.getParentDomForChart(), langs, 100, SetLanguages, 800);
             }).appendTo(div);
             //content.append("<div><input type='text' name='UICaption' maxlength='100' style='width:300px;' /><div>");
             
@@ -106,7 +106,7 @@ if (typeof $chartInformationCtrl !== 'object') {
                     var l = { Key: _utility.currentLang, Value: caption };
                     langs.push(l);
                 }
-                formlang.showOpen($(window.parent.document.body), langs, 250, SetLanguages, 800);
+                formlang.showOpen($.getParentDomForChart(), langs, 250, SetLanguages, 800);
             }).appendTo(div);
             //content.append("<div><input type='text' name='UITitle' maxlength='250' style='width:300px;' /><div>");
             content.append("<div style='margin-top:10px;'>" + GetLanguageByKey('LHBIS_FIC_CLIENT_FICCONTROLS_CHARTINFORMATIONCTRL_A004', 'Description') + "<div>");
@@ -130,7 +130,7 @@ if (typeof $chartInformationCtrl !== 'object') {
                     var l = { Key: _utility.currentLang, Value: caption };
                     langs.push(l);
                 }
-                formlang.showOpen($(window.parent.document.body), langs, 200, SetLanguages, 800);
+                formlang.showOpen($.getParentDomForChart(), langs, 200, SetLanguages, 800);
             }).appendTo(div);
             //content.append("<div><input type='text' name='UIDescription' maxlength='200' style='width:300px;' /><div>");
             content.append("<div style='margin-top:10px;'>" + GetLanguageByKey('LHBIS_FIC_CLIENT_FICCONTROLS_CHARTINFORMATIONCTRL_A005', 'Refresh Time(s)') + "<div>");

Site/fic/fic/js/chartManage/chartWizardOptions/drilldownCell.js

@@ -296,7 +296,7 @@ if (typeof $drilldownCellSetupCtrl !== "function") {
                     Key: _utility.currentLang,
                     Value: lastNode[itemKey]
                 });
-                langs.showOpen($(window.parent.document.body), vals, 100, function (lgs) {
+                langs.showOpen($.getParentDomForChart(), vals, 100, function (lgs) {
                     for (var i = 0; i < lgs.length; i++) {
                         var lgid = lgs[i].Key;
                         var lgval = lgs[i].Value;

Site/fic/fic/js/chartManage/chartWizardOptions/freeReportSetCells.js

@@ -587,7 +587,7 @@ if (typeof $freeReportSetCells !== 'object') {
                 Key: _utility.currentLang,
                 Value: cellObj.CellValue
             });
-            langs.showOpen($(window.parent.document.body), vals, 100, function (lgs) {
+            langs.showOpen($.getParentDomForChart(), vals, 100, function (lgs) {
                 for (var i = 0; i < lgs.length; i++) {
                     var lgid = lgs[i].Key;
                     var lgval = lgs[i].Value;

Site/fic/fic/js/chartManage/chartWizardOptions/frptSelectReportCtrl.js

@@ -223,7 +223,7 @@ if (typeof $frptSelectReportCtrl !== 'function') {
                         Key: _utility.currentLang,
                         Value: item[itemKey]
                     });
-                    langs.showOpen($(window.parent.document.body), vals, 100, function (lgs) {
+                    langs.showOpen($.getParentDomForChart(), vals, 100, function (lgs) {
                         for (var i = 0; i < lgs.length; i++) {
                             var lgid = lgs[i].Key;
                             var lgval = lgs[i].Value;

Site/fic/fic/js/chartManage/chartWizardOptions/frptSetPivot.js

@@ -357,7 +357,7 @@ if (typeof $frptSetPivot !== 'function') {
                                 Key: _utility.currentLang,
                                 Value: item.Caption
                             });
-                            langs.showOpen($(window.parent.document.body), vals, 100, function (lgs) {
+                            langs.showOpen($.getParentDomForChart(), vals, 100, function (lgs) {
                                 for (var i = 0; i < lgs.length; i++) {
                                     var lgid = lgs[i].Key;
                                     var lgval = lgs[i].Value;

Site/fic/fic/js/chartManage/chartWizardOptions/gaugeInformationCtrl.js

@@ -24,7 +24,7 @@ if (typeof $gaugeInformationCtrl !== 'object') {
         var dataSelect = dataGrid.dataselect;
         var colorColumn = {
             template: '<colorbox v-model="item[column.key]" :presets="presets" :window="wnd"' +
-                      ' style="height: 100%; width: 100%; border: none; line-height: 26px"></colorbox>',
+                ' style="height: 100%; width: 100%; border: none; line-height: 26px"></colorbox>',
             components: {
                 'colorbox': colorBox
             },
@@ -34,7 +34,7 @@ if (typeof $gaugeInformationCtrl !== 'object') {
             },
             data: function () {
                 return {
-                    wnd: window.parent
+                    wnd: $.getParentParamForChart()
                 }
             },
             computed: {
@@ -96,7 +96,7 @@ if (typeof $gaugeInformationCtrl !== 'object') {
                         'data-grid': dataGrid
                     },
                     data: {
-                        wnd: window.parent,
+                        wnd: $.getParentParamForChart(),
                         editable: !ethis.wizardCtrl.tmpdata.IsThirdPackge,
                         presets: PRESETS.colorPresets(),
                         formats: formats,
@@ -157,7 +157,7 @@ if (typeof $gaugeInformationCtrl !== 'object') {
                     resolve(content);
 
                     //setTimeout(function () {
-                        ethis.vue.columnsValues = getValuesColumns.call(ethis, chartItem.GaugeValueSetting.Colors.length);
+                    ethis.vue.columnsValues = getValuesColumns.call(ethis, chartItem.GaugeValueSetting.Colors.length);
                     //}, 10);
                 });
             });

Site/fic/fic/js/chartManage/chartWizardOptions/pivotCtrl.js

@@ -473,8 +473,8 @@ if (typeof $pivotCtrl !== 'function') {
                     if (!item.IsHierarchyEnabled) {
                         item.IsHierarchy = false;
                     } else if (item.IsHierarchy) {
-                        item.IsInstantSearch = '0';
-                        item.InstantSearchEnable = false;
+                        //item.IsInstantSearch = '0';
+                        //item.InstantSearchEnable = false;
                     }
                 } else {
                     item.IsHierarchy = false;
@@ -522,7 +522,7 @@ if (typeof $pivotCtrl !== 'function') {
                         Key: _utility.currentLang,
                         Value: item[itemKey]
                     });
-                    langs.showOpen($(window.parent.document.body), vals, 100, function (lgs) {
+                    langs.showOpen($.getParentDomForChart(), vals, 100, function (lgs) {
                         for (var i = 0; i < lgs.length; i++) {
                             var lgid = lgs[i].Key;
                             var lgval = lgs[i].Value;
@@ -681,7 +681,7 @@ if (typeof $pivotCtrl !== 'function') {
                             item.MaxPivotValue = null;
                             item.MinPivotValue = null;
                             item.InstantSearchSource = item.UseDataSource ? instantSource.DataSource : instantSource.Normal;
-                            item.InstantSearchEnable = !item.IsHierarchy;
+                            item.InstantSearchEnable = true;//!item.IsHierarchy;
                         } else {
                             item.IsInstantSearch = '0';
                             item.InstantSearchEnable = false;
@@ -710,8 +710,8 @@ if (typeof $pivotCtrl !== 'function') {
                             }
                             item.InstantSearchSource = instantSource.DataSource;
                             if (item.IsHierarchy) {
-                                item.IsInstantSearch = '0';
-                                item.InstantSearchEnable = false;
+                                //item.IsInstantSearch = '0';
+                                //item.InstantSearchEnable = false;
                             } else {
                                 item.InstantSearchEnable = true;
                             }
@@ -830,7 +830,7 @@ if (typeof $pivotCtrl !== 'function') {
                 },
                 {
                     key: "UseTimeZone",
-                    caption: 'Offset Timestamp',
+                    caption: GetLanguageByKey('LHBIS_FIC_CLIENT_WIZARD_CHARTWIZARDHELPER_A416','Offset Timestamp'),
                     type: editable ? 2 : 0,
                     width: 200,
                     sortable: false,
@@ -839,8 +839,8 @@ if (typeof $pivotCtrl !== 'function') {
                     source: function () {
                         return [
                             { Key: '', Value: ' ' },
-                            { Key: '@OrganizationTimeZone@', Value: 'Organization Setting' },
-                            { Key: '@UserTimeZone@', Value: 'User Setting' }
+                            { Key: '@OrganizationTimeZone@', Value: GetLanguageByKey('LHBIS_FIC_CLIENT_WIZARD_CHARTWIZARDHELPER_A417', 'Organization Setting') },
+                            { Key: '@UserTimeZone@', Value: GetLanguageByKey('LHBIS_FIC_CLIENT_WIZARD_CHARTWIZARDHELPER_A418', 'User Setting') }
                         ].concat(ethis.wizardCtrl.tmpdata.timezones);
                     },
                     sourceKey: 'Key',
@@ -850,11 +850,14 @@ if (typeof $pivotCtrl !== 'function') {
                             case '@OrganizationTimeZone@': return 'Organization Setting';
                             case '@UserTimeZone@': return 'User Setting';
                         }
-                        var tz = ethis.wizardCtrl.tmpdata.timezones.filter(function (t) { return t.Key == item.UseTimeZone })[0];
-                        if (tz == null) {
-                            return '';
+                        if (ethis.wizardCtrl.tmpdata.timezones) {
+                            var tz = ethis.wizardCtrl.tmpdata.timezones.filter(function (t) { return t.Key == item.UseTimeZone })[0];
+                            if (tz == null) {
+                                return '';
+                            }
+                            return tz.Value;
                         }
-                        return tz.Value;
+                        return '';
                     },
                     enabled: function (item) {
                         var fieldType = GetFilterFiledType(item.Column, ethis.tmpobj.pivotFields, item.ParamDTIID);
@@ -937,8 +940,8 @@ if (typeof $pivotCtrl !== 'function') {
                     enabled: 'IsHierarchyEnabled',
                     onchanged: function (item) {
                         if (item.IsHierarchy) {
-                            item.IsInstantSearch = '0';
-                            item.InstantSearchEnable = false;
+                            //item.IsInstantSearch = '0';
+                            //item.InstantSearchEnable = false;
                         } else {
                             item.InstantSearchEnable = true;
                         }

Site/fic/fic/js/chartManage/chartWizardOptions/selectDTOption.js

@@ -21,7 +21,7 @@ if (typeof $selectDTOption !== 'object') {
     (function () {
         'use strict';
 
-        var GridView = window.GridView || window['g5-gridview'];
+        var GridView = window['g5-gridview'];
 
         $selectDTOption.prototype.text = GetLanguageByKey('LHBIS_FIC_CLIENT_MODULES_DATATABLEWIZARD_A054', 'Select Data Table');
 

Site/fic/fic/js/chartManage/chartWizardOptions/setupFavoriteUrlCtrl.js

@@ -31,7 +31,7 @@ if (typeof $setupfavoritUrlCtrl !== 'object') {
             this.wizardCtrl.CreateTitleInfo();
             this._content = _content;
 
-            _content.load(window.sitePath + 'fic/Template/ChartWizard/setupFavoriteUrlCtrl.html?v=2', function () {
+            _content.load(window.sitePath + 'fic/Template/ChartWizard/setupFavoriteUrlCtrl.html?v=3', function () {
                 _content.applyLanguageText();
 
                 //初始化下拉列表备选值

Site/fic/fic/js/chartManage/chartWizardOptions/shapeAndColorSetting.js

@@ -39,7 +39,7 @@ if (typeof $shapeAndColor !== 'function') {
             },
             data: function () {
                 return {
-                    wnd: window.parent
+                    wnd: $.getParentParamForChart()
                 }
             },
             computed: {
@@ -183,7 +183,7 @@ if (typeof $shapeAndColor !== 'function') {
                         'color-box': colorBox
                     },
                     data: {
-                        wnd: window.parent,
+                        wnd: $.getParentParamForChart(),
                         editable: !ethis.wizardCtrl.tmpdata.IsThirdPackge,
                         presets: colorPreset,
                         shapes: shapes,

Site/fic/fic/js/chartManage/chartWizardOptions/subscribetoAMessageCtrl.js

@@ -271,7 +271,7 @@ if (typeof $subscribetoamessageCtrl !== 'object') {
                     wizard.callBack = function () {
                         _this.getSubMsgData();
                     }
-                    wizard.add($(window.parent.document.body));
+                    wizard.add($.getParentDomForChart());
                 });
             _content.find("#bteditmessage")
                 .click(function() {
@@ -279,7 +279,7 @@ if (typeof $subscribetoamessageCtrl !== 'object') {
                     wizard.callBack = function() {
                         _this.getSubMsgData();
                     }
-                    wizard.edit($(window.parent.document.body), _this.selectIID, _this.selectLevelNumber);
+                    wizard.edit($.getParentDomForChart(), _this.selectIID, _this.selectLevelNumber);
                 });
 
             if (!_this.wizardCtrl.tmpdata.IsThirdPackge) {

Site/fic/fic/js/chartManage/chartWizardOptions/xCtrl.js

@@ -316,7 +316,7 @@ if (typeof $xCtrl2 !== 'function') {
                         Key: _utility.currentLang,
                         Value: item[itemKey]
                     });
-                    langs.showOpen($(window.parent.document.body), vals, 100, function (lgs) {
+                    langs.showOpen($.getParentDomForChart(), vals, 100, function (lgs) {
                         for (var i = 0; i < lgs.length; i++) {
                             var lgid = lgs[i].Key;
                             var lgval = lgs[i].Value;
@@ -542,7 +542,7 @@ if (typeof $xCtrl2 !== 'function') {
                 },
                 {
                     key: "UseTimeZone",
-                    caption: 'Offset Timestamp',
+                    caption: GetLanguageByKey('LHBIS_FIC_CLIENT_WIZARD_CHARTWIZARDHELPER_A416', 'Offset Timestamp'),
                     type: editable ? 2 : 0,
                     width: 200,
                     sortable: false,
@@ -551,22 +551,25 @@ if (typeof $xCtrl2 !== 'function') {
                     source: function () {
                         return [
                             { Key: '', Value: ' ' },
-                            { Key: '@OrganizationTimeZone@', Value: 'Organization Setting' },
-                            { Key: '@UserTimeZone@', Value: 'User Setting' }
+                            { Key: '@OrganizationTimeZone@', Value: GetLanguageByKey('LHBIS_FIC_CLIENT_WIZARD_CHARTWIZARDHELPER_A417', 'Organization Setting') },
+                            { Key: '@UserTimeZone@', Value: GetLanguageByKey('LHBIS_FIC_CLIENT_WIZARD_CHARTWIZARDHELPER_A418', 'User Setting') }
                         ].concat(ethis.wizardCtrl.tmpdata.timezones);
                     },
                     sourceKey: 'Key',
                     sourceText: 'Value',
                     filter: function (item) {
                         switch (item.UseTimeZone) {
-                            case '@OrganizationTimeZone@': return 'Organization Setting';
-                            case '@UserTimeZone@': return 'User Setting';
+                            case '@OrganizationTimeZone@': return GetLanguageByKey('LHBIS_FIC_CLIENT_WIZARD_CHARTWIZARDHELPER_A417', 'Organization Setting');
+                            case '@UserTimeZone@': return GetLanguageByKey('LHBIS_FIC_CLIENT_WIZARD_CHARTWIZARDHELPER_A418', 'User Setting');
                         }
-                        var tz = ethis.wizardCtrl.tmpdata.timezones.filter(function (t) { return t.Key == item.UseTimeZone })[0];
-                        if (tz == null) {
-                            return '';
+                        if (ethis.wizardCtrl.tmpdata.timezones) {
+                            var tz = ethis.wizardCtrl.tmpdata.timezones.filter(function (t) { return t.Key == item.UseTimeZone })[0];
+                            if (tz == null) {
+                                return '';
+                            }
+                            return tz.Value;
                         }
-                        return tz.Value;
+                        return '';
                     },
                     enabled: function (item) {
                         var fieldType = GetFilterFiledType(item.Column, ethis.wizardCtrl.tmpdata.xFields);

Site/fic/fic/js/chartManage/chartWizardOptions/yCtrl.js

@@ -201,7 +201,7 @@ if (typeof $yCtrl2 !== 'function') {
             }
 
             //加载子页面模版
-            parentDom.load(window.sitePath + 'fic/Template/ChartWizard/YCtrl.html?v=31', function () {
+            parentDom.load(window.sitePath + 'fic/Template/ChartWizard/YCtrl.html?v=32', function () {
                 parentDom.applyLanguageText();
 
                 var dataGrid = window['g5-datagrid'];
@@ -406,7 +406,7 @@ if (typeof $yCtrl2 !== 'function') {
                                 Value: dataObj[itemKey]
                             });
                             var ethis = this;
-                            langs.showOpen($(window.parent.document.body), vals, 100, function (lgs) {
+                            langs.showOpen($.getParentDomForChart(), vals, 100, function (lgs) {
                                 for (var i = 0; i < lgs.length; i++) {
                                     var lgid = lgs[i].Key;
                                     var lgval = lgs[i].Value;
@@ -477,7 +477,7 @@ if (typeof $yCtrl2 !== 'function') {
                         Key: _utility.currentLang,
                         Value: item[itemKey]
                     });
-                    langs.showOpen($(window.parent.document.body), vals, 100, function (lgs) {
+                    langs.showOpen($.getParentDomForChart(), vals, 100, function (lgs) {
                         for (var i = 0; i < lgs.length; i++) {
                             var lgid = lgs[i].Key;
                             var lgval = lgs[i].Value;
@@ -1251,7 +1251,7 @@ if (typeof $yCtrl2 !== 'function') {
                 },
                 {
                     key: "UseTimeZone",
-                    caption: 'Offset Timestamp',
+                    caption: GetLanguageByKey('LHBIS_FIC_CLIENT_WIZARD_CHARTWIZARDHELPER_A416', 'Offset Timestamp'),
                     type: editable ? 2 : 0,
                     visible: ethis.wizardCtrl.dataObj.ChartClassIID === ChartTypeEnum.ListChart,
                     width: 200,
@@ -1261,22 +1261,25 @@ if (typeof $yCtrl2 !== 'function') {
                     source: function () {
                         return [
                             { Key: '', Value: ' ' },
-                            { Key: '@OrganizationTimeZone@', Value: 'Organization Setting' },
-                            { Key: '@UserTimeZone@', Value: 'User Setting' }
+                            { Key: '@OrganizationTimeZone@', Value: GetLanguageByKey('LHBIS_FIC_CLIENT_WIZARD_CHARTWIZARDHELPER_A417', 'Organization Setting') },
+                            { Key: '@UserTimeZone@', Value: GetLanguageByKey('LHBIS_FIC_CLIENT_WIZARD_CHARTWIZARDHELPER_A418', 'User Setting') }
                         ].concat(ethis.wizardCtrl.tmpdata.timezones);
                     },
                     sourceKey: 'Key',
                     sourceText: 'Value',
                     filter: function (item) {
                         switch (item.UseTimeZone) {
-                            case '@OrganizationTimeZone@': return 'Organization Setting';
-                            case '@UserTimeZone@': return 'User Setting';
+                            case '@OrganizationTimeZone@': return GetLanguageByKey('LHBIS_FIC_CLIENT_WIZARD_CHARTWIZARDHELPER_A417', 'Organization Setting');
+                            case '@UserTimeZone@': return GetLanguageByKey('LHBIS_FIC_CLIENT_WIZARD_CHARTWIZARDHELPER_A418', 'User Setting');
                         }
-                        var tz = ethis.wizardCtrl.tmpdata.timezones.filter(function (t) { return t.Key == item.UseTimeZone })[0];
-                        if (tz == null) {
-                            return '';
+                        if (ethis.wizardCtrl.tmpdata.timezones) {
+                            var tz = ethis.wizardCtrl.tmpdata.timezones.filter(function (t) { return t.Key == item.UseTimeZone })[0];
+                            if (tz == null) {
+                                return '';
+                            }
+                            return tz.Value;
                         }
-                        return tz.Value;
+                        return '';
                     },
                     enabled: function (item) {
                         var fieldType = GetFilterFiledType(item.Expression, ethis.tmpobj.yFields);
@@ -1550,7 +1553,7 @@ if (typeof $yCtrl2 !== 'function') {
                     onclick: function (e, item) {
                         var formlang = new $columncolorform();
 
-                        formlang.showOpen($(window.parent.document.body), item.ColumnColorValue, ethis, item.IID, 100, SetColumnColorValue, 800);
+                        formlang.showOpen($.getParentDomForChart(), item.ColumnColorValue, ethis, item.IID, 100, SetColumnColorValue, 800);
                     }
                 },
                 {

Site/fic/fic/js/chartManage/chartWizardOptions/zCtrl.js

@@ -184,7 +184,7 @@ if (typeof $zCtrl !== 'function') {
                         Key: _utility.currentLang,
                         Value: item[itemKey]
                     });
-                    langs.showOpen($(window.parent.document.body), vals, 100, function (lgs) {
+                    langs.showOpen($.getParentDomForChart(), vals, 100, function (lgs) {
                         for (var i = 0; i < lgs.length; i++) {
                             var lgid = lgs[i].Key;
                             var lgval = lgs[i].Value;
@@ -372,7 +372,7 @@ if (typeof $zCtrl !== 'function') {
                 },
                 {
                     key: "UseTimeZone",
-                    caption: 'Offset Timestamp',
+                    caption: GetLanguageByKey('LHBIS_FIC_CLIENT_WIZARD_CHARTWIZARDHELPER_A416', 'Offset Timestamp'),
                     type: editable ? 2 : 0,
                     width: 200,
                     sortable: false,
@@ -381,16 +381,16 @@ if (typeof $zCtrl !== 'function') {
                     source: function () {
                         return [
                             { Key: '', Value: ' ' },
-                            { Key: '@OrganizationTimeZone@', Value: 'Organization Setting' },
-                            { Key: '@UserTimeZone@', Value: 'User Setting' }
+                            { Key: '@OrganizationTimeZone@', Value: GetLanguageByKey('LHBIS_FIC_CLIENT_WIZARD_CHARTWIZARDHELPER_A417', 'Organization Setting') },
+                            { Key: '@UserTimeZone@', Value: GetLanguageByKey('LHBIS_FIC_CLIENT_WIZARD_CHARTWIZARDHELPER_A418', 'User Setting') }
                         ].concat(ethis.wizardCtrl.tmpdata.timezones);
                     },
                     sourceKey: 'Key',
                     sourceText: 'Value',
                     filter: function (item) {
                         switch (item.UseTimeZone) {
-                            case '@OrganizationTimeZone@': return 'Organization Setting';
-                            case '@UserTimeZone@': return 'User Setting';
+                            case '@OrganizationTimeZone@': return GetLanguageByKey('LHBIS_FIC_CLIENT_WIZARD_CHARTWIZARDHELPER_A417', 'Organization Setting');
+                            case '@UserTimeZone@': return GetLanguageByKey('LHBIS_FIC_CLIENT_WIZARD_CHARTWIZARDHELPER_A418', 'User Setting');
                         }
                         var tz = ethis.wizardCtrl.tmpdata.timezones.filter(function (t) { return t.Key == item.UseTimeZone })[0];
                         if (tz == null) {

Site/fic/fic/js/charts/graph.js

@@ -345,6 +345,8 @@ $graph = function (container, chartInfo) {
     this.SelY = undefined;
     this.xAxisAngle = 0;//chartInfo.DisplayXWithInclinedValue;
     this.startZero = false;//chartInfo.StarZero;
+    this.displayDataPoints = true;
+    this.displayIndividualValues = false;
     this.data = null;
     this.isRendered = false;
     this.intX = -1;
@@ -370,6 +372,8 @@ $graph = function (container, chartInfo) {
         this.title = title;
         this.xAxisAngle = data.DisplayXWithInclinedValue;
         this.startZero = data.StarZero;
+        this.displayDataPoints = data.DisplayDataPoints;
+        this.displayIndividualValues = data.DisplayIndividualValues;
         //this.Z = this.data.Z;
         this.SelY = this.getSelectedY();
         this.XAxisFormat = convertToJsFormat(data.XAxisFormat);
@@ -609,7 +613,47 @@ $graph = function (container, chartInfo) {
     this.setStartZero = function (startZero) {
         this.startZero = startZero;
         //this.chart.render();
-        this.chart.setOption({ yAxis: [{ scale: !startZero }, { scale: !startZero }] });
+        var ss = [];
+        for (var i = 0; i < this.options.yAxis.length; i++) {
+            var y = this.options.yAxis[i];
+            y.scale = !startZero;
+            ss.push({ scale: !startZero });
+        }
+        this.chart.setOption({ yAxis: ss });
+    }
+
+    this.setDataPoints = function (dataPoints) {
+        this.displayDataPoints = dataPoints;
+        //this.chart.render();
+        var ss = [];
+        for (var i = 0; i < this.options.series.length; i++) {
+            var s = this.options.series[i];
+            if (s.type === 'line') {
+                s.symbolSize = dataPoints ? 8 : 2;
+                ss.push({ symbolSize: dataPoints ? 8 : 2 });
+            }
+            else {
+                ss.push({ type: s.type });
+            }
+        }
+        this.chart.setOption({ series: ss });
+    }
+
+    this.setIndividualValues = function (individualValues) {
+        this.displayIndividualValues = individualValues;
+        //this.chart.render();
+        var ss = [];
+        for (var i = 0; i < this.options.series.length; i++) {
+            var s = this.options.series[i];
+            if (s.type === 'bar') {
+                s.label.show = individualValues;
+                ss.push({ label: { show: individualValues } });
+            }
+            else {
+                ss.push({ type: s.type });
+            }
+        }
+        this.chart.setOption({ series: ss });
     }
 
     this.getSelectedY = function () {
@@ -628,6 +672,7 @@ $graph = function (container, chartInfo) {
         if (length === 1 && this.options.color != null && this.options.color.length > 0) {
             singleColor = true;
         }
+        var stackedColumnCount = 0;
         for (var i = 0; i < length; i++) {
             var serie = this.data.Series[i];
             var ds = {
@@ -642,16 +687,40 @@ $graph = function (container, chartInfo) {
                         return ps.seriesName + ': ' + ps.value[2] || ps.value[1];  // ps.encode.y[0]
                     }
                 },
-                label: {
-                    fontFamily: this.fontFamily,
-                    fontSize: this.indexLabelFontSize
-                },
                 itemStyle: {
                     opacity: serie.Visible ? 1 : 0
                 },
                 barGap: 0
             };
             //var isBar = false;
+            var labelOption = {
+                show: this.displayIndividualValues,
+                position: 'insideLeft',
+                formatter: length === 1 ? function (ps) {
+                    return ps.name + ': ' + ps.value[2] || ps.value[1];
+                } : function (ps) {
+                    return ps.seriesName + ': ' + ps.value[2] || ps.value[1];  // ps.encode.y[0]
+                },
+                fontFamily: this.fontFamily,
+                fontSize: this.indexLabelFontSize
+            };
+            if (ds.type !== 'bar') {
+                labelOption = {
+                    show: this.displayIndividualValues,
+                    position: 'insideBottom',
+                    distance: 10,
+                    align: 'left',
+                    verticalAlign: 'middle',
+                    rotate: 90,
+                    formatter: length === 1 ? function (ps) {
+                        return ps.name + ': ' + ps.value[2] || ps.value[1];
+                    } : function (ps) {
+                        return ps.seriesName + ': ' + ps.value[2] || ps.value[1];  // ps.encode.y[0]
+                    },
+                    fontFamily: this.fontFamily,
+                    fontSize: this.indexLabelFontSize
+                };
+            }
             ds.dimensions = ['x', 'y', 'text'];
             if (ds.type === 'bar') {
                 //isBar = true;
@@ -661,16 +730,26 @@ $graph = function (container, chartInfo) {
                 ds.encode = {
                     x: 'x',
                     y: 'y'
-                }
+                };
+                ds.label = labelOption;
             } else if (ds.type === 'column') {
                 ds.type = 'bar';
                 this.options.xAxis.type = 'category';
                 this.options.yAxis[0].type = 'value';
+                ds.label = labelOption;
             } else if (ds.type === 'stackedColumn') {
+                stackedColumnCount++;
                 ds.type = 'bar';
                 ds.stack = 'total';
                 this.options.xAxis.type = 'category';
                 this.options.yAxis[0].type = 'value';
+                if (stackedColumnCount % 2 !== 0) {
+                    labelOption.offset = [-1 * 10 * stackedColumnCount/2, 0];
+                } else {
+                    labelOption.offset = [10 * stackedColumnCount/2, 0];
+                }
+                //this.options.tooltip.trigger = 'axis';
+                ds.label = labelOption;
             } else {
                 if (ds.type === 'spline') {
                     ds.type = 'line';
@@ -678,7 +757,7 @@ $graph = function (container, chartInfo) {
                 }
                 if (ds.type === 'line') {
                     ds.symbol = 'circle';
-                    ds.symbolSize = 8;
+                    ds.symbolSize = this.displayDataPoints? 8 : 2;
                     this.options.legend.itemWidth = 8;
                     this.options.legend.itemHeight = 8;
                     this.options.legend.icon = 'circle';

Site/fic/fic/js/charts/grid.js

@@ -61,9 +61,9 @@ if (typeof $gridbase !== 'function') {
                 for (var i = 0; i < this.columns.length; i++) {
                     var sort = 0;
                     var c = this.columns[i];
-                    if (c.istotal) {
-                        continue;
-                    }
+                    //if (c.istotal) {
+                    //    continue;
+                    //}
                     if (i === this.sortIndex)
                         sort = this.sortDirection === 1 ? 1 : 2;
                     var width = c.autoResize ? -1 : c.width;
@@ -109,7 +109,7 @@ if (typeof $gridbase !== 'function') {
     });
 }
 
-var GridView = window.GridView || window['g5-gridview'];
+var GridView = window['g5-gridview'];
 
 function onGridResize() {
     var gridCtrl = this.gridCtrl;
@@ -173,7 +173,7 @@ function onGridResize() {
             }
         }
         if (this.chartobj && this.chartobj.scrollLeft != null) {
-            this.chartobj.chartDiv.find('div[class="data-grid"] .data-grid-body').scrollLeft(this.chartobj.scrollLeft);
+            this.chartobj.chartDiv.find('div[class="data-grid-old"] .data-grid-body').scrollLeft(this.chartobj.scrollLeft);
         }
     }
 }
@@ -211,6 +211,19 @@ if (typeof $grid !== 'function') {
 
             this.createGrid();
             //this.gridCtrl.headerChanged = this.chartData.HeaderChanged;
+            if (this.gridCtrl && this.chart && this.chart.gridColumnFilter) {
+                if (this.chart.gridColumnFilter.length > 0) {
+                    for (var i = 0; i < this.gridCtrl.columns.length; i++) {
+                        var cc = this.gridCtrl.columns[i];
+                        for (var j = 0; j < this.chart.gridColumnFilter.length; j++) {
+                            if (cc.key && cc.key === this.chart.gridColumnFilter[j].key) {
+                                cc.filterValues = this.chart.gridColumnFilter[j].fv;
+                                break;
+                            }
+                        }
+                    }
+                }
+            }
             if (this.chartData.TotalRow) {
                 var cs = this.gridCtrl.columns.filter(function (c) { return !c.istotal && c.ecolumn == null }).length;
                 if (this.chartData.TotalRow.Values != null && this.chartData.TotalRow.Values.length > cs) {
@@ -223,6 +236,7 @@ if (typeof $grid !== 'function') {
             }
             this.gridCtrl.source = this.chartData.Rows;
             this.gridCtrl.init();
+            this.gridCtrl.refreshGrid();
             this.titlebar = $('<div class="gridtitle"></div>').hide();
             if (this.titlebar) {
                 var title = this.getTitle();