From b777ac0dc4fac5f1819a43428ee4e91e7a5bb559 Mon Sep 17 00:00:00 2001 From: zhangdaiscott Date: Thu, 22 Sep 2022 14:06:18 +0800 Subject: [PATCH] =?UTF-8?q?jeecgboot3.4.2=E7=89=88=E6=9C=AC=E5=8F=91?= =?UTF-8?q?=E5=B8=83,=E5=9F=BA=E7=A1=80=E5=8A=9F=E8=83=BD=E5=8D=87?= =?UTF-8?q?=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/common/api.ts | 7 + src/assets/svg/fileType/excel.svg | 1 + src/assets/svg/fileType/other.svg | 1 + src/assets/svg/fileType/pdf.svg | 1 + src/assets/svg/fileType/txt.svg | 1 + src/assets/svg/fileType/word.svg | 1 + src/components/Drawer/src/BasicDrawer.vue | 5 +- src/components/Drawer/src/props.ts | 1 + src/components/Drawer/src/typing.ts | 2 + .../Form/src/components/FormItem.vue | 16 +- .../Form/src/jeecg/components/JAddInput.vue | 7 +- .../src/jeecg/components/JCategorySelect.vue | 28 +- .../Form/src/jeecg/components/JCheckbox.vue | 10 +- .../Form/src/jeecg/components/JCodeEditor.vue | 13 +- .../src/jeecg/components/JDictSelectTag.vue | 22 +- .../components/JEasyCron/EasyCronInput.vue | 9 +- .../Form/src/jeecg/components/JEllipsis.vue | 4 +- .../src/jeecg/components/JFormContainer.vue | 4 - .../src/jeecg/components/JImportModal.vue | 4 +- .../Form/src/jeecg/components/JInputPop.vue | 8 +- .../Form/src/jeecg/components/JPopup.vue | 10 +- .../src/jeecg/components/JSearchSelect.vue | 39 +- .../Form/src/jeecg/components/JSelectDept.vue | 6 +- .../src/jeecg/components/JSelectMultiple.vue | 21 +- .../src/jeecg/components/JSelectPosition.vue | 6 +- .../Form/src/jeecg/components/JSelectRole.vue | 6 +- .../Form/src/jeecg/components/JSelectUser.vue | 8 +- .../jeecg/components/JSelectUserByDept.vue | 7 +- .../Form/src/jeecg/components/JSwitch.vue | 10 +- .../Form/src/jeecg/components/JTreeSelect.vue | 9 +- .../src/jeecg/components/base/JTreeBiz.vue | 10 +- .../components/modal/DeptSelectModal.vue | 12 +- .../components/modal/JPopupOnlReportModal.vue | 28 +- .../components/modal/PositionSelectModal.vue | 23 +- .../components/modal/UserSelectModal.vue | 23 +- src/components/Form/src/types/form.ts | 7 +- src/components/Icon/src/IconPicker.vue | 4 +- .../src/components/JVxeImageCell.vue | 11 +- .../components/JVxeSelectDictSearchCell.ts | 3 +- src/components/Modal/src/BasicModal.vue | 62 +-- .../Modal/src/components/ModalClose.vue | 65 +-- src/components/Modal/src/index.less | 13 +- src/components/Modal/src/typing.ts | 2 + src/components/Page/src/PageWrapper.vue | 16 +- src/components/Scrollbar/src/bar.ts | 3 +- src/components/SimpleMenu/src/SimpleMenu.vue | 9 +- .../SimpleMenu/src/SimpleSubMenu.vue | 7 +- src/components/Table/src/BasicTable.vue | 39 +- .../Table/src/components/HeaderCell.vue | 4 +- .../Table/src/components/TableHeader.vue | 2 +- .../src/components/editable/CellComponent.ts | 5 +- .../src/components/settings/ColumnSetting.vue | 22 +- .../src/components/settings/SizeSetting.vue | 2 +- src/components/Table/src/hooks/useColumns.ts | 10 +- .../Table/src/hooks/useCustomRow.ts | 5 +- .../Table/src/hooks/useDataSource.ts | 6 +- .../Table/src/hooks/useRowSelection.ts | 13 +- .../Table/src/hooks/useTableFooter.ts | 5 +- .../Table/src/hooks/useTableForm.ts | 8 +- src/components/Table/src/types/table.ts | 3 +- src/components/Tinymce/src/Editor.vue | 9 +- src/components/Tinymce/src/ImgUpload.vue | 11 +- src/components/Tree/index.ts | 5 +- src/components/Tree/src/BasicTree.vue | 456 +++++++++++++++ src/components/Tree/src/TreeIcon.ts | 8 +- .../Tree/src/components/TreeHeader.vue | 171 ++++++ src/components/Tree/src/hooks/useTree.ts | 207 +++++++ src/components/Tree/src/types/tree.ts | 195 +++++++ src/components/Tree/style/index.less | 52 ++ src/components/Tree/style/index.ts | 1 + src/components/Tree_backup/index.ts | 5 + .../{Tree => Tree_backup}/src/Tree.vue | 3 +- .../{Tree => Tree_backup}/src/TreeHeader.vue | 8 +- src/components/Tree_backup/src/TreeIcon.ts | 17 + .../{Tree => Tree_backup}/src/props.ts | 0 .../{Tree => Tree_backup}/src/typing.ts | 0 .../{Tree => Tree_backup}/src/useTree.ts | 0 src/components/Upload/src/UploadModal.vue | 6 +- .../Upload/src/UploadPreviewModal.vue | 9 +- src/components/Upload/src/useUpload.ts | 12 +- src/components/Verify/src/DragVerify.vue | 14 +- src/components/Verify/src/ImgRotate.vue | 4 +- src/components/jeecg/JPrompt/JPrompt.vue | 36 +- .../jeecg/JPrompt/hooks/useJPrompt.ts | 1 + .../jeecg/OnLine/JPopupOnlReport.vue | 30 +- .../jeecg/OnLine/SearchFormItem.vue | 74 ++- .../jeecg/OnLine/hooks/usePopBiz.ts | 2 +- .../jeecg/OnLine/types/onlineConfig.ts | 6 + .../jeecg/super/superquery/SuperQuery.vue | 401 -------------- .../superquery/SuperQueryValComponent.vue | 98 ---- .../jeecg/super/superquery/useSuperQuery.ts | 524 ------------------ .../jeecg/thirdApp/JThirdAppButton.vue | 7 +- .../jeecg/thirdApp/JThirdAppDropdown.vue | 4 +- src/components/registerGlobComp.ts | 4 + src/hooks/web/useTabs.ts | 15 + .../components/user-dropdown/DepartSelect.vue | 6 +- src/layouts/default/header/index.vue | 18 +- src/layouts/default/menu/index.vue | 26 +- src/layouts/default/setting/SettingDrawer.tsx | 56 +- .../default/setting/components/SwitchItem.vue | 8 +- src/layouts/default/sider/LayoutSider.vue | 3 +- src/layouts/default/sider/index.vue | 10 +- src/layouts/default/tabs/index.less | 61 +- src/layouts/default/tabs/index.vue | 13 +- src/layouts/default/tabs/tabs.theme.card.less | 70 ++- .../default/tabs/tabs.theme.smooth.less | 65 ++- src/locales/lang/en.ts | 4 +- src/locales/lang/zh_CN.ts | 3 - src/locales/useLocale.ts | 9 +- src/main.ts | 2 +- src/router/guard/permissionGuard.ts | 7 +- src/router/helper/routeHelper.ts | 9 +- src/settings/designSetting.ts | 28 +- src/settings/projectSetting.ts | 10 +- src/store/modules/app.ts | 10 + src/store/modules/multipleTab.ts | 7 +- src/store/modules/permission.ts | 13 +- .../Analysis/components/BdcTabCard.vue | 8 +- .../Analysis/components/ChartGroupCard.vue | 8 +- .../Analysis/components/GrowCard.vue | 9 +- .../Analysis/components/QuickNav.vue | 22 +- .../Analysis/components/SaleTabCard.vue | 2 +- .../Analysis/components/VisitAnalysis.vue | 21 +- .../dashboard/Analysis/homePage/IndexBdc.vue | 27 +- .../dashboard/Analysis/homePage/IndexTask.vue | 62 ++- src/views/demo/charts/china.json | 28 +- src/views/demo/comp/button/index.vue | 6 +- src/views/demo/comp/desc/index.vue | 10 +- src/views/demo/comp/transition/index.vue | 16 +- src/views/demo/feat/download/index.vue | 5 +- src/views/demo/feat/icon/index.vue | 16 +- src/views/demo/feat/img-preview/index.vue | 18 +- src/views/demo/form/index.vue | 31 +- src/views/demo/jeecg/InnerExpandTable.vue | 9 +- src/views/demo/jeecg/JCodeEditDemo.vue | 11 +- .../demo/jeecg/JVxeTableDemo/JVxeDemo1.vue | 4 +- .../demo/jeecg/JVxeTableDemo/JVxeDemo3.vue | 12 +- .../demo/jeecg/JVxeTableDemo/JVxeDemo4.vue | 11 +- .../JVxeTableDemo/func-demo/PopupSubTable.vue | 9 +- .../JVxeTableDemo/layout-demo/ErpTemplate.vue | 2 +- .../JVxeTableDemo/layout-demo/Template5.vue | 11 +- src/views/demo/jeecg/JeecgComponents.vue | 32 +- .../Native/one/components/OneNativeForm.vue | 112 ++-- .../Native/one/components/OneNativeModal.vue | 22 +- src/views/demo/jeecg/PrintDemo.vue | 10 +- src/views/demo/jeecg/erplist/erplist.data.ts | 2 +- src/views/demo/jeecg/jeecgComponents.data.ts | 38 +- .../demo/page/account/setting/BaseSetting.vue | 15 +- src/views/demo/page/account/setting/data.ts | 5 +- src/views/demo/page/desc/basic/index.vue | 11 +- src/views/demo/page/desc/high/index.vue | 4 +- src/views/demo/page/form/step/Step1.vue | 8 +- src/views/demo/permission/back/index.vue | 7 +- .../demo/system/account/AccountDetail.vue | 7 +- .../demo/system/account/AccountModal.vue | 1 + src/views/demo/system/account/DeptTree.vue | 13 +- src/views/demo/system/account/account.data.ts | 4 +- src/views/demo/system/account/index.vue | 53 +- src/views/demo/system/role/RoleDrawer.vue | 9 +- src/views/demo/table/CustomerCell.vue | 4 +- src/views/demo/table/ExpandTable.vue | 5 +- src/views/demo/table/FooterTable.vue | 2 +- src/views/demo/table/RefTable.vue | 11 +- src/views/demo/table/UseTable.vue | 15 +- src/views/demo/table/tableData.tsx | 1 + src/views/demo/tree/EditTree.vue | 9 +- src/views/demo/tree/index.vue | 31 +- src/views/demo/vextable/OneToOneModal.vue | 10 +- src/views/demo/vextable/index.vue | 7 +- .../vextable/jvxetable/JVxeTableModal.vue | 8 +- src/views/demo/vextable/modal.vue | 11 +- .../monitor/datasource/datasource.data.ts | 3 +- src/views/monitor/log/index.vue | 2 +- src/views/monitor/log/log.data.ts | 3 + src/views/monitor/mynews/DetailModal.vue | 61 +- src/views/monitor/mynews/index.vue | 53 +- src/views/monitor/mynews/mynews.api.ts | 10 + src/views/monitor/redis/index.vue | 4 +- src/views/monitor/route/RouteModal.vue | 16 +- src/views/monitor/server/index.vue | 6 +- src/views/monitor/server/server.api.ts | 8 +- src/views/monitor/trace/trace.data.ts | 6 +- src/views/report/chartdemo/index.vue | 2 +- src/views/report/statisticst/index.vue | 2 +- src/views/sys/about/index.vue | 3 +- src/views/sys/error-log/data.tsx | 11 +- src/views/sys/login/LoginForm.vue | 9 +- src/views/sys/login/LoginSelect.vue | 14 +- src/views/sys/login/MobileForm.vue | 8 +- src/views/sys/login/OAuth2Login.vue | 2 +- src/views/sys/login/RegisterForm.vue | 8 +- src/views/sys/login/ThirdModal.vue | 4 +- src/views/sys/login/TokenLoginPage.vue | 319 +++++------ src/views/sys/login/useLogin.ts | 2 +- .../address/components/DepartLeftTree.vue | 2 +- src/views/system/address/index.less | 2 +- src/views/system/category/index.vue | 11 +- src/views/system/checkRule/CheckRuleModal.vue | 14 +- src/views/system/checkRule/index.vue | 9 +- .../depart/components/DepartLeftTree.vue | 3 +- .../depart/components/DepartRuleTab.vue | 4 +- src/views/system/depart/index.less | 2 +- src/views/system/depart/index.vue | 1 + .../components/DepartRoleAuthDrawer.vue | 13 +- .../departUser/components/DepartTree.vue | 8 +- .../system/departUser/depart.user.api.ts | 3 +- src/views/system/examples/demo/DemoModal.vue | 8 +- src/views/system/examples/demo/demo.data.ts | 20 +- src/views/system/examples/demo/index.vue | 43 +- src/views/system/menu/index.vue | 10 +- src/views/system/menu/menu.api.ts | 4 +- src/views/system/menu/menu.data.ts | 8 +- .../message/components/SysMessageList.vue | 165 ++++++ .../message/components/SysMessageModal.vue | 487 ++++++++++++++++ .../message/components/useSysMessage.ts | 228 ++++++++ src/views/system/message/template/index.vue | 6 +- .../system/message/template/template.data.ts | 31 +- src/views/system/ossfile/index.vue | 17 +- src/views/system/role/index.vue | 5 + src/views/system/role/role.api.ts | 3 +- src/views/system/role/role.data.ts | 2 +- src/views/system/tenant/tenant.data.ts | 25 +- src/views/system/user/UserDrawer.vue | 10 +- src/views/system/user/UserRecycleBinModal.vue | 8 +- src/views/system/user/index.vue | 7 +- src/views/system/user/user.data.ts | 5 +- 226 files changed, 4145 insertions(+), 1922 deletions(-) create mode 100644 src/assets/svg/fileType/excel.svg create mode 100644 src/assets/svg/fileType/other.svg create mode 100644 src/assets/svg/fileType/pdf.svg create mode 100644 src/assets/svg/fileType/txt.svg create mode 100644 src/assets/svg/fileType/word.svg create mode 100644 src/components/Tree/src/BasicTree.vue create mode 100644 src/components/Tree/src/components/TreeHeader.vue create mode 100644 src/components/Tree/src/hooks/useTree.ts create mode 100644 src/components/Tree/src/types/tree.ts create mode 100644 src/components/Tree/style/index.less create mode 100644 src/components/Tree/style/index.ts create mode 100644 src/components/Tree_backup/index.ts rename src/components/{Tree => Tree_backup}/src/Tree.vue (99%) rename src/components/{Tree => Tree_backup}/src/TreeHeader.vue (95%) create mode 100644 src/components/Tree_backup/src/TreeIcon.ts rename src/components/{Tree => Tree_backup}/src/props.ts (100%) rename src/components/{Tree => Tree_backup}/src/typing.ts (100%) rename src/components/{Tree => Tree_backup}/src/useTree.ts (100%) delete mode 100644 src/components/jeecg/super/superquery/SuperQuery.vue delete mode 100644 src/components/jeecg/super/superquery/SuperQueryValComponent.vue delete mode 100644 src/components/jeecg/super/superquery/useSuperQuery.ts create mode 100644 src/views/system/message/components/SysMessageList.vue create mode 100644 src/views/system/message/components/SysMessageModal.vue create mode 100644 src/views/system/message/components/useSysMessage.ts diff --git a/src/api/common/api.ts b/src/api/common/api.ts index 1e90d11..47d5cfb 100644 --- a/src/api/common/api.ts +++ b/src/api/common/api.ts @@ -141,3 +141,10 @@ export const getFileblob = (url, parameter) => { { isTransformResponse: false } ); }; + +/** + * 【用于评论功能】自定义文件上传-方法 + */ +export const uploadMyFile = (url, data) => { + return defHttp.uploadMyFile(url, data); +}; diff --git a/src/assets/svg/fileType/excel.svg b/src/assets/svg/fileType/excel.svg new file mode 100644 index 0000000..debdb36 --- /dev/null +++ b/src/assets/svg/fileType/excel.svg @@ -0,0 +1 @@ +MACWIN图形／印刷产品／思维导图影视／广告代码通用工业／建筑 \ No newline at end of file diff --git a/src/assets/svg/fileType/other.svg b/src/assets/svg/fileType/other.svg new file mode 100644 index 0000000..59b0c41 --- /dev/null +++ b/src/assets/svg/fileType/other.svg @@ -0,0 +1 @@ +MACWIN图形／印刷产品／思维导图影视／广告代码通用工业／建筑 \ No newline at end of file diff --git a/src/assets/svg/fileType/pdf.svg b/src/assets/svg/fileType/pdf.svg new file mode 100644 index 0000000..67c0f10 --- /dev/null +++ b/src/assets/svg/fileType/pdf.svg @@ -0,0 +1 @@ +MACWIN图形／印刷产品／思维导图影视／广告代码通用工业／建筑 \ No newline at end of file diff --git a/src/assets/svg/fileType/txt.svg b/src/assets/svg/fileType/txt.svg new file mode 100644 index 0000000..602c3b9 --- /dev/null +++ b/src/assets/svg/fileType/txt.svg @@ -0,0 +1 @@ +MACWIN图形／印刷产品／思维导图影视／广告代码通用工业／建筑 \ No newline at end of file diff --git a/src/assets/svg/fileType/word.svg b/src/assets/svg/fileType/word.svg new file mode 100644 index 0000000..16aa1a4 --- /dev/null +++ b/src/assets/svg/fileType/word.svg @@ -0,0 +1 @@ +MACWIN图形／印刷产品／思维导图影视／广告代码通用工业／建筑 \ No newline at end of file diff --git a/src/components/Drawer/src/BasicDrawer.vue b/src/components/Drawer/src/BasicDrawer.vue index 155b589..d3a454b 100644 --- a/src/components/Drawer/src/BasicDrawer.vue +++ b/src/components/Drawer/src/BasicDrawer.vue @@ -70,13 +70,14 @@ visible: unref(visibleRef), }; opt.title = undefined; - const { isDetail, width, wrapClassName, getContainer } = opt; + let { isDetail, width, wrapClassName, getContainer } = opt; if (isDetail) { if (!width) { opt.width = '100%'; } const detailCls = `${prefixCls}__detail`; - opt.wrapClassName = wrapClassName ? `${wrapClassName} ${detailCls}` : detailCls; + wrapClassName = opt['class'] ? opt['class'] : wrapClassName; + opt.class = wrapClassName ? `${wrapClassName} ${detailCls}` : detailCls; if (!getContainer) { // TODO type error? diff --git a/src/components/Drawer/src/props.ts b/src/components/Drawer/src/props.ts index 0a7ca8c..8d134ee 100644 --- a/src/components/Drawer/src/props.ts +++ b/src/components/Drawer/src/props.ts @@ -25,6 +25,7 @@ export const footerProps = { }, }; export const basicProps = { + class: {type: [String, Object, Array]}, isDetail: { type: Boolean }, title: { type: String, default: '' }, loadingText: { type: String }, diff --git a/src/components/Drawer/src/typing.ts b/src/components/Drawer/src/typing.ts index 0df3dfd..c1ef346 100644 --- a/src/components/Drawer/src/typing.ts +++ b/src/components/Drawer/src/typing.ts @@ -133,6 +133,8 @@ export interface DrawerProps extends DrawerFooterProps { * The class name of the container of the Drawer dialog. * @type string */ + class?: string; + // 兼容老版本的写法（后续可能会删除，优先写class） wrapClassName?: string; /** diff --git a/src/components/Form/src/components/FormItem.vue b/src/components/Form/src/components/FormItem.vue index b2d0307..9f0b863 100644 --- a/src/components/Form/src/components/FormItem.vue +++ b/src/components/Form/src/components/FormItem.vue @@ -264,14 +264,26 @@ * @updateBy:zyf */ function renderLabelHelpMessage() { - const { label, helpMessage, helpComponentProps, subLabel } = props.schema; + //update-begin-author:taoyan date:2022-9-7 for: VUEN-2061【样式】online表单超出4个 .. 省略显示 + //label宽度支持自定义 + const { label, helpMessage, helpComponentProps, subLabel, labelLength } = props.schema; + let showLabel:string = (label+'') + if(labelLength && showLabel.length>4){ + showLabel = showLabel.substr(0, labelLength); + } + const titleObj = {title: label} const renderLabel = subLabel ? ( {label} {subLabel} ) : ( - label + labelLength ? ( + + ) : ( + label + ) ); + //update-end-author:taoyan date:2022-9-7 for: VUEN-2061【样式】online表单超出4个 .. 省略显示 const getHelpMessage = isFunction(helpMessage) ? helpMessage(unref(getValues)) : helpMessage; if (!getHelpMessage || (Array.isArray(getHelpMessage) && getHelpMessage.length === 0)) { return renderLabel; diff --git a/src/components/Form/src/jeecg/components/JAddInput.vue b/src/components/Form/src/jeecg/components/JAddInput.vue index d63b628..f3bd2d6 100644 --- a/src/components/Form/src/jeecg/components/JAddInput.vue +++ b/src/components/Form/src/jeecg/components/JAddInput.vue @@ -2,7 +2,12 @@
- +
diff --git a/src/components/Form/src/jeecg/components/JCategorySelect.vue b/src/components/Form/src/jeecg/components/JCategorySelect.vue index d818c87..b302389 100644 --- a/src/components/Form/src/jeecg/components/JCategorySelect.vue +++ b/src/components/Form/src/jeecg/components/JCategorySelect.vue @@ -102,17 +102,17 @@ }; console.info(param); loadTreeData(param).then((res) => { - if (res && res.length > 0) { - for (let i of res) { - i.value = i.key; - if (i.leaf == false) { - i.isLeaf = false; - } else if (i.leaf == true) { - i.isLeaf = true; - } - } - treeData.value = res; - } + if(res && res.length>0){ + for (let i of res) { + i.value = i.key; + if (i.leaf == false) { + i.isLeaf = false; + } else if (i.leaf == true) { + i.isLeaf = true; + } + } + treeData.value = res; + } }); } @@ -149,13 +149,12 @@ function asyncLoadTreeData(treeNode) { let dataRef = treeNode.dataRef; - return new Promise((resolve) => { - if (treeNode.children.length > 0) { + return new Promise((resolve) => { + if (treeNode.children && treeNode.children.length > 0) { resolve(); return; } let pid = dataRef.key; - console.info(treeNode); let param = { pid: pid, condition: props.condition, @@ -178,7 +177,6 @@ } function addChildren(pid, children, treeArray) { - console.info('treeArray', treeArray); if (treeArray && treeArray.length > 0) { for (let item of treeArray) { if (item.key == pid) { diff --git a/src/components/Form/src/jeecg/components/JCheckbox.vue b/src/components/Form/src/jeecg/components/JCheckbox.vue index 3f79196..b69ac4c 100644 --- a/src/components/Form/src/jeecg/components/JCheckbox.vue +++ b/src/components/Form/src/jeecg/components/JCheckbox.vue @@ -11,7 +11,7 @@ export default defineComponent({ name: 'JCheckbox', props: { - value: propTypes.oneOfType([propTypes.string, propTypes.number]), + value:propTypes.oneOfType([propTypes.string, propTypes.number]), dictCode: propTypes.string, options: { type: Array, @@ -31,11 +31,11 @@ watchEffect(() => { //update-begin-author:taoyan date:2022-7-4 for:issues/I5E7YX AUTO在线表单进入功能测试之后一直卡在功能测试界面 let temp = props.value; - if (!temp && temp !== 0) { - checkboxArray.value = []; - } else { + if(!temp && temp!==0){ + checkboxArray.value = [] + }else{ temp = temp + ''; - checkboxArray.value = temp.split(','); + checkboxArray.value = temp.split(',') } //update-end-author:taoyan date:2022-7-4 for:issues/I5E7YX AUTO在线表单进入功能测试之后一直卡在功能测试界面 //update-begin-author:taoyan date:20220401 for: 调用表单的 resetFields不会清空当前信息，界面显示上一次的数据 diff --git a/src/components/Form/src/jeecg/components/JCodeEditor.vue b/src/components/Form/src/jeecg/components/JCodeEditor.vue index 8706c23..75683b5 100644 --- a/src/components/Form/src/jeecg/components/JCodeEditor.vue +++ b/src/components/Form/src/jeecg/components/JCodeEditor.vue @@ -188,16 +188,13 @@ } ); //update-end-author:taoyan date:2022-5-9 for: codeEditor禁用功能 - + // 支持动态设置语言 - watch( - () => props.language, - (val) => { - if (val && coder) { - coder.setOption('mode', val); - } + watch(()=>props.language, (val)=>{ + if(val && coder){ + coder.setOption('mode', val); } - ); + }); const getBindValue = Object.assign({}, unref(props), unref(attrs)); return { diff --git a/src/components/Form/src/jeecg/components/JDictSelectTag.vue b/src/components/Form/src/jeecg/components/JDictSelectTag.vue index 741bf97..f423a40 100644 --- a/src/components/Form/src/jeecg/components/JDictSelectTag.vue +++ b/src/components/Form/src/jeecg/components/JDictSelectTag.vue @@ -22,8 +22,16 @@ - - 请选择 + + 请选择… diff --git a/src/components/Form/src/jeecg/components/JFormContainer.vue b/src/components/Form/src/jeecg/components/JFormContainer.vue index 5df1698..397be92 100644 --- a/src/components/Form/src/jeecg/components/JFormContainer.vue +++ b/src/components/Form/src/jeecg/components/JFormContainer.vue @@ -1,10 +1,6 @@