Lind 3 лет назад
Родитель
Сommit
8f6fb894ef
4 измененных файлов с 12 добавлено и 7 удалено
  1. 1 1
      config/defaultSettings.ts
  2. 4 4
      config/proxy.ts
  3. 2 2
      package.json
  4. 5 0
      src/utils/typings.d.ts

+ 1 - 1
config/defaultSettings.ts

@@ -8,7 +8,7 @@ const Settings: LayoutSettings & {
   // 拂晓蓝
   // primaryColor: '#1890ff',
   // 极光绿
-  primaryColor: '#52C41A',
+  primaryColor: '#1d39c4',
   layout: 'mix',
   contentWidth: 'Fluid',
   splitMenus: true,

+ 4 - 4
config/proxy.ts

@@ -9,10 +9,10 @@
 export default {
   dev: {
     '/jetlinks': {
-      // target: 'http://192.168.23.223:8800/',
-      // ws: 'ws://192.168.23.223:8800/',
-      ws: 'ws://demo.jetlinks.cn/jetlinks',
-      target: 'http://demo.jetlinks.cn/jetlinks',
+      target: 'http://192.168.33.222:8844/',
+      ws: 'ws://192.168.33.222:8844/',
+      // ws: 'ws://demo.jetlinks.cn/jetlinks',
+      // target: 'http://demo.jetlinks.cn/jetlinks',
       changeOrigin: true,
       pathRewrite: { '^/jetlinks': '' },
     },

+ 2 - 2
package.json

@@ -28,7 +28,7 @@
     "openapi": "umi openapi",
     "precommit": "lint-staged",
     "prettier": "prettier -c --write \"src/**/*\"",
-    "start": "cross-env UMI_ENV=dev umi dev",
+    "start": "cross-env UMI_ENV=dev PORT=9000 umi dev",
     "start:dev": "cross-env REACT_APP_ENV=dev MOCK=none UMI_ENV=dev umi dev",
     "start:no-mock": "cross-env MOCK=none UMI_ENV=dev umi dev",
     "start:no-ui": "cross-env UMI_UI=none UMI_ENV=dev umi dev",
@@ -71,7 +71,7 @@
     "@formily/reactive-react": "2.0.0-rc.17",
     "@formily/shared": "2.0.0-rc.17",
     "@jetlinks/pro-list": "^1.10.8",
-    "@jetlinks/pro-table": "^2.43.7",
+    "@jetlinks/pro-table": "^2.43.8",
     "@umijs/route-utils": "^1.0.36",
     "ahooks": "^2.10.9",
     "antd": "^4.17.0-alpha.9",

+ 5 - 0
src/utils/typings.d.ts

@@ -20,3 +20,8 @@ type State = {
   value: string;
   text: string;
 };
+
+type EnumData = {
+  label: string;
+  value: string;
+};