Merge branch 'feature/new-sys' into 'release'

Feature/new sys

See merge request workbench/y-code!35

.env.production

@@ -2,7 +2,7 @@ VITE_NODE_ENV = prod
 
 VITE_OA_BASEURL = https://oa.shiyuegame.com
 
-# VITE_YCODE_BASEURL = https://custom-chart-api.shiyuegame.com
-VITE_YCODE_BASEURL = https://custom-chart-api.shiyuegame.com:19998
+VITE_YCODE_BASEURL = https://custom-chart-api.shiyuegame.com
+# VITE_YCODE_BASEURL = https://custom-chart-api.shiyuegame.com:19998
 
 VITE_YCODE_BASEURL_FRONT = https://custom-chart.shiyuegame.com

components.d.ts

@@ -18,6 +18,7 @@ declare module 'vue' {
     AFloatButton: typeof import('ant-design-vue/es')['FloatButton']
     AForm: typeof import('ant-design-vue/es')['Form']
     AFormItem: typeof import('ant-design-vue/es')['FormItem']
+    AImage: typeof import('ant-design-vue/es')['Image']
     AInput: typeof import('ant-design-vue/es')['Input']
     AInputNumber: typeof import('ant-design-vue/es')['InputNumber']
     AInputPassword: typeof import('ant-design-vue/es')['InputPassword']

src/views/config-manage/module-cfg/components/field-modal.vue

@@ -127,9 +127,13 @@
               >取消</a-button
               >
             </a-space>
-            <a-button v-else type="link" @click="handleEdit(record)"
-            >修改</a-button
-            >
+            <div v-else>
+              <a-button type="link" @click="handleEdit(record)">修改</a-button>
+              <a-popconfirm title="确定删除字段？" @confirm="handleDelete(record)">
+                <a-button type="link" danger>删除</a-button>
+              </a-popconfirm>
+            </div>
+            
           </template>
         </template>
       </a-table>
@@ -177,7 +181,7 @@ import {
   getFieldTypeSelect,
   getFieldNumSelect,
   getFieldList,
-  // deleteField,
+  deleteField,
   saveField,
   // getFieldDetail,
 } from "@/views/config-manage/module-cfg/service";
@@ -298,6 +302,15 @@ const handleEdit = (record) => {
   };
 };
 
+const handleDelete = (record) => {
+  deleteField({
+    field_id: record.field_id,
+  }).then(() => {
+    message.success('删除成功')
+    toGetList();
+  })
+}
+
 const handleCancel = (record) => {
   if (typeof record.field_id === "string") {
     dataList.value.shift();
@@ -382,4 +395,8 @@ const handleSave = (record) => {
 .pagination-box {
   text-align: center;
 }
+
+:deep(.@{ant-prefix}-btn) {
+  padding: 4px 8px;
+}
 </style>

src/views/config-manage/module-cfg/config.ts

@@ -20,7 +20,7 @@ export const viewCfgCols = [
   { dataIndex: 'is_other_database', title: '数据库特配', align: 'center'},
   { dataIndex: 'original_type', title: '数据源类型', align: 'center'},
   { dataIndex: 'original_sql', title: '数据源', align: 'center', width: 400},
-  { dataIndex: 'action', title: '操作', align: 'center'},
+  { dataIndex: 'action', title: '操作', align: 'center', width: 120},
 ];
 
 export const originalTypes = [