Merge remote-tracking branch 'origin/master'

jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/cms/controller/CmsArticleController.java

@@ -73,6 +73,19 @@ public class CmsArticleController extends JeecgController<CmsArticle, ICmsArticl
         return Result.OK(pageList);
     }
 
+    @ApiOperation(value = "文章-分页列表查询", notes = "文章-分页列表查询")
+    @GetMapping(value = "/listJSJLNEW")
+    public Result<IPage<CmsArticle>> queryPlistJSJLNEWageList(CmsArticle cmsArticle,
+                                                   @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+                                                   @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
+                                                   HttpServletRequest req) {
+        QueryWrapper<CmsArticle> queryWrapper = QueryGenerator.initQueryWrapper(cmsArticle, req.getParameterMap());
+        queryWrapper.eq("column_id","1855427069138923522");
+        Page<CmsArticle> page = new Page<CmsArticle>(pageNo, pageSize);
+        IPage<CmsArticle> pageList = cmsArticleService.page(page, queryWrapper);
+        return Result.OK(pageList);
+    }
+
 
 
     /**
@@ -134,6 +147,43 @@ public class CmsArticleController extends JeecgController<CmsArticle, ICmsArticl
         return Result.OK("添加成功！");
     }
 
+
+    /**
+     * 添加
+     *
+     * @param cmsArticle
+     * @return
+     */
+    @AutoLog(value = "文章-添加")
+    @ApiOperation(value = "文章-添加", notes = "文章-添加")
+//    @RequiresPermissions("cms:cms_article:add")
+    @PostMapping(value = "/addJSJLNEW")
+    public Result<String> addJSJLNEW(@RequestBody CmsArticle cmsArticle) {
+        LoginUser principal = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+        cmsArticle.setCreateBy(principal.getUsername());
+        CmsColumn cmsColumn = cmsColumnService.getById(cmsArticle.getColumnId());
+        /*cmsArticle.setColumnName(cmsColumn.getName());*/
+//        if (StringUtils.equals("1", cmsArticle.getStatus())) {
+        cmsArticle.setPublishTime(new Date());
+        cmsArticle.setStatus("1");
+        cmsArticle.setColumnId("1855427069138923522");
+        cmsArticle.setColumnName("技术交流");
+//        }
+        /*QueryWrapper<Subweside> subwesideQueryWrapper = new QueryWrapper<>();
+        subwesideQueryWrapper.in("compadminid", principal.getId());
+        List<Subweside> subwesideList = subwesideService.list(subwesideQueryWrapper);
+        if (!subwesideList.isEmpty()) {
+            List<String> subnames = subwesideList.stream()
+                    .map(Subweside::getSubname) // 将每个Subweside对象映射到其subname字段
+                    .collect(Collectors.toList()); // 收集结果到List<String>
+            String joinedString = String.join(", ", subnames);
+            cmsArticle.setSource("来自子站："+joinedString);
+        }else {
+            cmsArticle.setSource("");
+        }*/
+        cmsArticleService.save(cmsArticle);
+        return Result.OK("添加成功！");
+    }
     @ApiOperation(value = "文章管理-发布/取消发布", notes = "文章管理-发布/取消发布")
     @PostMapping(value = "/operationStatus")
     public Result<?> operationStatus(@RequestBody CmsArticle cmsArticle) {

jeecgboot-vue3/src/views/cms/admin/articelJSJL/CmsArticle.api.ts

@@ -0,0 +1,77 @@
+import {defHttp} from '/@/utils/http/axios';
+import { useMessage } from "/@/hooks/web/useMessage";
+
+const { createConfirm } = useMessage();
+
+enum Api {
+  listzwh = '/cms/cmsArticle/listzwh',
+  list = '/cms/cmsArticle/listJSJLNEW',
+  save='/cms/cmsArticle/addJSJLNEW',
+  edit='/cms/cmsArticle/edit',
+  deleteOne = '/cms/cmsArticle/delete',
+  deleteBatch = '/cms/cmsArticle/deleteBatch',
+  importExcel = '/cms/cmsArticle/importExcel',
+  exportXls = '/cms/cmsArticle/exportXls',
+  operationStatus = '/cms/cmsArticle/operationStatus',
+}
+/**
+ * 导出api
+ * @param params
+ */
+export const getExportUrl = Api.exportXls;
+/**
+ * 导入api
+ */
+export const getImportUrl = Api.importExcel;
+
+export const updateStatus = (params) => defHttp.post({url: Api.operationStatus, params});
+
+/**
+ * 列表接口
+ * @param params
+ */
+export const list = (params) =>
+  defHttp.get({url: Api.list, params});
+
+
+/**
+ * 列表接口
+ * @param params
+ */
+export const listzwh = (params) =>
+  defHttp.get({url: Api.listzwh, params});
+
+/**
+ * 删除单个
+ */
+export const deleteOne = (params,handleSuccess) => {
+  return defHttp.delete({url: Api.deleteOne, params}, {joinParamsToUrl: true}).then(() => {
+    handleSuccess();
+  });
+}
+/**
+ * 批量删除
+ * @param params
+ */
+export const batchDelete = (params, handleSuccess) => {
+  createConfirm({
+    iconType: 'warning',
+    title: '确认删除',
+    content: '是否删除选中数据',
+    okText: '确认',
+    cancelText: '取消',
+    onOk: () => {
+      return defHttp.delete({url: Api.deleteBatch, data: params}, {joinParamsToUrl: true}).then(() => {
+        handleSuccess();
+      });
+    }
+  });
+}
+/**
+ * 保存或者更新
+ * @param params
+ */
+export const saveOrUpdate = (params, isUpdate) => {
+  let url = isUpdate ? Api.edit : Api.save;
+  return defHttp.post({url: url, params});
+}

jeecgboot-vue3/src/views/cms/admin/articelJSJL/CmsArticle.data.ts

@@ -0,0 +1,173 @@
+import {BasicColumn} from '/@/components/Table';
+import {FormSchema} from '/@/components/Table';
+// import { rules} from '/@/utils/helper/validator';
+// import { render } from '/@/utils/common/renderUtils';
+//列表数据
+export const columns: BasicColumn[] = [
+  {
+    title: '所属栏目',
+    align: "center",
+    dataIndex: 'columnName'
+  },
+  {
+    title: '文章标题',
+    align: "center",
+    dataIndex: 'title',
+    // slots: {customRender: 'htmlSlot'},
+  },
+  {
+    title: '作者',
+    align: "center",
+    dataIndex: 'createBy_dictText'
+  },
+  {
+    title: '来源',
+    align: "center",
+    dataIndex: 'source'
+  },
+  {
+    title: '状态',
+    align: "center",
+    dataIndex: 'status_dictText'
+  },
+  {
+    title: '发布时间',
+    align: "center",
+    dataIndex: 'publishTime'
+  },
+  // {
+  //   title: '源url',
+  //   align: "center",
+  //   dataIndex: 'originUrl'
+  // },
+];
+//查询数据
+export const searchFormSchema: FormSchema[] = [
+  {
+    label: "所属栏目",
+    field: 'columnId',
+    component: 'JDictSelectTag',
+    componentProps: {
+      dictCode: "cms_column,name,id"
+    },
+    colProps: {span: 6},
+  },
+  {
+    label: "文章标题",
+    field: 'title',
+    component: 'Input',
+    colProps: {span: 6},
+  },
+  {
+    label: "是否发布",
+    field: 'status',
+    component: 'JDictSelectTag',
+    componentProps: {
+      dictCode: "captain_code"
+    },
+    colProps: {span: 3},
+  },
+];
+//表单数据
+export const formSchema: FormSchema[] = [
+  {
+    label: '文章标题',
+    field: 'title',
+    component: 'Input',
+    dynamicRules: ({model, schema}) => {
+      return [
+        {required: true, message: '请输入文章标题!'},
+      ];
+    },
+  },
+/*  {
+    label: '所属栏目',
+    field: 'columnId',
+    component: 'JDictSelectTag',
+    componentProps: {
+      dictCode: "cms_column,name,id"
+
+    },
+    dynamicRules: ({model, schema}) => {
+      return [
+        {required: true, message: '请输入所属栏目!'},
+      ];
+    },
+  },*/
+  {
+    label: '文章内容',
+    field: 'content',
+    component: 'JEditor',
+  },
+  // {
+  //   label: '所属栏目名称',
+  //   field: 'columnName',
+  //   component: 'Input',
+  // },
+  {
+    label: '发布时间',
+    field: 'publishTime',
+    component: 'DatePicker',
+    componentProps: {
+      showTime: true,
+      valueFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+  },
+  {
+    label: '来源',
+    field: 'source',
+    component: 'Input',
+  },
+  {
+    label: '源url',
+    field: 'originUrl',
+    component: 'Input',
+  },
+
+  {
+    label: '文章图片',
+    field: 'comimg',
+    component: 'JImageUpload',
+    componentProps:{
+    },
+  },
+  {
+    label: '文章文件',
+    field: 'comfile',
+    component: 'JUpload',
+    componentProps:{
+    },
+  },
+
+  {
+    label: '简介',
+    field: 'info',
+    component: 'InputTextArea',
+  },
+/*  {
+    label: '文章来源',
+    field: 'artfrom',
+    component: 'JSearchSelect',
+    componentProps:{
+      dict: "subweside,subname,id"
+    },
+  },*/
+
+  // TODO 主键隐藏字段，目前写死为ID
+  {
+    label: '',
+    field: 'id',
+    component: 'Input',
+    show: false
+  },
+];
+
+
+/**
+ * 流程表单调用这个方法获取formSchema
+ * @param param
+ */
+export function getBpmFormSchema(_formData): FormSchema[] {
+  // 默认和原始表单保持一致 如果流程中配置了权限数据，这里需要单独处理formSchema
+  return formSchema;
+}

jeecgboot-vue3/src/views/cms/admin/articelJSJL/CmsArticleList.vue

@@ -0,0 +1,249 @@
+<template>
+  <div>
+    <!--引用表格-->
+    <BasicTable @register="registerTable" :rowSelection="rowSelection">
+      <!--插槽:table标题-->
+      <template #tableTitle>
+        <a-button type="primary" @click="handleAdd" preIcon="ant-design:plus-outlined"> 新增
+        </a-button>
+        <a-button type="primary" preIcon="ant-design:export-outlined" @click="onExportXls"> 导出
+        </a-button>
+        <!--  <j-upload-button  type="primary" preIcon="ant-design:import-outlined" @click="onImportXls">导入</j-upload-button>
+          <a-dropdown v-if="selectedRowKeys.length > 0">
+              <template #overlay>
+                <a-menu>
+                  <a-menu-item key="1" @click="batchHandleDelete">
+                    <Icon icon="ant-design:delete-outlined"></Icon>
+                    删除
+                  </a-menu-item>
+                </a-menu>
+              </template>
+              <a-button>批量操作
+                <Icon icon="mdi:chevron-down"></Icon>
+              </a-button>
+          </a-dropdown>-->
+      </template>
+      <!--操作栏-->
+      <template #action="{ record }">
+        <!--        <TableAction :actions="getTableAction(record)" :dropDownActions="getDropDownAction(record)"/>-->
+        <TableAction :actions="getTableAction(record)"/>
+        <!--<TableAction
+          :stopButtonPropagation="true"
+          :actions="[
+                {
+                  label: '1',
+                  // type: 'link',
+                  size: 'small',
+                  icon: 'ant-design:plus-circle-outlined',
+                  onClick: add.bind(null, record),
+                },
+                {
+                  label: '2',
+                  // type: 'link',
+                  size: 'small',
+                  icon: 'fa6-regular:pen-to-square',
+                  onClick: editor.bind(null, record),
+                },
+                {
+                  label: '3',
+                  // color: 'error',
+                  icon: 'ic:outline-delete-outline',
+                  popConfirm: {
+                    title: '确定删除该数据吗？',
+                    confirm: del.bind(null, record),
+                  },
+                },
+              ]"
+        />-->
+      </template>
+      <!--字段回显插槽-->
+      <template #htmlSlot="{text}">
+        <div v-html="text"></div>
+      </template>
+      <!--省市区字段回显插槽-->
+      <template #pcaSlot="{text}">
+        {{ getAreaTextByCode(text) }}
+      </template>
+      <template #fileSlot="{text}">
+        <span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span>
+        <a-button v-else :ghost="true" type="primary" preIcon="ant-design:download-outlined"
+                  size="small" @click="downloadFile(text)">下载
+        </a-button>
+      </template>
+    </BasicTable>
+    <!-- 表单区域 -->
+    <CmsArticleModal @register="registerModal" @success="handleSuccess"></CmsArticleModal>
+  </div>
+</template>
+
+<script lang="ts" name="cms-cmsArticle" setup>
+import {ref} from 'vue';
+import {BasicTable, TableAction} from '/@/components/Table';
+import {useModal} from '/@/components/Modal';
+import {useListPage} from '/@/hooks/system/useListPage'
+import CmsArticleModal from './components/CmsArticleModal.vue'
+import {columns, searchFormSchema} from './CmsArticle.data';
+import {
+  batchDelete,
+  deleteOne,
+  getExportUrl,
+  getImportUrl,
+  list,
+  updateStatus
+} from './CmsArticle.api';
+// import {updateStatus} from './CmsArticle.api';
+import {Update} from "/@/views/topic/Topic.api";
+import {defHttp} from "/@/utils/http/axios";
+// import { downloadFile } from '/@/utils/common/renderUtils';
+const checkedKeys = ref<Array<string | number>>([]);
+//注册model
+const [registerModal, {openModal}] = useModal();
+//注册table数据
+const {prefixCls, tableContext, onExportXls, onImportXls} = useListPage({
+  tableProps: {
+    title: '文章',
+    api: list,
+    columns,
+    canResize: false,
+    formConfig: {
+      //labelWidth: 120,
+      schemas: searchFormSchema,
+      autoSubmitOnEnter: true,
+      showAdvancedButton: true,
+      fieldMapToNumber: [],
+      fieldMapToTime: [],
+    },
+    actionColumn: {
+      width: 180,
+      fixed: 'right'
+    },
+  },
+  exportConfig: {
+    name: "文章",
+    url: getExportUrl,
+  },
+  importConfig: {
+    url: getImportUrl,
+    success: handleSuccess
+  },
+})
+
+const [registerTable, {reload}, {rowSelection, selectedRowKeys}] = tableContext
+
+/**
+ * 新增事件
+ */
+function handleAdd() {
+  openModal(true, {
+    isUpdate: false,
+    showFooter: true,
+  });
+}
+
+/**
+ * 编辑事件
+ */
+function handleEdit(record: Recordable) {
+  openModal(true, {
+    record,
+    isUpdate: true,
+    showFooter: true,
+  });
+}
+
+function update2(record: Recordable, val) {
+  record.status = val;
+  updateStatus(record)
+  //第2种方法
+  // defHttp.post({ url: '/cms/cmsArticle/operationStatus', params: record });
+  reload()
+}
+
+/**
+ * 详情
+ */
+function handleDetail(record: Recordable) {
+  openModal(true, {
+    record,
+    isUpdate: true,
+    showFooter: false,
+  });
+}
+
+/**
+ * 删除事件
+ */
+async function handleDelete(record) {
+  await deleteOne({id: record.id}, handleSuccess);
+}
+
+/**
+ * 批量删除事件
+ */
+async function batchHandleDelete() {
+  await batchDelete({ids: selectedRowKeys.value}, handleSuccess);
+}
+
+/**
+ * 成功回调
+ */
+function handleSuccess() {
+  (selectedRowKeys.value = []) && reload();
+}
+
+/**
+ * 操作栏
+ */
+function getTableAction(record) {
+  const actions = [
+    {
+      label: '编辑',
+      onClick: handleEdit.bind(null, record),
+    },
+    {
+      label: '删除',
+      popConfirm: {
+        title: '是否确认删除',
+        confirm: handleDelete.bind(null, record),
+      }
+    }
+  ];
+  if (record.status == "1") {
+      actions.unshift({
+      label: '取消发布',
+      onClick: update2.bind(null,record, "0"),
+    });
+  }
+  if (record.status == "0") {
+      actions.unshift({
+      label: '发布',
+      onClick: update2.bind(null,record, "1"),
+    });
+  }
+  return actions;
+}
+
+/**
+ * 下拉操作栏
+ */
+function getDropDownAction(record) {
+  return [
+    {
+      label: '详情',
+      onClick: handleDetail.bind(null, record),
+    }, {
+      label: '删除',
+      popConfirm: {
+        title: '是否确认删除',
+        confirm: handleDelete.bind(null, record),
+      }
+    }
+  ]
+}
+
+
+</script>
+
+<style scoped>
+
+</style>

jeecgboot-vue3/src/views/cms/admin/articelJSJL/CmsArticleListzwh.vue

@@ -0,0 +1,249 @@
+<template>
+  <div>
+    <!--引用表格-->
+    <BasicTable @register="registerTable" :rowSelection="rowSelection">
+      <!--插槽:table标题-->
+      <template #tableTitle>
+        <a-button type="primary" @click="handleAdd" preIcon="ant-design:plus-outlined"> 新增
+        </a-button>
+        <a-button type="primary" preIcon="ant-design:export-outlined" @click="onExportXls"> 导出
+        </a-button>
+        <!--  <j-upload-button  type="primary" preIcon="ant-design:import-outlined" @click="onImportXls">导入</j-upload-button>
+          <a-dropdown v-if="selectedRowKeys.length > 0">
+              <template #overlay>
+                <a-menu>
+                  <a-menu-item key="1" @click="batchHandleDelete">
+                    <Icon icon="ant-design:delete-outlined"></Icon>
+                    删除
+                  </a-menu-item>
+                </a-menu>
+              </template>
+              <a-button>批量操作
+                <Icon icon="mdi:chevron-down"></Icon>
+              </a-button>
+          </a-dropdown>-->
+      </template>
+      <!--操作栏-->
+      <template #action="{ record }">
+        <!--        <TableAction :actions="getTableAction(record)" :dropDownActions="getDropDownAction(record)"/>-->
+        <TableAction :actions="getTableAction(record)"/>
+        <!--<TableAction
+          :stopButtonPropagation="true"
+          :actions="[
+                {
+                  label: '1',
+                  // type: 'link',
+                  size: 'small',
+                  icon: 'ant-design:plus-circle-outlined',
+                  onClick: add.bind(null, record),
+                },
+                {
+                  label: '2',
+                  // type: 'link',
+                  size: 'small',
+                  icon: 'fa6-regular:pen-to-square',
+                  onClick: editor.bind(null, record),
+                },
+                {
+                  label: '3',
+                  // color: 'error',
+                  icon: 'ic:outline-delete-outline',
+                  popConfirm: {
+                    title: '确定删除该数据吗？',
+                    confirm: del.bind(null, record),
+                  },
+                },
+              ]"
+        />-->
+      </template>
+      <!--字段回显插槽-->
+      <template #htmlSlot="{text}">
+        <div v-html="text"></div>
+      </template>
+      <!--省市区字段回显插槽-->
+      <template #pcaSlot="{text}">
+        {{ getAreaTextByCode(text) }}
+      </template>
+      <template #fileSlot="{text}">
+        <span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span>
+        <a-button v-else :ghost="true" type="primary" preIcon="ant-design:download-outlined"
+                  size="small" @click="downloadFile(text)">下载
+        </a-button>
+      </template>
+    </BasicTable>
+    <!-- 表单区域 -->
+    <CmsArticleModal @register="registerModal" @success="handleSuccess"></CmsArticleModal>
+  </div>
+</template>
+
+<script lang="ts" name="cms-cmsArticle" setup>
+import {ref} from 'vue';
+import {BasicTable, TableAction} from '/@/components/Table';
+import {useModal} from '/@/components/Modal';
+import {useListPage} from '/@/hooks/system/useListPage'
+import CmsArticleModal from './components/CmsArticleModal.vue'
+import {columns, searchFormSchema} from './CmsArticle.data';
+import {
+  batchDelete,
+  deleteOne,
+  getExportUrl,
+  getImportUrl,
+  listzwh,
+  updateStatus
+} from './CmsArticle.api';
+// import {updateStatus} from './CmsArticle.api';
+import {Update} from "/@/views/topic/Topic.api";
+import {defHttp} from "/@/utils/http/axios";
+// import { downloadFile } from '/@/utils/common/renderUtils';
+const checkedKeys = ref<Array<string | number>>([]);
+//注册model
+const [registerModal, {openModal}] = useModal();
+//注册table数据
+const {prefixCls, tableContext, onExportXls, onImportXls} = useListPage({
+  tableProps: {
+    title: '文章',
+    api: listzwh,
+    columns,
+    canResize: false,
+    formConfig: {
+      //labelWidth: 120,
+      schemas: searchFormSchema,
+      autoSubmitOnEnter: true,
+      showAdvancedButton: true,
+      fieldMapToNumber: [],
+      fieldMapToTime: [],
+    },
+    actionColumn: {
+      width: 180,
+      fixed: 'right'
+    },
+  },
+  exportConfig: {
+    name: "文章",
+    url: getExportUrl,
+  },
+  importConfig: {
+    url: getImportUrl,
+    success: handleSuccess
+  },
+})
+
+const [registerTable, {reload}, {rowSelection, selectedRowKeys}] = tableContext
+
+/**
+ * 新增事件
+ */
+function handleAdd() {
+  openModal(true, {
+    isUpdate: false,
+    showFooter: true,
+  });
+}
+
+/**
+ * 编辑事件
+ */
+function handleEdit(record: Recordable) {
+  openModal(true, {
+    record,
+    isUpdate: true,
+    showFooter: true,
+  });
+}
+
+function update2(record: Recordable, val) {
+  record.status = val;
+  updateStatus(record)
+  //第2种方法
+  // defHttp.post({ url: '/cms/cmsArticle/operationStatus', params: record });
+  reload()
+}
+
+/**
+ * 详情
+ */
+function handleDetail(record: Recordable) {
+  openModal(true, {
+    record,
+    isUpdate: true,
+    showFooter: false,
+  });
+}
+
+/**
+ * 删除事件
+ */
+async function handleDelete(record) {
+  await deleteOne({id: record.id}, handleSuccess);
+}
+
+/**
+ * 批量删除事件
+ */
+async function batchHandleDelete() {
+  await batchDelete({ids: selectedRowKeys.value}, handleSuccess);
+}
+
+/**
+ * 成功回调
+ */
+function handleSuccess() {
+  (selectedRowKeys.value = []) && reload();
+}
+
+/**
+ * 操作栏
+ */
+function getTableAction(record) {
+  const actions = [
+    {
+      label: '编辑',
+      onClick: handleEdit.bind(null, record),
+    },
+    {
+      label: '删除',
+      popConfirm: {
+        title: '是否确认删除',
+        confirm: handleDelete.bind(null, record),
+      }
+    }
+  ];
+  if (record.status == "1") {
+      actions.unshift({
+      label: '取消发布',
+      onClick: update2.bind(null,record, "0"),
+    });
+  }
+  if (record.status == "0") {
+      actions.unshift({
+      label: '发布',
+      onClick: update2.bind(null,record, "1"),
+    });
+  }
+  return actions;
+}
+
+/**
+ * 下拉操作栏
+ */
+function getDropDownAction(record) {
+  return [
+    {
+      label: '详情',
+      onClick: handleDetail.bind(null, record),
+    }, {
+      label: '删除',
+      popConfirm: {
+        title: '是否确认删除',
+        confirm: handleDelete.bind(null, record),
+      }
+    }
+  ]
+}
+
+
+</script>
+
+<style scoped>
+
+</style>

jeecgboot-vue3/src/views/cms/admin/articelJSJL/CmsArticle_menu_insert.sql

@@ -0,0 +1,26 @@
+-- 注意：该页面对应的前台目录为views/cms文件夹下
+-- 如果你想更改到其他目录，请修改sql中component字段对应的值
+
+
+INSERT INTO sys_permission(id, parent_id, name, url, component, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_route, is_leaf, keep_alive, hidden, hide_tab, description, status, del_flag, rule_flag, create_by, create_time, update_by, update_time, internal_or_external) 
+VALUES ('2023101212013790550', NULL, '文章', '/cms/cmsArticleList', 'cms/CmsArticleList', NULL, NULL, 0, NULL, '1', 0.00, 0, NULL, 1, 0, 0, 0, 0, NULL, '1', 0, 0, 'admin', '2023-10-12 12:01:55', NULL, NULL, 0);
+
+-- 权限控制sql
+-- 新增
+INSERT INTO sys_permission(id, parent_id, name, url, component, is_route, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_leaf, keep_alive, hidden, hide_tab, description, create_by, create_time, update_by, update_time, del_flag, rule_flag, status, internal_or_external)
+VALUES ('2023101212013790551', '2023101212013790550', '添加文章', NULL, NULL, 0, NULL, NULL, 2, 'cms:cms_article:add', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2023-10-12 12:01:55', NULL, NULL, 0, 0, '1', 0);
+-- 编辑
+INSERT INTO sys_permission(id, parent_id, name, url, component, is_route, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_leaf, keep_alive, hidden, hide_tab, description, create_by, create_time, update_by, update_time, del_flag, rule_flag, status, internal_or_external)
+VALUES ('2023101212013790552', '2023101212013790550', '编辑文章', NULL, NULL, 0, NULL, NULL, 2, 'cms:cms_article:edit', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2023-10-12 12:01:55', NULL, NULL, 0, 0, '1', 0);
+-- 删除
+INSERT INTO sys_permission(id, parent_id, name, url, component, is_route, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_leaf, keep_alive, hidden, hide_tab, description, create_by, create_time, update_by, update_time, del_flag, rule_flag, status, internal_or_external)
+VALUES ('2023101212013790553', '2023101212013790550', '删除文章', NULL, NULL, 0, NULL, NULL, 2, 'cms:cms_article:delete', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2023-10-12 12:01:55', NULL, NULL, 0, 0, '1', 0);
+-- 批量删除
+INSERT INTO sys_permission(id, parent_id, name, url, component, is_route, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_leaf, keep_alive, hidden, hide_tab, description, create_by, create_time, update_by, update_time, del_flag, rule_flag, status, internal_or_external)
+VALUES ('2023101212013790554', '2023101212013790550', '批量删除文章', NULL, NULL, 0, NULL, NULL, 2, 'cms:cms_article:deleteBatch', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2023-10-12 12:01:55', NULL, NULL, 0, 0, '1', 0);
+-- 导出excel
+INSERT INTO sys_permission(id, parent_id, name, url, component, is_route, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_leaf, keep_alive, hidden, hide_tab, description, create_by, create_time, update_by, update_time, del_flag, rule_flag, status, internal_or_external)
+VALUES ('2023101212013790555', '2023101212013790550', '导出excel_文章', NULL, NULL, 0, NULL, NULL, 2, 'cms:cms_article:exportXls', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2023-10-12 12:01:55', NULL, NULL, 0, 0, '1', 0);
+-- 导入excel
+INSERT INTO sys_permission(id, parent_id, name, url, component, is_route, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_leaf, keep_alive, hidden, hide_tab, description, create_by, create_time, update_by, update_time, del_flag, rule_flag, status, internal_or_external)
+VALUES ('2023101212013790556', '2023101212013790550', '导入excel_文章', NULL, NULL, 0, NULL, NULL, 2, 'cms:cms_article:importExcel', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2023-10-12 12:01:55', NULL, NULL, 0, 0, '1', 0);

jeecgboot-vue3/src/views/cms/admin/articelJSJL/components/CmsArticleForm.vue

@@ -0,0 +1,70 @@
+<template>
+    <div style="min-height: 400px">
+        <BasicForm @register="registerForm"></BasicForm>
+        <div style="width: 100%;text-align: center" v-if="!formDisabled">
+            <a-button @click="submitForm" pre-icon="ant-design:check" type="primary">提 交</a-button>
+        </div>
+    </div>
+</template>
+
+<script lang="ts">
+    import {BasicForm, useForm} from '/@/components/Form/index';
+    import {computed, defineComponent} from 'vue';
+    import {defHttp} from '/@/utils/http/axios';
+    import { propTypes } from '/@/utils/propTypes';
+    import {getBpmFormSchema} from '../CmsArticle.data';
+    import {saveOrUpdate} from '../CmsArticle.api';
+    
+    export default defineComponent({
+        name: "CmsArticleForm",
+        components:{
+            BasicForm
+        },
+        props:{
+            formData: propTypes.object.def({}),
+            formBpm: propTypes.bool.def(true),
+        },
+        setup(props){
+            const [registerForm, { setFieldsValue, setProps, getFieldsValue }] = useForm({
+                labelWidth: 150,
+                schemas: getBpmFormSchema(props.formData),
+                showActionButtonGroup: false,
+                baseColProps: {span: 24}
+            });
+
+            const formDisabled = computed(()=>{
+                if(props.formData.disabled === false){
+                    return false;
+                }
+                return true;
+            });
+
+            let formData = {};
+            const queryByIdUrl = '/cms/cmsArticle/queryById';
+            async function initFormData(){
+                let params = {id: props.formData.dataId};
+                const data = await defHttp.get({url: queryByIdUrl, params});
+                formData = {...data}
+                //设置表单的值
+                await setFieldsValue(formData);
+                //默认是禁用
+                await setProps({disabled: formDisabled.value})
+            }
+
+            async function submitForm() {
+                let data = getFieldsValue();
+                let params = Object.assign({}, formData, data);
+                console.log('表单数据', params)
+                await saveOrUpdate(params, true)
+            }
+
+            initFormData();
+            
+            return {
+                registerForm,
+                formDisabled,
+                submitForm,
+            }
+        }
+    });
+</script>

jeecgboot-vue3/src/views/cms/admin/articelJSJL/components/CmsArticleModal.vue

@@ -0,0 +1,66 @@
+<template>
+  <BasicModal v-bind="$attrs" @register="registerModal" destroyOnClose :title="title" :width="800" @ok="handleSubmit">
+      <BasicForm @register="registerForm"/>
+  </BasicModal>
+</template>
+
+<script lang="ts" setup>
+    import {ref, computed, unref} from 'vue';
+    import {BasicModal, useModalInner} from '/@/components/Modal';
+    import {BasicForm, useForm} from '/@/components/Form/index';
+    import {formSchema} from '../CmsArticle.data';
+    import {saveOrUpdate} from '../CmsArticle.api';
+    // Emits声明
+    const emit = defineEmits(['register','success']);
+    const isUpdate = ref(true);
+    //表单配置
+    const [registerForm, {setProps,resetFields, setFieldsValue, validate}] = useForm({
+        //labelWidth: 150,
+        schemas: formSchema,
+        showActionButtonGroup: false,
+        baseColProps: {span: 24}
+    });
+    //表单赋值
+    const [registerModal, {setModalProps, closeModal}] = useModalInner(async (data) => {
+        //重置表单
+        await resetFields();
+        setModalProps({confirmLoading: false,showCancelBtn:!!data?.showFooter,showOkBtn:!!data?.showFooter});
+        isUpdate.value = !!data?.isUpdate;
+        if (unref(isUpdate)) {
+            //表单赋值
+            await setFieldsValue({
+                ...data.record,
+            });
+        }
+        // 隐藏底部时禁用整个表单
+       setProps({ disabled: !data?.showFooter })
+    });
+    //设置标题
+    const title = computed(() => (!unref(isUpdate) ? '新增' : '编辑'));
+    //表单提交事件
+    async function handleSubmit(v) {
+        try {
+            let values = await validate();
+            setModalProps({confirmLoading: true});
+            //提交表单
+            await saveOrUpdate(values, isUpdate.value);
+            //关闭弹窗
+            closeModal();
+            //刷新列表
+            emit('success');
+        } finally {
+            setModalProps({confirmLoading: false});
+        }
+    }
+</script>
+
+<style lang="less" scoped>
+	/** 时间和数字输入框样式 */
+  :deep(.ant-input-number){
+		width: 100%
+	}
+
+	:deep(.ant-calendar-picker){
+		width: 100%
+	}
+</style>