Merge branch 'dev' into dev-dictionary

src/components/FRuleEditor/index.vue

@@ -50,7 +50,7 @@
         <template #footer>
             <j-space>
                 <j-button @click="handleCancel">取消</j-button>
-                <j-button :disabled="_disabled" @click="handleOk" type="primary">确定</j-button>
+                <j-button @click="handleOk" type="primary">确定</j-button>
             </j-space>
         </template>
     </j-modal>
@@ -123,13 +123,14 @@ const getAllCrud = () => {
 }
 
 
-watch(() => _value.value, () => {
-    _disabled.value = true
-})
+// watch(() => _value.value, () => {
+//     console.log(_value.value)
+//     _disabled.value = true
+// })
 
-const onSuccess = (bool: boolean) => {
-    _disabled.value = bool;
-}
+// const onSuccess = (bool: boolean) => {
+//     _disabled.value = bool;
+// }
 getAllCrud()
 </script>
 <style lang="less" scoped>

src/views/DataCollect/Collector/Point/Scan/Table.vue

@@ -5,6 +5,7 @@
             :dataSource="modelRef.dataSource"
             :columns="FormTableColumns"
             :scroll="{ y: 580 }"
+            :pagination="false"
         >
             <template #headerCell="{ column }">
                 <template
@@ -308,7 +309,6 @@ watch(
     () => props.data,
     (value, preValue) => {
         modelRef.dataSource = value;
-
         // 有新增时同上数据
         const vlength = value.length,
             plength = preValue.length;

src/views/device/components/Metadata/Base/components/Source.vue

@@ -13,7 +13,7 @@
             v-if="myValue != 'manual' && !showReset"
             :bodyStyle="{
                 width: '450px',
-                height: myValue === 'rule' ? '300px' : '80px',
+                height: myValue === 'rule' ? '300px' : '90px',
             }"
             :get-popup-container="(node) => fullRef || node"
             placement="bottomRight"
@@ -294,7 +294,9 @@ onMounted(()=>{
         item === props.value?.id ? showReset.value = true : ''
     })
     }
-    handleSearch()
+    if(isNoCommunity && myValue.value === 'rule'){
+        handleSearch()
+    }
 })
 </script>
 

src/views/device/components/Metadata/Cat/index.vue

@@ -112,7 +112,7 @@ const codecs = ref<{ id: string; name: string }[]>()
 const routeChange = async (id: string) => {
   const res = await getCodecs()
   if (res.status === 200) {
-    codecs.value = [{ id: 'jetlinks', name: 'jetlinks' }].concat(res.result)
+    codecs.value = [{ id: 'jetlinks', name: '标准物模型' }].concat(res.result)
   }
   if (props.type === 'device' && id) {
     detail(id as string).then((resp) => {

src/views/link/Type/Detail/index.vue

@@ -1285,7 +1285,7 @@ const changeType = (value: string) => {
     if (value !== 'MQTT_CLIENT') {
         const { configuration } = dynamicValidateForm.cluster[0];
         value && (configuration.host = '0.0.0.0');
-    }else{
+    }else if(isNoCommunity){
         formData.value.shareCluster  = false
         changeShareCluster(formData.value.shareCluster)
     }

src/views/notice/Config/Detail/index.vue

@@ -80,7 +80,7 @@
                                 "
                             >
                                 <j-form-item
-                                    label="webHook"
+                                    label="WebHook"
                                     v-bind="validateInfos['configuration.url']"
                                     :rules='[{ max: 64, message: "最多可输入64个字符" }]'
                                 >
@@ -88,7 +88,7 @@
                                         v-model:value="
                                             formData.configuration.url
                                         "
-                                        placeholder="请输入webHook"
+                                        placeholder="请输入WebHook"
                                     />
                                 </j-form-item>
                             </template>
@@ -447,7 +447,7 @@ const formRules = ref({
     ],
     // webhook
     'configuration.url': [
-        { required: true, message: '请输入Webhook', trigger: 'blur' },
+        { required: true, message: '请输入WebHook', trigger: 'blur' },
         // {
         //     pattern:
         //         /^(((ht|f)tps?):\/\/)?([^!@#$%^&*?.\s-]([^!@#$%^&*?.\s]{0,63}[^!@#$%^&*?.\s])?\.)+[j-z]{2,6}\/?/,

src/views/rule-engine/Scene/Save/action/ListItem/Item.vue

@@ -220,7 +220,7 @@
                                           )
                                       "
                                   />
-                                  webhook
+                                  WebHook
                               </span>
                               发送
                               <span>{{

src/views/system/NoticeRule/components/Item/index.vue

@@ -17,6 +17,7 @@
                 <div
                     class="child-item-left-auth"
                     :class="{ disabled: !checked }"
+                    v-if="isNoCommunity"
                 >
                     <j-tooltip>
                         <template #title>
@@ -163,6 +164,7 @@ import { Modal, Checkbox } from 'jetlinks-ui-components';
 import { usePermissionStore } from '@/store/permission';
 import { LocalStore } from '@/utils/comm';
 import { useUserInfo } from '@/store/userInfo';
+import { isNoCommunity } from '@/utils/utils';
 
 const props = defineProps({
     data: {

src/views/system/Permission/components/EditDialog.vue

@@ -191,7 +191,7 @@ const form = reactive({
             else {
                 const resp: any = await checkId_api({ id });
                 if (resp.result.passed) return Promise.resolve();
-                else return Promise.reject(resp.result.reason);
+                else return Promise.reject("标识重复");
             }
         },
     },

vite.config.ts

@@ -96,7 +96,7 @@ export default defineConfig(({ mode}) => {
                   // target: 'http://192.168.32.244:8881',
                 //   target: 'http://192.168.32.163:8844', //张季本地
                 //   target: 'http://120.77.179.54:8844', // 120测试
-                  target: 'http://192.168.33.46:8844', // 本地开发环境
+                target: 'http://192.168.33.46:8844', // 本地开发环境
                 //   target: 'http://192.168.32.5:8848', // 刘本地
                 //   target: 'http://192.168.32.187:8844', // 谭本地
                   ws: 'ws://192.168.33.46:8844',