chitanda 发布系统代码

app_CRM/CHANGELOG.md

-## 修复请参考主模板，目前于2020-06-14合并master。[链接](http://demo.ibizlab.cn/ibizr7pfstdtempl/ibizvuer7plus/blob/master/CHANGELOG.md)
+## 修复请参考主模板，目前于2020-07-12合并master。[链接](http://demo.ibizlab.cn/ibizr7pfstdtempl/ibizvuer7plus/blob/master/CHANGELOG.md)
 
-## 0.0.1-alpha.1「2020-06-14」
+## 0.0.1-alpha.1「2020-07-15」
 
 ### 功能新增
 
-> 首页支持视图界面样式「STYLE2」，右侧导航菜单 + 无导航分页路由模式。
+> 首页支持视图界面样式「STYLE2」，右侧导航菜单 + 无导航分页路由模式。
\ No newline at end of file
+>
+> 分页导航视图支持，DataPanel部件。
+>
+> 表单分组支持信息锚点
+> 
+> 表单项支持受控模式
+>
+> 编辑器「地址框（选择）」「数据选择」系列支持配置额外填充参数
+
+### 其他
+
+> 补充特殊配置[说明](https://www.yuque.com/docs/share/6c649a5e-3548-4c28-a523-8ab18821be47)
\ No newline at end of file

app_CRM/package.json

@@ -35,7 +35,7 @@
     "path-to-regexp": "^6.1.0",
     "qs": "^6.9.1",
     "rxjs": "^6.5.4",
-    "tinymce": "4.8.5",
+    "tinymce": "^5.4.1",
     "view-design": "^4.3.0",
     "vue": "^2.6.11",
     "vue-class-component": "^7.0.2",

app_CRM/public/assets/tinymce/skins/lightgray/ui/oxide-dark/content.mobile.css

+/**
+ * Copyright (c) Tiny Technologies, Inc. All rights reserved.
+ * Licensed under the LGPL or a commercial license.
+ * For LGPL see License.txt in the project root for license information.
+ * For commercial licenses see https://www.tiny.cloud/
+ */
+.tinymce-mobile-unfocused-selections .tinymce-mobile-unfocused-selection {
+  /* Note: this file is used inside the content, so isn't part of theming */
+  background-color: green;
+  display: inline-block;
+  opacity: 0.5;
+  position: absolute;
+}
+body {
+  -webkit-text-size-adjust: none;
+}
+body img {
+  /* this is related to the content margin */
+  max-width: 96vw;
+}
+body table img {
+  max-width: 95%;
+}
+body {
+  font-family: sans-serif;
+}
+table {
+  border-collapse: collapse;
+}

app_CRM/public/assets/tinymce/skins/lightgray/ui/oxide-dark/content.mobile.min.css

+/**
+ * Copyright (c) Tiny Technologies, Inc. All rights reserved.
+ * Licensed under the LGPL or a commercial license.
+ * For LGPL see License.txt in the project root for license information.
+ * For commercial licenses see https://www.tiny.cloud/
+ */
+.tinymce-mobile-unfocused-selections .tinymce-mobile-unfocused-selection{background-color:green;display:inline-block;opacity:.5;position:absolute}body{-webkit-text-size-adjust:none}body img{max-width:96vw}body table img{max-width:95%}body{font-family:sans-serif}table{border-collapse:collapse}

app_CRM/public/assets/tinymce/skins/lightgray/ui/oxide/content.mobile.css

+/**
+ * Copyright (c) Tiny Technologies, Inc. All rights reserved.
+ * Licensed under the LGPL or a commercial license.
+ * For LGPL see License.txt in the project root for license information.
+ * For commercial licenses see https://www.tiny.cloud/
+ */
+.tinymce-mobile-unfocused-selections .tinymce-mobile-unfocused-selection {
+  /* Note: this file is used inside the content, so isn't part of theming */
+  background-color: green;
+  display: inline-block;
+  opacity: 0.5;
+  position: absolute;
+}
+body {
+  -webkit-text-size-adjust: none;
+}
+body img {
+  /* this is related to the content margin */
+  max-width: 96vw;
+}
+body table img {
+  max-width: 95%;
+}
+body {
+  font-family: sans-serif;
+}
+table {
+  border-collapse: collapse;
+}

app_CRM/public/assets/tinymce/skins/lightgray/ui/oxide/content.mobile.min.css

+/**
+ * Copyright (c) Tiny Technologies, Inc. All rights reserved.
+ * Licensed under the LGPL or a commercial license.
+ * For LGPL see License.txt in the project root for license information.
+ * For commercial licenses see https://www.tiny.cloud/
+ */
+.tinymce-mobile-unfocused-selections .tinymce-mobile-unfocused-selection{background-color:green;display:inline-block;opacity:.5;position:absolute}body{-webkit-text-size-adjust:none}body img{max-width:96vw}body table img{max-width:95%}body{font-family:sans-serif}table{border-collapse:collapse}

app_CRM/src/components/app-rich-text-editor/app-rich-text-editor.vue

@@ -8,7 +8,8 @@ import { Environment } from '@/environments/environment';
 import axios from 'axios';
 
 import tinymce from "tinymce/tinymce";
-import 'tinymce/themes/modern';
+// import 'tinymce/themes/modern';
+import 'tinymce/themes/silver';
 import 'tinymce/plugins/link';
 import 'tinymce/plugins/paste';
 import 'tinymce/plugins/table';
@@ -18,6 +19,7 @@ import 'tinymce/plugins/codesample';
 import 'tinymce/plugins/code';
 import 'tinymce/plugins/fullscreen';
 import 'tinymce/plugins/preview';
+import 'tinymce/icons/default/icons.min.js';
 
 const tinymceCode:any = tinymce;
 
@@ -290,6 +292,7 @@ export default class AppRichTextEditor extends Vue {
             min_height: 400,
             branding: false,
             plugins: ['link', 'paste', 'table', 'image', 'codesample', 'code', 'fullscreen', 'preview'],
+            toolbar: 'undo redo | styleselect | bold italic | alignleft aligncenter alignright alignjustify | outdent indent | link image',
             codesample_languages: [
                 { text: 'HTML/XML', value: 'markup' },
                 { text: 'JavaScript', value: 'javascript' },
@@ -304,7 +307,7 @@ export default class AppRichTextEditor extends Vue {
             ],
             paste_data_images: true,
             codesample_content_css: 'assets/tinymce/prism.css',
-            skin_url: './assets/tinymce/skins/lightgray',
+            skin_url: './assets/tinymce/skins/lightgray/ui/oxide',
             language_url: './assets/tinymce/langs/' + richtexteditor.languMap[richtexteditor.langu] + '.js',
             language:richtexteditor.languMap[richtexteditor.langu],
             setup: (editor: any) => {

app_CRM/src/components/login/login.less

-.login{
-    display: -webkit-box;
-    display: -ms-flexbox;
-    display: flex;
-    -webkit-box-orient: vertical;
-    -webkit-box-direction: normal;
-    -ms-flex-direction: column;
-    flex-direction: column;
-    min-height: 100%;
-    background: #108cee;
-    > img{
-        width: 100vw;
-        height: 100vh;
-    }
+.ibiz-login {
+    height: 100vh;
+    width: 100vw;
 
-    &-con{
-        position: absolute;
-        left: 0;
-        right: 0;
-        top: 20%;
-        margin: auto;
-        width: 450px;
-        .ivu-card-head {
-            padding: 30px 0px 20px 0px;
-            border-bottom: 0px;
-            >p{
-                height: 30px;
-                line-height: 30px;
-                font-size: 20px;
-                color: #666666;
-                font-weight: 600;
-            }
+    .ivu-row.content {
+        height: 100%;
+
+        .ivu-col {
+            height: 100%;
         }
-        &-header{
-            font-size: 16px;
-            font-weight: 300;
-            text-align: center;
-            padding: 30px 0;
+
+        .left {
+            background-image: linear-gradient(0deg, #376be6 0%, #6470ef 100%);
+            color: #fff;
+            display: flex;
+            justify-content: center;
+            align-items: center;
+
+            .pattern-svg {
+                position: absolute;
+                overflow: hidden;
+                max-width: 100%;
+                top: 25%;
+                left: 10%;
+            }
+
+            .title {
+                width: 75%;
+                font-weight: bolder;
+                text-align: center;
+                font-family: "Inter", sans-serif;
+                font-size: 2.125rem;
+                padding-bottom: 3rem;
+            }
         }
-        .form-con{
-            padding: 0px 20px 0px 20px;
-            >i-button{
-                width: 170px;
-                height: 40px;
+
+        .right {
+            background-color: #f6f8fb;
+            padding: 48px 15px;
+            display: flex;
+            justify-content: center;
+
+            .login-wrapper {
+                width: 75%;
+                height: 100%;
             }
         }
-        .login-tip{
-            font-size: 10px;
-            text-align: center;
-            color: red;
-            height: 30px;
+
+        .ivu-layout {
+            margin: 48px 0px;
+            height: calc(100% - 96px);
+            background: transparent;
+
+            .ivu-layout-header {
+                background: transparent;
+                padding: 0;
+                display: flex;
+
+                img {
+                    height: 40px;
+                }
+
+                .title {
+                    font-size: 36px;
+                    display: inline-block;
+                    line-height: 40px;
+                    vertical-align: bottom;
+                    margin-left: 8px;
+                }
+            }
+
+            .ivu-layout-content {
+
+                h3 {
+                    font-family: "Inter", sans-serif;
+                    font-weight: 500;
+                    line-height: 1.3;
+                    color: #101f41;
+                    font-size: 1.625rem;
+                    margin-bottom: 25px;
+                }
+
+                .ivu-form {
+
+                    .ivu-form-item {
+                        margin-top: 30px;
+
+                        .ivu-input.ivu-input-default {
+                            font-size: 1rem;
+                            height: calc(3.25rem - 2px);
+                            padding: 0.75rem 1.25rem;
+                        }
+
+                    }
+
+                    .submit {
+
+                        .ivu-btn {
+                            color: #fff;
+                            background-color: #2d8cf0;
+                            border-color: #2d8cf0;
+                        }
+                    }
+                }
+
+                .forgot-password {
+                    text-align: right;
+                }
+
+                .external-account {
+
+                    .top-line {
+                        padding: 8px 0px 16px 0px;
+                        margin-bottom: 16px;
+                        text-align: center;
+
+                        hr {
+                            width: calc(100% - 30px);
+                            margin-left: 15px;
+                            position: absolute;
+                            top: 19px;
+                            z-index: 1;
+                        }
+
+                        small {
+                            position: absolute;
+                            background: #f6f8fb;
+                            z-index: 2;
+                            left: 50%;
+                            transform: translateX(-50%);
+                        }
+                    }
+
+                    .icons {
+                        margin-bottom: 8px;
+                        display: flex;
+                        justify-content: space-evenly;
+                        height: 54px;
+                        fill: #2d8cf0;
+                    }
+
+                    .bottom-line {
+                        margin-bottom: 8px;
+                        padding: 8px 0px 16px 0px;
+
+                        hr {
+                            width: calc(100% - 30px);
+                            margin-left: 15px;
+                        }
+                    }
+                }
+            }
+
+            .ivu-layout-footer {
+                background: transparent;
+                padding: 0;
+            }
         }
     }
-}
-
-.login_btn{
-    width: 175px;
-    height: 40px;
-    font-size: 18px;
-    font-family: MicrosoftYaHei;
-}
-.login_reset {
-    width: 175px;
-    height: 40px;
-    font-size: 18px;
-    font-family: MicrosoftYaHei;
-    float: right;
-}
-
-.form_tipinfo {
-    font-family: MicrosoftYaHei-Bold;
-    font-size: 14px;
-    font-weight: bold;
-    font-stretch: normal;
-    line-height: 24px;
-    letter-spacing: 0px;
-    color: #666666;
-}
-
-form_tipinfo_more {
-    font-family: MicrosoftYaHei;
-    font-size: 14px;
-    font-weight: normal;
-    letter-spacing: 0px;
-    color: #666666;
-}
-
-.log_footer {
-    display: block;
-    padding: 0 16px;
-    margin: 48px 0 24px;
-    text-align: center;
-    color: #212529;
-}
-
-.log_footer a {
-    color: white;
-    text-decoration: none;
-}
-
-.sign-btn {
-    display: inline-block;
-    cursor: pointer;
-    margin-left: 10px;
-}
-
-.wx-svg-container,
-.qq-svg-container {
-    display: inline-block;
-    width: 40px;
-    height: 40px;
-    line-height: 40px;
-    text-align: center;
-    padding-top: 1px;
-    border-radius: 4px;
-    margin-bottom: -20px;
-    margin-top: 10px;
 }
\ No newline at end of file

app_CRM/src/pages/base/central/router.ts

@@ -10378,7 +10378,7 @@ const router = new Router({
                 appService.navHistory.reset();
                 next();
             },
-            component: () => import('@components/login/login.vue'),
+            component: () => import('@components/login/login'),
         },
         {
             path: '/404',

app_CRM/src/pages/base/metric-grid-view/metric-grid-view-base.tsx

@@ -743,7 +743,7 @@ export class MetricGridViewBase extends GridViewBase {
     public NewRow(args: any[],contextJO?:any, params?: any, $event?: any, xData?: any,actionContext?:any,srfParentDeName?:string) {
         const _this: any = this;
         const data: any = {};
-        if (_this.newRow && _this.newRow instanceof Function) {
+        if (_this.hasOwnProperty('newRow') && _this.newRow instanceof Function) {
             _this.newRow([{ ...data }], params, $event, xData);
         } else if(xData.newRow && xData.newRow instanceof Function) {
             xData.newRow([{ ...data }], params, $event, xData);

app_CRM/src/pages/base/transaction-currency-grid-view/transaction-currency-grid-view-base.tsx

@@ -717,7 +717,7 @@ export class TransactionCurrencyGridViewBase extends GridViewBase {
     public NewRow(args: any[],contextJO?:any, params?: any, $event?: any, xData?: any,actionContext?:any,srfParentDeName?:string) {
         const _this: any = this;
         const data: any = {};
-        if (_this.newRow && _this.newRow instanceof Function) {
+        if (_this.hasOwnProperty('newRow') && _this.newRow instanceof Function) {
             _this.newRow([{ ...data }], params, $event, xData);
         } else if(xData.newRow && xData.newRow instanceof Function) {
             xData.newRow([{ ...data }], params, $event, xData);

app_CRM/src/pages/marketing/campaign-activity-by-parent-key/campaign-activity-by-parent-key-base.tsx

@@ -743,7 +743,7 @@ export class CampaignActivityByParentKeyBase extends GridViewBase {
     public NewRow(args: any[],contextJO?:any, params?: any, $event?: any, xData?: any,actionContext?:any,srfParentDeName?:string) {
         const _this: any = this;
         const data: any = {};
-        if (_this.newRow && _this.newRow instanceof Function) {
+        if (_this.hasOwnProperty('newRow') && _this.newRow instanceof Function) {
             _this.newRow([{ ...data }], params, $event, xData);
         } else if(xData.newRow && xData.newRow instanceof Function) {
             xData.newRow([{ ...data }], params, $event, xData);

app_CRM/src/pages/marketing/campaign-list-grid-view/campaign-list-grid-view-base.tsx

@@ -737,7 +737,7 @@ export class CampaignListGridViewBase extends GridViewBase {
     public NewRow(args: any[],contextJO?:any, params?: any, $event?: any, xData?: any,actionContext?:any,srfParentDeName?:string) {
         const _this: any = this;
         const data: any = {};
-        if (_this.newRow && _this.newRow instanceof Function) {
+        if (_this.hasOwnProperty('newRow') && _this.newRow instanceof Function) {
             _this.newRow([{ ...data }], params, $event, xData);
         } else if(xData.newRow && xData.newRow instanceof Function) {
             xData.newRow([{ ...data }], params, $event, xData);

app_CRM/src/pages/marketing/campaign-response-by-parent-key/campaign-response-by-parent-key-base.tsx

@@ -743,7 +743,7 @@ export class CampaignResponseByParentKeyBase extends GridViewBase {
     public NewRow(args: any[],contextJO?:any, params?: any, $event?: any, xData?: any,actionContext?:any,srfParentDeName?:string) {
         const _this: any = this;
         const data: any = {};
-        if (_this.newRow && _this.newRow instanceof Function) {
+        if (_this.hasOwnProperty('newRow') && _this.newRow instanceof Function) {
             _this.newRow([{ ...data }], params, $event, xData);
         } else if(xData.newRow && xData.newRow instanceof Function) {
             xData.newRow([{ ...data }], params, $event, xData);

app_CRM/src/pages/marketing/list-account-by-list/list-account-by-list-base.tsx

@@ -751,7 +751,7 @@ export class ListAccountByListBase extends GridViewBase {
     public NewRow(args: any[],contextJO?:any, params?: any, $event?: any, xData?: any,actionContext?:any,srfParentDeName?:string) {
         const _this: any = this;
         const data: any = {};
-        if (_this.newRow && _this.newRow instanceof Function) {
+        if (_this.hasOwnProperty('newRow') && _this.newRow instanceof Function) {
             _this.newRow([{ ...data }], params, $event, xData);
         } else if(xData.newRow && xData.newRow instanceof Function) {
             xData.newRow([{ ...data }], params, $event, xData);

app_CRM/src/pages/marketing/list-contact-grid-view/list-contact-grid-view-base.tsx

@@ -737,7 +737,7 @@ export class ListContactGridViewBase extends GridViewBase {
     public NewRow(args: any[],contextJO?:any, params?: any, $event?: any, xData?: any,actionContext?:any,srfParentDeName?:string) {
         const _this: any = this;
         const data: any = {};
-        if (_this.newRow && _this.newRow instanceof Function) {
+        if (_this.hasOwnProperty('newRow') && _this.newRow instanceof Function) {
             _this.newRow([{ ...data }], params, $event, xData);
         } else if(xData.newRow && xData.newRow instanceof Function) {
             xData.newRow([{ ...data }], params, $event, xData);

app_CRM/src/pages/marketing/list-lead-by-list/list-lead-by-list-base.tsx

@@ -718,7 +718,7 @@ export class ListLeadByListBase extends GridViewBase {
     public NewRow(args: any[],contextJO?:any, params?: any, $event?: any, xData?: any,actionContext?:any,srfParentDeName?:string) {
         const _this: any = this;
         const data: any = {};
-        if (_this.newRow && _this.newRow instanceof Function) {
+        if (_this.hasOwnProperty('newRow') && _this.newRow instanceof Function) {
             _this.newRow([{ ...data }], params, $event, xData);
         } else if(xData.newRow && xData.newRow instanceof Function) {
             xData.newRow([{ ...data }], params, $event, xData);

app_CRM/src/pages/runtime/connection-by-parent-key/connection-by-parent-key-base.tsx

@@ -743,7 +743,7 @@ export class ConnectionByParentKeyBase extends GridViewBase {
     public NewRow(args: any[],contextJO?:any, params?: any, $event?: any, xData?: any,actionContext?:any,srfParentDeName?:string) {
         const _this: any = this;
         const data: any = {};
-        if (_this.newRow && _this.newRow instanceof Function) {
+        if (_this.hasOwnProperty('newRow') && _this.newRow instanceof Function) {
             _this.newRow([{ ...data }], params, $event, xData);
         } else if(xData.newRow && xData.newRow instanceof Function) {
             xData.newRow([{ ...data }], params, $event, xData);

app_CRM/src/pages/runtime/connection-role-grid-view/connection-role-grid-view-base.tsx

@@ -717,7 +717,7 @@ export class ConnectionRoleGridViewBase extends GridViewBase {
     public NewRow(args: any[],contextJO?:any, params?: any, $event?: any, xData?: any,actionContext?:any,srfParentDeName?:string) {
         const _this: any = this;
         const data: any = {};
-        if (_this.newRow && _this.newRow instanceof Function) {
+        if (_this.hasOwnProperty('newRow') && _this.newRow instanceof Function) {
             _this.newRow([{ ...data }], params, $event, xData);
         } else if(xData.newRow && xData.newRow instanceof Function) {
             xData.newRow([{ ...data }], params, $event, xData);

app_CRM/src/pages/sales/opportunity-product-opp-opp-pro-grid-view/opportunity-product-opp-opp-pro-grid-view-base.tsx

@@ -727,7 +727,7 @@ export class OpportunityProductOpp_OppProGridViewBase extends GridViewBase {
     public NewRow(args: any[],contextJO?:any, params?: any, $event?: any, xData?: any,actionContext?:any,srfParentDeName?:string) {
         const _this: any = this;
         const data: any = {};
-        if (_this.newRow && _this.newRow instanceof Function) {
+        if (_this.hasOwnProperty('newRow') && _this.newRow instanceof Function) {
             _this.newRow([{ ...data }], params, $event, xData);
         } else if(xData.newRow && xData.newRow instanceof Function) {
             xData.newRow([{ ...data }], params, $event, xData);

app_CRM/src/pages/sales/quote-opp-qua-grid-view/quote-opp-qua-grid-view-base.tsx

@@ -727,7 +727,7 @@ export class QuoteOppQuaGridViewBase extends GridViewBase {
     public NewRow(args: any[],contextJO?:any, params?: any, $event?: any, xData?: any,actionContext?:any,srfParentDeName?:string) {
         const _this: any = this;
         const data: any = {};
-        if (_this.newRow && _this.newRow instanceof Function) {
+        if (_this.hasOwnProperty('newRow') && _this.newRow instanceof Function) {
             _this.newRow([{ ...data }], params, $event, xData);
         } else if(xData.newRow && xData.newRow instanceof Function) {
             xData.newRow([{ ...data }], params, $event, xData);

app_CRM/src/studio-core/components/user-info/user-info.less

 .ivu-dropdown.user-info-dropdown-menus {
+    height: 100%;
 
     >.ivu-dropdown-rel {
+        height: 100%;
 
         >.user-info {
-            width: 40px;
             height: 100%;
             display: flex;
             align-items: center;
             cursor: pointer;
         
-            >.user-head-sculpture {
-                width: 28px;
-                height: 28px;
-                border-radius: 50%;
-                border: 1px solid #8893a7;
-                font-size: 18px;
+            >.user-head {
+                height: 100%;
+                border-radius: 2px;
+                font-size: 20px;
                 font-weight: 900;
                 text-align: center;
+                padding: 0px 5px;
             }
         
             >span {
-                display: inline-block;
-                margin-left: 3px;
-                margin-top: 5px;
+                fill: var(--app-header-color);
+
+                svg {
+                    vertical-align: -5px;
+                }
             }
         }
+
+        >.user-info:hover {
+            background-color: var(--app-header-background-color-active);
+        }
     }
 }
\ No newline at end of file

app_CRM/src/studio-core/components/user-info/user-info.tsx

@@ -173,12 +173,15 @@ export class UserInfo extends Vue {
      * @memberof UserInfo
      */
     public render(): any {
+        const appData = this.$store.getters.getAppData();
         return <dropdown class="studio-dropdown user-info-dropdown-menus" placement="bottom-end" on-on-click={(name: string) => this.onSelect(name)}>
             <div class="user-info">
-                <div class="user-head-sculpture">埃</div>
                 <span>
-                    <img src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAQAAAAUCAYAAACqJ5zlAAAAN0lEQVQoU2PsmLzCk5Hh/0wGBgaG/wyM6Yydk5c/+s/AIAsSYGRgeIwpgKEFpBQZMJIhMIzcAQAhOjo7JEcKTQAAAABJRU5ErkJggg=="></img>
+                    <svg class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" width="32" height="32">
+                        <path d="M512 85.333333c235.52 0 426.666667 191.146667 426.666667 426.666667s-191.146667 426.666667-426.666667 426.666667S85.333333 747.52 85.333333 512 276.48 85.333333 512 85.333333z m0 85.333334c-188.373333 0-341.333333 152.96-341.333333 341.333333s152.96 341.333333 341.333333 341.333333 341.333333-152.96 341.333333-341.333333-152.96-341.333333-341.333333-341.333333z m0 597.333333c-84.010667 0-161.450667-34.858667-213.333333-93.098667 26.154667-39.68 121.941333-77.568 213.333333-77.568s187.178667 37.888 213.333333 77.568C673.450667 733.141333 596.010667 768 512 768z m0-469.333333c70.826667 0 128 57.173333 128 128s-57.173333 128-128 128-128-57.173333-128-128 57.173333-128 128-128z"></path>
+                    </svg>
                 </span>
+                <div class="user-head">{appData?.context?.srfloginname}</div>
             </div>
             <template slot="list">
                 <dropdownMenu>

app_CRM/src/studio-core/widgets/GridControllerBase.tsx

@@ -328,7 +328,7 @@ export class GridControllerBase extends MDControlBase {
      *
      * @param {string} name
      * @returns {boolean}
-     * @memberof ${srfclassname(ctrl.codeName)}${srfclassname(ctrl.getControlType()?lower_case)}Base
+     * @memberof GridControllerBase
      */
     public getColumnState(name: string): boolean {
         let column = this.allColumns.find((col: any) =>
@@ -342,7 +342,7 @@ export class GridControllerBase extends MDControlBase {
      *
      * @readonly
      * @type {boolean}
-     * @memberof ${srfclassname(ctrl.codeName)}${srfclassname(ctrl.getControlType()?lower_case)}Base
+     * @memberof GridControllerBase
      */
     get adaptiveState(): boolean {
         return !this.allColumns.find((column: any) => column.show && Object.is(column.util, 'STAR'));

app_CRM/src/widgets/contact/by-account-grid/by-account-grid.html

@@ -93,7 +93,7 @@
                               <i class='fa fa-check'></i>
                               
                             </a>
-                            <div slot='content'>{{$t('entities.contact.byaccount_grid.uiactions.setprimary')}}</div>
+                            <div slot='content'>{{$t('entities.contact.byaccount_grid.uiactions.contact_setprimary')}}</div>
                             </tooltip>
                         </div>
                     </template>

app_CRM/yarn.lock

@@ -12241,10 +12241,10 @@ tinycolor2@^1.4.1:
   resolved "https://registry.yarnpkg.com/tinycolor2/-/tinycolor2-1.4.1.tgz#f4fad333447bc0b07d4dc8e9209d8f39a8ac77e8"
   integrity sha1-9PrTM0R7wLB9TcjpIJ2POaisd+g=
 
-tinymce@4.8.5:
-  version "4.8.5"
-  resolved "https://registry.yarnpkg.com/tinymce/-/tinymce-4.8.5.tgz#a80ea66c4f90078bd93625b0f0914a4f774e0af3"
-  integrity sha512-1V6+PxP5Kp8H/Kuf+EOe6vyrtj1Dlj98q33DgiKGoGPTmbcQaVZWiT+lhqj8ICXKVLV3YxAieOJyJXai4SLHQg==
+tinymce@^5.4.1:
+  version "5.4.1"
+  resolved "https://registry.yarnpkg.com/tinymce/-/tinymce-5.4.1.tgz#4c101e78cbd22c148d6013f7c66eb0cb480723db"
+  integrity sha512-eUjwDVCTSHSnFfpzX5TjTHXsGj5gvPQwzo3RFDF374gfK5voHqcRGojvQnu4NtNW1BAb012/KW1tkXBbUrEveg==
 
 tinyqueue@^2.0.3:
   version "2.0.3"

businesscentral-app/businesscentral-app-crm/src/main/resources/application.yml

 spring:
   profiles:
-    include: sys , crm-prod
+    include: sys ,nacos, crm-prod
   application:
     name: ibizbusinesscentral-crm

businesscentral-boot/src/main/resources/application.yml

 spring:
   profiles:
-    include: sys , crm-dev,  centralapi-dev,  dev
+    include: sys ,nacos, crm-dev,  centralapi-dev,  dev
   application:
     name: ibizbusinesscentral
   main:

businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/scheduling/client/FISAccountFeignClient.java

@@ -16,7 +16,7 @@ import org.springframework.cloud.openfeign.FeignClient;
 /**
  * 实体[FISAccount] 服务对象接口
  */
-@FeignClient(value = "ibizprojectoperations-poejectoperationsapi", contextId = "FISAccount", fallback = FISAccountFallback.class)
+@FeignClient(value = "${ibiz.ref.service.ibizprojectoperations-poejectoperationsapi:ibizprojectoperations-poejectoperationsapi}", contextId = "FISAccount", fallback = FISAccountFallback.class)
 public interface FISAccountFeignClient {
 
     @RequestMapping(method = RequestMethod.GET, value = "/fisaccounts/select")

businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/scheduling/client/PSAccountFeignClient.java

@@ -16,7 +16,7 @@ import org.springframework.cloud.openfeign.FeignClient;
 /**
  * 实体[PSAccount] 服务对象接口
  */
-@FeignClient(value = "ibizprojectoperations-poejectoperationsapi", contextId = "PSAccount", fallback = PSAccountFallback.class)
+@FeignClient(value = "${ibiz.ref.service.ibizprojectoperations-poejectoperationsapi:ibizprojectoperations-poejectoperationsapi}", contextId = "PSAccount", fallback = PSAccountFallback.class)
 public interface PSAccountFeignClient {
 
     @RequestMapping(method = RequestMethod.GET, value = "/psaccounts/select")