ap-dev 1.2.24 → 1.2.26

package/abap/components/SapTableField.vue

@@ -1,161 +1,161 @@
-<template>
-    <div class=" flex-col" v-loading="fieldTreeLoadingFlag" style="height: 100%">
-        <div class="flex-center">
-            <el-input placeholder="关键字过滤" v-model="fieldTreeFilterText" class="flex-1"></el-input>
-        </div>
-        <el-tree
-            class="flex-1"
-            style="overflow: auto;"
-            ref="fieldTreeRef"
-            node-key="fieldName"
-            :default-checked-keys="defaultCheckedKeys"
-            :data="fieldTreeData"
-            props="{children: 'children',label: 'fieldName'}"
-            :show-checkbox="opts.showCheckbox"
-            :default-expand-all="true"
-            :check-on-click-node="false"
-            :highlight-current="true"
-            :expand-on-click-node="false"
-            :check-strictly="false"
-            @check="opts.checkEvent"
-            :filter-node-method="filterTreeNode"
-            @node-click="opts.clickEvent">
-            <template slot-scope="{ node, data }">
-                <div style="width: 100%;">
-                    <div class="abap-tree-node-left ap-ellipse">
-                         <span style="font-size: 12px;">
-                             <span v-if="data.keyFlag == 'X'" style="color: #ffba00;">
-                                 <i class="el-icon-key"/></span>
-                            {{ data.fieldName }}
-                            <span v-if="data.fdType == 1" style="color: #13ce66;">
-                                <i class="el-icon-search"/>
-                            </span>
-                            <span v-if="data.fdType == 2" style="color: #3d76d3;">
-                                <i class="el-icon-tiaojian1"/>
-                            </span>
-                        </span>
-                    </div>
-                    <div class="flex-justify-start" style="font-size: 12px;">
-                        <span>
-                            <span v-if="data.fdDesc != null && data.fdDesc!=''" class="ap-color-green">
-                                {{ data.fdDesc }}
-                            </span>
-                            <span v-else>{{ data.text }}</span>
-                        </span>
-                    </div>
-                </div>
-            </template>
-        </el-tree>
-    </div>
-</template>
-
-<script>
-import {handleDefaultParams} from "ap-util/util/ObjectUtil";
-import {convertToTreeData} from "ap-util/util/DataUtil";
-
-export default {
-    name: 'AbapTableField',
-    props: {
-        options: {
-            type: Object,
-            required: true
-        },
-    },
-    data() {
-        return {
-            fieldTreeFilterText: "",
-            fieldTreeLoadingFlag: false,
-            fieldTreeData: [],
-            defaultCheckedKeys: [],
-            opts: {},
-        }
-    },
-    watch: {
-        opts: {
-            handler(value) {
-                // 深度监听，opts有修改，对应修改父组件options参数
-                this.$emit('update:options', this.opts);
-            },
-            deep: true
-        },
-        fieldTreeFilterText(val) {
-            this.$refs.fieldTreeRef.filter(val);
-        }
-    },
-    created() {
-        // 初始化组件前修改默认参数
-        this.opts = handleDefaultParams(this.options, {
-            selectedTable:"",
-            showCheckbox: false,
-            clickEvent() {
-            },
-            checkEvent(){
-
-            }
-        });
-    },
-    methods: {
-        // 字段树：配置
-        filterTreeNode(value, data) {
-            if (!value) return true;
-            if (data.fdDesc != null &&data.fdDesc.indexOf(value) !== -1) {
-                return true;
-            }
-            if (data.text != null &&data.text.indexOf(value) !== -1) {
-                return true;
-            }
-            if (data.fieldName != null &&data.fieldName.indexOf(value) !== -1) {
-                return true;
-            }
-            if (data.fdFunction != null &&data.fdFunction.indexOf(value) !== -1) {
-                return true;
-            }
-            return false;
-        },
-        loadFieldTreeData() {
-            this.fieldTreeLoadingFlag = true;
-            // 加载数据
-            this.$request({
-                url: "/apd/abap/AbapTable/getTableFieldTree",
-                method: 'post',
-                data: {
-                    tableName: this.opts.selectedTable
-                }
-            }).then(response => {
-                // 数据格式转换：数组 -> tree
-                this.fieldTreeData = convertToTreeData(response.data, {
-                    idKey: "fieldName",
-                    parentKey: "fdParentId",
-                    childrenKey: "children",
-                    label: "fieldName"
-                });
-            }).finally(() => {
-                this.fieldTreeLoadingFlag = false;
-            })
-        },
-        refresh(){
-            this.loadFieldTreeData();
-        },
-        getData(){
-            return this.fieldTreeData;
-        },
-        getCheckedKeys(){
-            return this.$refs.fieldTreeRef.getCheckedKeys()
-        },
-        setChecked(key, isCheck){
-            return this.$refs.fieldTreeRef.setChecked(key, isCheck, true)
-        },
-        setDefaultCheckKeys(keys){
-            this.defaultCheckedKeys = keys;
-        }
-    }
-}
-</script>
-
-<style scoped>
-.abap-tree-node-left {
-    font-size: 13px;
-    width: 50%;
-    float: left;
-}
-</style>
+<template>
+    <div class=" flex-col" v-loading="fieldTreeLoadingFlag" style="height: 100%">
+        <div class="flex-center">
+            <el-input placeholder="关键字过滤" v-model="fieldTreeFilterText" class="flex-1"></el-input>
+        </div>
+        <el-tree
+            class="flex-1"
+            style="overflow: auto;"
+            ref="fieldTreeRef"
+            node-key="fieldName"
+            :default-checked-keys="defaultCheckedKeys"
+            :data="fieldTreeData"
+            props="{children: 'children',label: 'fieldName'}"
+            :show-checkbox="opts.showCheckbox"
+            :default-expand-all="true"
+            :check-on-click-node="false"
+            :highlight-current="true"
+            :expand-on-click-node="false"
+            :check-strictly="false"
+            @check="opts.checkEvent"
+            :filter-node-method="filterTreeNode"
+            @node-click="opts.clickEvent">
+            <template slot-scope="{ node, data }">
+                <div style="width: 100%;">
+                    <div class="abap-tree-node-left ap-ellipse">
+                         <span style="font-size: 12px;">
+                             <span v-if="data.keyFlag == 'X'" style="color: #ffba00;">
+                                 <i class="el-icon-key"/></span>
+                            {{ data.fieldName }}
+                            <span v-if="data.fdType == 1" style="color: #13ce66;">
+                                <i class="el-icon-search"/>
+                            </span>
+                            <span v-if="data.fdType == 2" style="color: #3d76d3;">
+                                <i class="el-icon-tiaojian1"/>
+                            </span>
+                        </span>
+                    </div>
+                    <div class="flex-justify-start" style="font-size: 12px;">
+                        <span>
+                            <span v-if="data.fdDesc != null && data.fdDesc!=''" class="ap-color-green">
+                                {{ data.fdDesc }}
+                            </span>
+                            <span v-else>{{ data.text }}</span>
+                        </span>
+                    </div>
+                </div>
+            </template>
+        </el-tree>
+    </div>
+</template>
+
+<script>
+import {handleDefaultParams} from "ap-util/util/ObjectUtil";
+import {convertToTreeData} from "ap-util/util/DataUtil";
+
+export default {
+    name: 'AbapTableField',
+    props: {
+        options: {
+            type: Object,
+            required: true
+        },
+    },
+    data() {
+        return {
+            fieldTreeFilterText: "",
+            fieldTreeLoadingFlag: false,
+            fieldTreeData: [],
+            defaultCheckedKeys: [],
+            opts: {},
+        }
+    },
+    watch: {
+        opts: {
+            handler(value) {
+                // 深度监听，opts有修改，对应修改父组件options参数
+                this.$emit('update:options', this.opts);
+            },
+            deep: true
+        },
+        fieldTreeFilterText(val) {
+            this.$refs.fieldTreeRef.filter(val);
+        }
+    },
+    created() {
+        // 初始化组件前修改默认参数
+        this.opts = handleDefaultParams(this.options, {
+            selectedTable:"",
+            showCheckbox: false,
+            clickEvent() {
+            },
+            checkEvent(){
+
+            }
+        });
+    },
+    methods: {
+        // 字段树：配置
+        filterTreeNode(value, data) {
+            if (!value) return true;
+            if (data.fdDesc != null &&data.fdDesc.indexOf(value) !== -1) {
+                return true;
+            }
+            if (data.text != null &&data.text.indexOf(value) !== -1) {
+                return true;
+            }
+            if (data.fieldName != null &&data.fieldName.indexOf(value) !== -1) {
+                return true;
+            }
+            if (data.fdFunction != null &&data.fdFunction.indexOf(value) !== -1) {
+                return true;
+            }
+            return false;
+        },
+        loadFieldTreeData() {
+            this.fieldTreeLoadingFlag = true;
+            // 加载数据
+            this.$request({
+                url: "/apd/abap/AbapTable/getTableFieldTree",
+                method: 'post',
+                data: {
+                    tableName: this.opts.selectedTable
+                }
+            }).then(response => {
+                // 数据格式转换：数组 -> tree
+                this.fieldTreeData = convertToTreeData(response.data, {
+                    idKey: "fieldName",
+                    parentKey: "fdParentId",
+                    childrenKey: "children",
+                    label: "fieldName"
+                });
+            }).finally(() => {
+                this.fieldTreeLoadingFlag = false;
+            })
+        },
+        refresh(){
+            this.loadFieldTreeData();
+        },
+        getData(){
+            return this.fieldTreeData;
+        },
+        getCheckedKeys(){
+            return this.$refs.fieldTreeRef.getCheckedKeys()
+        },
+        setChecked(key, isCheck){
+            return this.$refs.fieldTreeRef.setChecked(key, isCheck, true)
+        },
+        setDefaultCheckKeys(keys){
+            this.defaultCheckedKeys = keys;
+        }
+    }
+}
+</script>
+
+<style scoped>
+.abap-tree-node-left {
+    font-size: 13px;
+    width: 50%;
+    float: left;
+}
+</style>

package/dev/ApiPanel/components/ApiCode.vue

@@ -24,4 +24,4 @@ export default {
     .api-memo {
         color: #9e9e9e;
     }
-</style>
+</style>

package/dev/ApiPanel/components/ApiContent.vue

@@ -14,4 +14,4 @@ export default {
     .api-content {
 
     }
-</style>
+</style>

package/dev/ApiPanel/components/ApiTable.vue

@@ -37,4 +37,4 @@ export default {
     .el-table /deep/ .api-table-cell {
         vertical-align: top
     }
-</style>
+</style>

package/dev/ApiPanel/components/ApiTittle1.vue

@@ -13,4 +13,4 @@ export default {
 </script>
 
 <style scoped>
-</style>
+</style>

package/dev/ApiPanel/components/ApiTittle2.vue

@@ -13,4 +13,4 @@ export default {
 </script>
 
 <style scoped>
-</style>
+</style>

package/dev/ApiPanel/components/index.js

@@ -2,4 +2,4 @@ export { default as ApiCode } from './ApiCode'
 export { default as ApiTittle1 } from './ApiTittle1'
 export { default as ApiTittle2 } from './ApiTittle2'
 export { default as ApiContent } from './ApiContent'
-export { default as ApiTable } from './ApiTable'
+export { default as ApiTable } from './ApiTable'

package/dev/ApiPanel/modules/ApiBaseLayout.vue

@@ -235,4 +235,4 @@ export default {
         padding: 5px;
         background-color: white;
     }
-</style>
+</style>

package/dev/BackgroundPanel/index.vue

@@ -273,6 +273,24 @@ export default {
                     tableSchema: selectedTable.tableSchema
                 })
             }
+
+            let tableSchema = tableList[0].tableSchema;
+            let javaPath = this.userConfig.fdJavaPath;
+            let projectName = javaPath.substring(javaPath.lastIndexOf('\\') + 1);
+            // 项目名和数据库不一致，警告
+            if (projectName.indexOf(tableSchema) > -1) {
+                this.getBackgroundCode(tableList);
+                return;
+            }
+            this.$confirm(`警告：项目【${projectName}】和数据库【${tableSchema}】不匹配！`, '提示', {
+                confirmButtonText: '确认生成',
+                cancelButtonText: '取消',
+                type: 'error'
+            }).then(() => {
+                this.getBackgroundCode(tableList);
+            });
+        },
+        getBackgroundCode(tableList) {
             this.$request({
                 url: '/apd/dev/DevGenerateCode/getBackgroundCode',
                 method: 'post',
@@ -293,6 +311,7 @@ export default {
                 this.createFile(this.userConfig.fdJavaHref, response.data)
             })
         }
+
     }
 }
 </script>

package/dev/ComponentsPanel/items/ApDevItemBase.vue

@@ -87,4 +87,4 @@ export default {
 
 <style scoped>
 
-</style>
+</style>

package/dev/ComponentsPanel/items/ApDevItemButton.vue

@@ -214,4 +214,4 @@ export default {
     }
   }
 }
-</script>
+</script>

package/dev/ComponentsPanel/items/ApDevItemChartBar.vue

@@ -186,4 +186,4 @@ export default {
     }
   }
 }
-</script>
+</script>

package/dev/ComponentsPanel/items/ApDevItemChartGauge.vue

@@ -154,4 +154,4 @@ export default {
     }
   }
 }
-</script>
+</script>

package/dev/ComponentsPanel/items/ApDevItemChartLine.vue

@@ -148,4 +148,4 @@ export default {
     }
   }
 }
-</script>
+</script>

package/dev/ComponentsPanel/items/ApDevItemChartPie.vue

@@ -199,4 +199,4 @@ export default {
     }
   }
 }
-</script>
+</script>

package/dev/ComponentsPanel/items/ApDevItemChartRadar.vue

@@ -162,4 +162,4 @@ export default {
     }
   }
 }
-</script>
+</script>

package/dev/ComponentsPanel/items/ApDevItemCheckbox.vue

@@ -166,4 +166,4 @@ export default {
     }
   }
 }
-</script>
+</script>

package/dev/ComponentsPanel/items/ApDevItemDateTime.vue

@@ -318,4 +318,4 @@ export default {
     }
   }
 }
-</script>
+</script>

package/dev/ComponentsPanel/items/ApDevItemForm.vue

@@ -291,4 +291,4 @@ export default {
     }
   }
 }
-</script>
+</script>

package/dev/ComponentsPanel/items/ApDevItemInput.vue

@@ -421,4 +421,4 @@ export default {
     }
   }
 }
-</script>
+</script>

package/dev/ComponentsPanel/items/ApDevItemInputNumber.vue

@@ -247,4 +247,4 @@ export default {
     }
   }
 }
-</script>
+</script>

package/dev/ComponentsPanel/items/ApDevItemLoading.vue

@@ -166,4 +166,4 @@ export default {
     }
   }
 }
-</script>
+</script>

package/dev/ComponentsPanel/items/ApDevItemRadio.vue

@@ -146,4 +146,4 @@ export default {
     }
   }
 }
-</script>
+</script>

package/dev/ComponentsPanel/items/ApDevItemSelect.vue

@@ -345,4 +345,4 @@ export default {
     }
   }
 }
-</script>
+</script>

package/dev/ComponentsPanel/items/ApDevItemSwitch.vue

@@ -236,4 +236,4 @@ export default {
     }
   }
 }
-</script>
+</script>

package/dev/ComponentsPanel/items/ApDevItemTooltip.vue

@@ -198,4 +198,4 @@ export default {
     }
   }
 }
-</script>
+</script>

package/dev/ComponentsPanel/items/ApDevItemTree.vue

@@ -424,4 +424,4 @@ export default {
     }
   }
 }
-</script>
+</script>

package/dev/ComponentsPanel/items/ApDevItemUpload.vue

@@ -374,4 +374,4 @@ export default {
     }
   }
 }
-</script>
+</script>

package/dev/ComponentsPanel/items/test.vue

@@ -12,4 +12,4 @@ export default {
 
 <style scoped>
 
-</style>
+</style>