Merge remote-tracking branch 'origin/leng_dev' into leng_dev

pigx-config/src/main/resources/config/pigx-upms-biz-dev.yml

@@ -45,4 +45,5 @@ pigx:
       - sys_log
       - sys_social_details
       - sys_dict
+      - sys_dict_item
       - sys_log

pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/SysSocialDetailsController.java

@@ -26,6 +26,7 @@ import com.pig4cloud.pigx.common.log.annotation.SysLog;
 import com.pig4cloud.pigx.common.security.annotation.Inner;
 import io.swagger.annotations.Api;
 import lombok.AllArgsConstructor;
+import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
@@ -77,6 +78,7 @@ public class SysSocialDetailsController {
 	 */
 	@SysLog("保存三方信息")
 	@PostMapping
+	@PreAuthorize("@pms.hasPermission('sys_social_details_add')")
 	public R save(@Valid @RequestBody SysSocialDetails sysSocialDetails) {
 		return new R<>(sysSocialDetailsService.save(sysSocialDetails));
 	}
@@ -89,6 +91,7 @@ public class SysSocialDetailsController {
 	 */
 	@SysLog("修改三方信息")
 	@PutMapping
+	@PreAuthorize("@pms.hasPermission('sys_social_details_edit')")
 	public R updateById(@Valid @RequestBody SysSocialDetails sysSocialDetails) {
 		sysSocialDetailsService.updateById(sysSocialDetails);
 		return new R<>(Boolean.TRUE);
@@ -102,6 +105,7 @@ public class SysSocialDetailsController {
 	 */
 	@SysLog("删除三方信息")
 	@DeleteMapping("/{id}")
+	@PreAuthorize("@pms.hasPermission('sys_social_details_del')")
 	public R removeById(@PathVariable Integer id) {
 		return new R<>(sysSocialDetailsService.removeById(id));
 	}

pigx-visual/pigx-codegen/src/main/resources/template/crud.js.vm

@@ -22,9 +22,6 @@ export const tableOption = {
   stripe: true,
   menuAlign: 'center',
   align: 'center',
-  editBtn: false,
-  delBtn: false,
-  addBtn: false,
   column: [
 #foreach ($column in $columns)
 	  {

pigx-visual/pigx-codegen/src/main/resources/template/index.vue.vm

@@ -34,9 +34,19 @@
 </template>
 
 <script>
-    import {addObj, delObj, fetchList, getObj, putObj} from '@/api/'
-    import {tableOption} from '@/const/crud/'
-    import {mapGetters} from 'vuex'
+    import {
+        fetchList,
+        getObj,
+        addObj,
+        putObj,
+        delObj
+    } from '@/api/${pathName}'
+    import {
+        tableOption
+    } from '@/const/crud/${pathName}'
+    import {
+        mapGetters
+    } from 'vuex'
 
     export default {
         name: '${pathName}',