xignzi006 发布系统代码

app_CRM/public/assets/json/data-dictionary.json

@@ -5876,6 +5876,7 @@
                 "text": "停用",
                 "data":"",
                 "codename":"Item_2",
+                "color": "rgba(255, 42, 0, 1)",
                 "value": "2",
                 
                 "disabled": false
@@ -5886,6 +5887,7 @@
                 "text": "可用",
                 "data":"",
                 "codename":"Item_1",
+                "color": "rgba(0, 255, 64, 1)",
                 "value": "1",
                 
                 "disabled": false

app_CRM/src/mock/codelist/codelist.ts

@@ -5884,6 +5884,7 @@ mock.onGet('./assets/json/data-dictionary.json').reply((config: any) => {
                 text: "停用",
                 "data":"",
                 "codename":"Item_2",
+                "color": "rgba(255, 42, 0, 1)",
                 value: "2",
                 
                 disabled: false,
@@ -5894,6 +5895,7 @@ mock.onGet('./assets/json/data-dictionary.json').reply((config: any) => {
                 text: "可用",
                 "data":"",
                 "codename":"Item_1",
+                "color": "rgba(0, 255, 64, 1)",
                 value: "1",
                 
                 disabled: false,

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

@@ -556,16 +556,28 @@ export class ConnectionByParentKeyBase extends GridViewBase {
         const deResParameters: any[] = [];
         const parameters: any[] = [
             { pathName: 'connections', parameterName: 'connection' },
-            { pathName: 'editview', parameterName: 'editview' },
         ];
         const _this: any = this;
-        const openIndexViewTab = (data: any) => {
-            const _data: any = { w: (new Date().getTime()) };
-            Object.assign(_data, data);
-            const routePath = this.$viewTool.buildUpRoutePath(this.$route, tempContext, deResParameters, parameters, args, _data);
-            this.$router.push(routePath);
+        const openDrawer = (view: any, data: any) => {
+            let container: Subject<any> = this.$appdrawer.openDrawer(view, tempContext, data);
+            container.subscribe((result: any) => {
+                if (!result || !Object.is(result.ret, 'OK')) {
+                    return;
+                }
+                if (!xData || !(xData.refresh instanceof Function)) {
+                    return;
+                }
+                xData.refresh(result.datas);
+            });
         }
-        openIndexViewTab(data);
+        const view: any = {
+            viewname: 'connection-edit-view', 
+            height: 0, 
+            width: 0,  
+            title: this.$t('entities.connection.views.editview.title'),
+            placement: 'DRAWER_RIGHT',
+        };
+        openDrawer(view, data);
     }
 
 
@@ -590,14 +602,28 @@ export class ConnectionByParentKeyBase extends GridViewBase {
         const deResParameters: any[] = [];
         const parameters: any[] = [
             { pathName: 'connections', parameterName: 'connection' },
-            { pathName: 'editview', parameterName: 'editview' },
         ];
         const _this: any = this;
-        const openIndexViewTab = (data: any) => {
-            const routePath = this.$viewTool.buildUpRoutePath(this.$route, tempContext, deResParameters, parameters, args, data);
-            this.$router.push(routePath);
-        }
-        openIndexViewTab(data);
+        const openDrawer = (view: any, data: any) => {
+            let container: Subject<any> = this.$appdrawer.openDrawer(view, tempContext, data);
+            container.subscribe((result: any) => {
+                if (!result || !Object.is(result.ret, 'OK')) {
+                    return;
+                }
+                if (!xData || !(xData.refresh instanceof Function)) {
+                    return;
+                }
+                xData.refresh(result.datas);
+            });
+        }
+        const view: any = {
+            viewname: 'connection-edit-view', 
+            height: 0, 
+            width: 0,  
+            title: this.$t('entities.connection.views.editview.title'),
+            placement: 'DRAWER_RIGHT',
+        };
+        openDrawer(view, data);
     }
 
 

app_CRM/src/widgets/account/data-panel-form/data-panel-form.less

@@ -3,7 +3,7 @@
 }
 
 .datapanel-style {
-    color:rgba(209, 196, 233, 1);font-size:16px;font-weight:bold
+    color:rgba(209, 196, 233, 1);font-size:20px;font-weight:bold
 }
 
 .datapanel-label-style {